nixos: datadog: process config + fix config loading #25288
Closed
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
|
@domenkozar, thanks for your PR! By analyzing the history of the files in this pull request, we identified @thoughtpolice, @rbvermaa and @mbbx6spp to be potential reviewers. |
domenkozar
changed the title
domenkozar
force-pushed
the
nixos-datadog-process-config
branch
from
bdabc6f
to
106f262
Compare
Before NixOS 17.03, we were using dd-agent 5.5.X which used configuration from /etc/dd-agent/conf.d In NixOS 17.03 the default conf.d location is first used relative, meaning that $out/agent/conf.d was used without NixOS overrides. This patch first copies $out/agent/cond.d and then applies all nixos config changes and stores them in a single derivation.
domenkozar
force-pushed
the
nixos-datadog-process-config
branch
from
106f262
to
5830e71
Compare
|
Going to merge this in a few days if there are no objections. |
|
@rbvermaa said that we should also keep a way to add additional configs via |
rbvermaa
added a commit
that referenced
this pull request
May 4, 2017
to /etc/dd-agent/conf.d by default, and make sure /etc/dd-agent/conf.d is used. Before NixOS 17.03, we were using dd-agent 5.5.X which used configuration from /etc/dd-agent/conf.d In NixOS 17.03 the default conf.d location is first used relative, meaning that $out/agent/conf.d was used without NixOS overrides. This change implements similar functionality as PR #25288, without breaking backwards compatibility.
rbvermaa
added a commit
that referenced
this pull request
May 4, 2017
to /etc/dd-agent/conf.d by default, and make sure /etc/dd-agent/conf.d is used. Before NixOS 17.03, we were using dd-agent 5.5.X which used configuration from /etc/dd-agent/conf.d In NixOS 17.03 the default conf.d location is first used relative, meaning that $out/agent/conf.d was used without NixOS overrides. This change implements similar functionality as PR #25288, without breaking backwards compatibility. (cherry picked from commit 77c85b0)
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.
Two changes to datadog module:
support
processConfigoption: c5d4f0dfix config loading: bdabc6f
@rbvermaa @edolstra @thoughtpolice
It was tested on 17.03, I'll also cherry-pick to mater.