Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only try stop sysprobe if it is installed #255

Merged
merged 2 commits into from
Jan 31, 2020
Merged

Only try stop sysprobe if it is installed #255

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8db7a6a
Only try stop sysprobe if it is installed
danielsimkus Jan 30, 2020
5299d1a
Set both sysprob service checks into a datadog_sysprove_installed fact
danielsimkus Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions tasks/agent-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,15 @@
enabled: yes
when: not datadog_skip_running_check and datadog_enabled and not ansible_check_mode

- name: set system probe installed
set_fact:
datadog_sysprobe_installed: "{{ ansible_facts.services['datadog-agent-sysprobe'] is defined or ansible_facts.services['datadog-agent-sysprobe.service'] is defined }}"

- name: set system probe enabled
set_fact:
datadog_sysprobe_enabled: "{{ system_probe_config is defined
and system_probe_config['enabled']
and (ansible_facts.services['datadog-agent-sysprobe'] is defined or ansible_facts.services['datadog-agent-sysprobe.service'] is defined) }}"
and datadog_sysprobe_installed }}"

- name: Ensure datadog-agent-sysprobe is running if enabled and installed
service:
Expand All @@ -94,7 +98,7 @@
name: datadog-agent-sysprobe
state: stopped
enabled: no
when: not datadog_skip_running_check and (not datadog_enabled or not datadog_sysprobe_enabled)
when: not datadog_skip_running_check and (not datadog_enabled or not datadog_sysprobe_enabled) and datadog_sysprobe_installed

- name: Ensure datadog-agent, datadog-agent-process and datadog-agent-trace are not running
service:
Expand Down