diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2017-06-02 07:50:41 +0100 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2017-06-02 08:16:47 +0100 |
| commit | 50f53da9eff3e7a1686ff439b341ada5bd63ddcd (patch) | |
| tree | 9675a5777ab943e247e8e3c3d66a55d3289f850f /nixos/modules/services/monitoring/dd-agent | |
| parent | b829bdca1db84a4ef6b9458c6b583d68ef7d33e9 (diff) | |
| download | nixlib-50f53da9eff3e7a1686ff439b341ada5bd63ddcd.tar nixlib-50f53da9eff3e7a1686ff439b341ada5bd63ddcd.tar.gz nixlib-50f53da9eff3e7a1686ff439b341ada5bd63ddcd.tar.bz2 nixlib-50f53da9eff3e7a1686ff439b341ada5bd63ddcd.tar.lz nixlib-50f53da9eff3e7a1686ff439b341ada5bd63ddcd.tar.xz nixlib-50f53da9eff3e7a1686ff439b341ada5bd63ddcd.tar.zst nixlib-50f53da9eff3e7a1686ff439b341ada5bd63ddcd.zip | |
datadog: Properly use configured package.
Diffstat (limited to 'nixos/modules/services/monitoring/dd-agent')
| -rw-r--r-- | nixos/modules/services/monitoring/dd-agent/dd-agent.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index e55faed8e078..04a21871519b 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -23,7 +23,7 @@ let etcfiles = map (i: { source = if builtins.hasAttr "config" i then pkgs.writeText "${i.name}.yaml" i.config - else "${pkgs.dd-agent}/agent/conf.d-system/${i.name}.yaml"; + else "${cfg.agent}/agent/conf.d-system/${i.name}.yaml"; target = "dd-agent/conf.d/${i.name}.yaml"; } ) cfg.integrations ++ @@ -119,13 +119,13 @@ in { path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground"; + ExecStart = "${cfg.agent}/bin/dd-agent foreground"; User = "datadog"; Group = "datadog"; Restart = "always"; RestartSec = 2; }; - restartTriggers = [ pkgs.dd-agent ddConf ] ++ etcSources; + restartTriggers = [ cfg.agent ddConf ] ++ etcSources; }; systemd.services.dd-jmxfetch = lib.mkIf (builtins.any (i: i.name == "jmx") cfg.integrations) { @@ -133,7 +133,7 @@ in { path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch"; + ExecStart = "${cfg.agent}/bin/dd-jmxfetch"; User = "datadog"; Group = "datadog"; Restart = "always"; |