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/module-list.nix | |
| parent | f2771375222e399d3ec628ebd59e2dac501d7e4b (diff) | |
| download | nixlib-a9f054c8348bf8cd7630cd99def2fd86d22c78bd.tar nixlib-a9f054c8348bf8cd7630cd99def2fd86d22c78bd.tar.gz nixlib-a9f054c8348bf8cd7630cd99def2fd86d22c78bd.tar.bz2 nixlib-a9f054c8348bf8cd7630cd99def2fd86d22c78bd.tar.lz nixlib-a9f054c8348bf8cd7630cd99def2fd86d22c78bd.tar.xz nixlib-a9f054c8348bf8cd7630cd99def2fd86d22c78bd.tar.zst nixlib-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/module-list.nix')
| -rw-r--r-- | nixos/modules/module-list.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7e523ac483cd..9e1166af0946 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -328,7 +328,7 @@ ./services/monitoring/cadvisor.nix ./services/monitoring/collectd.nix ./services/monitoring/das_watchdog.nix - ./services/monitoring/dd-agent.nix + ./services/monitoring/dd-agent/dd-agent.nix ./services/monitoring/grafana.nix ./services/monitoring/graphite.nix ./services/monitoring/hdaps.nix |