diff options
author | Rob Vermaas <rob.vermaas@gmail.com> | 2017-05-04 09:40:51 +0000 |
---|---|---|
committer | Rob Vermaas <rob.vermaas@gmail.com> | 2017-05-04 09:47:21 +0000 |
commit | a9f054c8348bf8cd7630cd99def2fd86d22c78bd (patch) | |
tree | 4118e7a8ab53f982ef746fb9808b9561157fad88 /nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults | |
parent | f2771375222e399d3ec628ebd59e2dac501d7e4b (diff) | |
download | nixpkgs-a9f054c8348bf8cd7630cd99def2fd86d22c78bd.tar nixpkgs-a9f054c8348bf8cd7630cd99def2fd86d22c78bd.tar.gz nixpkgs-a9f054c8348bf8cd7630cd99def2fd86d22c78bd.tar.bz2 nixpkgs-a9f054c8348bf8cd7630cd99def2fd86d22c78bd.tar.lz nixpkgs-a9f054c8348bf8cd7630cd99def2fd86d22c78bd.tar.xz nixpkgs-a9f054c8348bf8cd7630cd99def2fd86d22c78bd.tar.zst nixpkgs-a9f054c8348bf8cd7630cd99def2fd86d22c78bd.zip |
dd-agent: Add default config files of dd-agent and auto_conf dir
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 77c85b0ecbc1070d7adff31b339bede92e4193fa)
Diffstat (limited to 'nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults')
-rwxr-xr-x | nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults b/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults new file mode 100755 index 00000000000..76724173171 --- /dev/null +++ b/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +dd=$(nix-build --no-out-link -A dd-agent ../../../..) +echo '# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY.' > dd-agent-defaults.nix +echo '[' >> dd-agent-defaults.nix +echo ' "auto_conf"' >> dd-agent-defaults.nix +for f in $(find $dd/agent/conf.d-system -maxdepth 1 -type f | grep -v '\.example' | sort); do + echo " \"$(basename $f)\"" >> dd-agent-defaults.nix +done +echo ']' >> dd-agent-defaults.nix |