diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-05-24 10:24:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-24 10:24:38 +0100 |
commit | d45e3e36f85ebf98f7e9bcb4105c44463a171655 (patch) | |
tree | 2e1a7a04462625a6887f09bde44ea965699d318f /nixos/modules | |
parent | e27a4502cb1e0fb4a618dae0f6eee390f037d089 (diff) | |
parent | f4c87183df72a71d3d12c20bb2d99f68207dce8f (diff) | |
download | nixlib-d45e3e36f85ebf98f7e9bcb4105c44463a171655.tar nixlib-d45e3e36f85ebf98f7e9bcb4105c44463a171655.tar.gz nixlib-d45e3e36f85ebf98f7e9bcb4105c44463a171655.tar.bz2 nixlib-d45e3e36f85ebf98f7e9bcb4105c44463a171655.tar.lz nixlib-d45e3e36f85ebf98f7e9bcb4105c44463a171655.tar.xz nixlib-d45e3e36f85ebf98f7e9bcb4105c44463a171655.tar.zst nixlib-d45e3e36f85ebf98f7e9bcb4105c44463a171655.zip |
Merge pull request #41015 from tazjin/feat/datadog-gohai
Add missing gohai derivation and fix dd-agent service unit
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/monitoring/dd-agent/dd-agent.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index beaa2c01b298..6367c8245f71 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -57,7 +57,7 @@ let instances: - use_mount: no ''; - + networkConfig = pkgs.writeText "network.yaml" '' init_config: @@ -68,13 +68,13 @@ let - lo - lo0 ''; - + postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig; nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig; mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig; jmxConfig = pkgs.writeText "jmx.yaml" cfg.jmxConfig; processConfig = pkgs.writeText "process.yaml" cfg.processConfig; - + etcfiles = let defaultConfd = import ./dd-agent-defaults.nix; @@ -150,7 +150,7 @@ in { default = null; type = types.uniq (types.nullOr types.string); }; - + mongoConfig = mkOption { description = "MongoDB integration configuration"; default = null; @@ -166,7 +166,7 @@ in { processConfig = mkOption { description = '' Process integration configuration - + See http://docs.datadoghq.com/integrations/process/ ''; default = null; @@ -190,7 +190,7 @@ in { systemd.services.dd-agent = { description = "Datadog agent monitor"; - path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps ]; + path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps pkgs.gohai ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground"; |