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.

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

Merge configs from files and service discovery for the same check #3899

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

sodabrew
Copy link
Contributor

What does this PR do?

This PR merges the "instances" of a given check loaded from a file with the additional instances discovered by service discovery, e.g. from Docker container labels.

Motivation

See #3898 for my story.

Testing Guidelines

An overview on testing
is available in our contribution guidelines.

Additional Notes

I haven't run unit tests locally yet, so I might iterate these commits a few times while I let the CI tool do its thing.

@sodabrew sodabrew force-pushed the astone/merge-discovered-checks branch from e067a54 to b1404ee Compare October 28, 2020 00:11
@sodabrew
Copy link
Contributor Author

AppVeyor is teh slow. I assume you all have Circle CI but it's private to DD employees? Hope the CI is actually running!

@sodabrew sodabrew force-pushed the astone/merge-discovered-checks branch 3 times, most recently from 3ec1669 to 2c76354 Compare October 28, 2020 01:37
@sodabrew sodabrew force-pushed the astone/merge-discovered-checks branch from 2c76354 to cdbfd4a Compare October 28, 2020 01:45
@sodabrew
Copy link
Contributor Author

I went looking through some prior PRs to handled repeated config instances, one I found was PR #3311 (merged)

@olivielpeau
Copy link
Member

Hi @sodabrew, is there a reason you're still using Agent v5? Active feature development is now done on the Agent v6/v7, located in this repository: https://github.com/DataDog/datadog-agent/, and Agent v6/v7 is able to handle multiple instances of the same check coming from different configuration sources.

@sodabrew
Copy link
Contributor Author

sodabrew commented Oct 28, 2020

Thanks for checking in on this PR! Yep, I'm aware the Python 2.7 agent is long in the tooth!

Glad to hear that this feature is available on 6/7. I'm working in parallel on adding this feature to agent 5, or switching my conflicting config to use discovery as well, or migrating to agent 7. There are clear benefits to upgrading, but I have some odd dependencies that I'm wrangling.

@sodabrew
Copy link
Contributor Author

CI is passing, but the configcheck tool isn't showing the right output yet.

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.

2 participants