Skip to content

Add support for Universal Service Monitoring sysprobe configuration #458

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.

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

Merged
merged 3 commits into from
Jan 2, 2023

Conversation

marcus-crane
Copy link
Contributor

Closes: #457

As mentioned in #457, the Ansible stack doesn't currently support adding a service_monitoring_config into system-probe.yaml so this PR is an attempt to add that.

I'm very much pattern matching here so I wanted to open a PR with what I have currently to get some feedback: Mainly I'm unsure about some of the v6 CI pipelines which have configuration for v7 features.

I figure that is probably intentional to assert that v6 agents don't use v7 features?

Anyway, let me know if this is usable 🙂

@marcus-crane marcus-crane requested review from a team as code owners November 7, 2022 05:36
@marcus-crane marcus-crane changed the title Add basic outline for USM support Add support for Universal Service Monitoring Nov 7, 2022
@marcus-crane marcus-crane changed the title Add support for Universal Service Monitoring Add support for Universal Service Monitoring sysprobe configuration Nov 7, 2022
Copy link
Contributor

@alai97 alai97 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good for docs!

Copy link
Contributor Author

@marcus-crane marcus-crane left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reminder to myself as I'm not at my desktop currently

and service_monitoring_config['enabled']))
and datadog_sysprobe_installed }}"
when: not datadog_skip_running_check
and (not datadog_before_7180)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah woops, this should be datadog_before_7400

@marcus-crane
Copy link
Contributor Author

@alai97 Is there anything else I need to do in order to have this merged or reviewed further? 🤔

Copy link
Contributor

@KSerrania KSerrania left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @marcus-crane,

Sorry for the late review, and thanks for your contribution! This PR looks good to me overall.

Regarding the Agent 6 / Agent 7 difference, I checked with the USM product owners, and USM should also work on Agent 6 (they will be working on updating the documentation page). Could you also add the service_monitoring_config option to the ci_test/install_agent_6.yaml test config?

@marcus-crane
Copy link
Contributor Author

@KSerrania Heya, just letting you know that I've implemented the v6 change 🙂

I see that USM appears to have moved over to Public Beta with it being pushed visibly in the UI so it'll be nice to be able to set this up via Ansible (we've currently just been manually enabling it on a few instances given the existing config can't express the options needed)

@KSerrania KSerrania merged commit 3986fa8 into DataDog:main Jan 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support for Universal Service Monitoring
3 participants