diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index 58a0faed962c..1736b0c088a3 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -153,6 +153,18 @@ in { type = types.bool; }; + processAgentPackage = mkOption { + default = pkgs.datadog-process-agent; + defaultText = literalExpression "pkgs.datadog-process-agent"; + description = lib.mdDoc '' + Which DataDog v7 agent package to use. Note that the provided + package is expected to have an overridable `pythonPackages`-attribute + which configures the Python environment with the Datadog + checks. + ''; + type = types.package; + }; + enableTraceAgent = mkOption { description = lib.mdDoc '' Whether to enable the trace agent. @@ -270,7 +282,7 @@ in { path = [ ]; script = '' export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile}) - ${pkgs.datadog-process-agent}/bin/process-agent --config /etc/datadog-agent/datadog.yaml + ${cfg.processAgentPackage}/bin/process-agent --config /etc/datadog-agent/datadog.yaml ''; }); diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index c9a27df0bd4e..1fa275ab2b53 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,7 +1,7 @@ { lib , stdenv , cmake -, buildGoModule +, buildGo118Module , makeWrapper , fetchFromGitHub , pythonPackages @@ -14,12 +14,12 @@ let # keep this in sync with github.com/DataDog/agent-payload dependency - payloadVersion = "4.78.0"; + payloadVersion = "5.0.89"; python = pythonPackages.python; owner = "DataDog"; repo = "datadog-agent"; goPackagePath = "github.com/${owner}/${repo}"; - version = "7.38.1"; + version = "7.45.1"; src = fetchFromGitHub { inherit owner repo; @@ -35,7 +35,7 @@ let cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"]; }; -in buildGoModule rec { +in buildGo118Module rec { pname = "datadog-agent"; inherit src version;