[Config] Update config logic to look for checks in 3rd-party directory (rebased) #2467
Conversation
This file contains 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
- add tests on the config logic - refactor the logic - add some logic to add for checks in 3rd-party folder -- We are starting to install checks in the 3rd-party folder. Let the agent use these checks. Priority should be: - /etc/dd-agent/checks.d/ - /opt/datadog-agent/3rd-party/ - /opt/datadog-agent/agent/checks.d/ [olivier.vielpeau@datadoghq.com] Rebase on top of master and take into account the changes related to the service discovery
olivielpeau
changed the title
|
@hkaj I've tested the changes on what's directly related to 3rd-party checks, but I haven't set up and tested the service discovery part. Could you give this a try? |
|
@olivielpeau tested service discovery with these changes, it works as expected. Do you also need a review or that was already taken care of? |
|
LGTM |
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.
Based on @tmichelet's work in #2273, rebased on top of master (i.e. it now handles configs from the service discovery).
When we load the checks, we take into account the configs from files (
.yamland.default.yaml) first, and then the configs from service discovery for the checks that haven't been loaded yet.Also, this changes the logic of
get_check_classinutils.checkfilesto take into account checks from 3rd-party dirs.cc @hkaj
Original PR message: