Support /conf.d in cluster-agent image #2896
Merged
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
CharlyF
reviewed
Jan 16, 2019
| @@ -13,6 +13,9 @@ if [[ -z "$DD_API_KEY" ]]; then | |||
| exit 1 | |||
| fi | |||
|
|
|||
| ##### Copy the custom confs ##### | |||
| find /conf.d -name '*.yaml' -exec cp --parents -fv {} /etc/datadog-agent/ \; | |||
There was a problem hiding this comment.
Can't we target a specific folder for custom config files ? It feels like we might end up copying unexpected files to the datadog-agent folder.
There was a problem hiding this comment.
This logic is copied from the agent's container, and it handles copying sub-folders. It means:
- copy every file found in
/conf.dto/etc/datadog-agent/conf.d/ - copy every file found in
/conf.d/mysql.dto the new/etc/datadog-agent/conf.d/mysql.d/folder
CharlyF
approved these changes
Jan 16, 2019
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?
As cluster-check configurations will be supported as yaml files for out-of-cluster resources, port the agent's support of the
/conf.dfolder to the cluster-agent image.