movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 20:55:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

datadog: Properly use configured package.

Browse source
This commit is contained in:
Mateusz Kowalczyk 2017-06-02 07:50:41 +01:00
parent b829bdca1d
commit 50f53da9ef
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/monitoring/dd-agent/dd-agent.nix
View file

@ -23,7 +23,7 @@ let
etcfiles = etcfiles =
map (i: { source = if builtins.hasAttr "config" i map (i: { source = if builtins.hasAttr "config" i
then pkgs.writeText "${i.name}.yaml" i.config 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"; target = "dd-agent/conf.d/${i.name}.yaml";
} }
) cfg.integrations ++ ) cfg.integrations ++
@ -119,13 +119,13 @@ in {
path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps ]; path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground"; ExecStart = "${cfg.agent}/bin/dd-agent foreground";
User = "datadog"; User = "datadog";
Group = "datadog"; Group = "datadog";
Restart = "always"; Restart = "always";
RestartSec = 2; 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) { 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 ]; path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch"; ExecStart = "${cfg.agent}/bin/dd-jmxfetch";
User = "datadog"; User = "datadog";
Group = "datadog"; Group = "datadog";
Restart = "always"; Restart = "always";

2
pkgs/tools/networking/dd-agent/default.nix
View file

@ -5,7 +5,7 @@
# wrapper with their PYTHONPATH. This means overrideAttrs is not # wrapper with their PYTHONPATH. This means overrideAttrs is not
# strong enough (it overrides too late), we need to call it # strong enough (it overrides too late), we need to call it
# beforehand. # beforehand.
, extraBuildInputs ? [ pythonPackages.psutil ] }: , extraBuildInputs ? [ ] }:
let let
inherit (pythonPackages) python; inherit (pythonPackages) python;
docker_1_10 = pythonPackages.buildPythonPackage rec { docker_1_10 = pythonPackages.buildPythonPackage rec {