diff options
author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2017-06-03 12:27:43 +0100 |
---|---|---|
committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2017-06-03 12:27:43 +0100 |
commit | 668556331b78b67ca3278a6d7a33af9c6a392c7a (patch) | |
tree | ab993ba07c24f9a155d0c43c242294fee142d392 /nixos | |
parent | de0d0da1fdb393572fc24d93f771ada9aa06a028 (diff) |
Revert "datadog: Properly use configured package."
This reverts commit 50f53da9eff3e7a1686ff439b341ada5bd63ddcd.
Diffstat (limited to 'nixos')
-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 04a21871519be..e55faed8e0788 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 "${cfg.agent}/agent/conf.d-system/${i.name}.yaml"; + else "${pkgs.dd-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 = "${cfg.agent}/bin/dd-agent foreground"; + ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground"; User = "datadog"; Group = "datadog"; Restart = "always"; RestartSec = 2; }; - restartTriggers = [ cfg.agent ddConf ] ++ etcSources; + restartTriggers = [ pkgs.dd-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 = "${cfg.agent}/bin/dd-jmxfetch"; + ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch"; User = "datadog"; Group = "datadog"; Restart = "always"; |