[Linux] Fix system-probe enablement conditions #336
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KSerrania
force-pushed
the
kserrania/fix-system-probe-linux
branch
from
e040d77 to
da83266
Compare
KSerrania
commented
Mar 26, 2021
| Once modification is complete, follow the steps below: | ||
| **Note**: This configuration works with Agent 6.24.1+ and 7.24.1+. For older Agent versions, refer to [the public documentation][8] on how to enable system-probe. | ||
|
|
||
| On Linux, once this modification is complete, follow the steps below if you installed an Agent version older than 6.18.0 or 7.18.0: |
Contributor
Author
There was a problem hiding this comment.
Added this because on later versions, this should not be needed since the datadog-agent-sysprobe service is tied to the datadog-agent service.
Another option would be to automate these steps, but I'm not sure it's worth spending time on it given that this only affects a small number of old versions.
albertvaka
approved these changes
Mar 26, 2021
kayayarai
approved these changes
Mar 29, 2021
bkabrda
approved these changes
Mar 30, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Fixes the logic around starting / stopping the system-probe service, with different paths depending on the Agent version:
datadog-agent-sysprobeservice is independent from thedatadog-agentservice and is started / stopped / restarted by the role, depending on thesystem_probe_config.enabledvariabledatadog-agent-sysprobeservice depends ondatadog-agent, therefore only the datadog-agent service needs to be restarted on configuration changes. Thesystem_probe_config.enabledvariable still defines that behavior.network_config.enabledvariable defines if the service should be started or not. Thesystem_probe_config.enabledvariable is still supported for backwards compatibility, but is not recommended in the documentation anymore.Makes sure the role doesn't crash when
system_probe_confighas aNoneor empty value.Additional notes
TODO: update documentation on how to enable system-probe modules depending on the Agent version (link to the public docs).