diff options
| author | Yurii Izorkin <izorkin@elven.pw> | 2019-02-28 22:48:49 +0300 |
|---|---|---|
| committer | Wael Nasreddine <wael.nasreddine@gmail.com> | 2019-02-28 11:48:49 -0800 |
| commit | fa20f98571c96ef62c9d266201c44fd1f465298e (patch) | |
| tree | cb6b4ae2309f7ee166cba17ea16e36c4d3751848 | |
| parent | ab9c2c11483fe795a58a3e4206acc0048ebfe493 (diff) | |
| download | nixpkgs-fa20f98571c96ef62c9d266201c44fd1f465298e.tar nixpkgs-fa20f98571c96ef62c9d266201c44fd1f465298e.tar.gz nixpkgs-fa20f98571c96ef62c9d266201c44fd1f465298e.tar.bz2 nixpkgs-fa20f98571c96ef62c9d266201c44fd1f465298e.tar.lz nixpkgs-fa20f98571c96ef62c9d266201c44fd1f465298e.tar.xz nixpkgs-fa20f98571c96ef62c9d266201c44fd1f465298e.tar.zst nixpkgs-fa20f98571c96ef62c9d266201c44fd1f465298e.zip | |
datadog-agent: 6.9.0 -> 6.10.0 (#56523)
| -rw-r--r-- | nixos/modules/services/monitoring/datadog-agent.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/dd-agent/6.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/networking/dd-agent/deps.nix | 8 |
3 files changed, 11 insertions, 9 deletions
diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index a4d29d45bac..11673bf8bc7 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -202,7 +202,7 @@ in { }; }; config = mkIf cfg.enable { - environment.systemPackages = [ datadogPkg pkgs.sysstat pkgs.procps ]; + environment.systemPackages = [ datadogPkg pkgs.sysstat pkgs.procps pkgs.iproute ]; users.extraUsers.datadog = { description = "Datadog Agent User"; @@ -216,7 +216,7 @@ in { systemd.services = let makeService = attrs: recursiveUpdate { - path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps ]; + path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.iproute ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { User = "datadog"; diff --git a/pkgs/tools/networking/dd-agent/6.nix b/pkgs/tools/networking/dd-agent/6.nix index 16955f9c4f1..944ba604ece 100644 --- a/pkgs/tools/networking/dd-agent/6.nix +++ b/pkgs/tools/networking/dd-agent/6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig, systemd }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig, systemd, hostname }: let # keep this in sync with github.com/DataDog/agent-payload dependency @@ -6,14 +6,14 @@ let in buildGoPackage rec { name = "datadog-agent-${version}"; - version = "6.9.0"; + version = "6.10.0"; owner = "DataDog"; repo = "datadog-agent"; src = fetchFromGitHub { inherit owner repo; rev = "${version}"; - sha256 = "1ddzml9ip5nm5z6cmnsrqxlmcr8411qlyr05hky7yn1dacin9ifw"; + sha256 = "076ww3swlqi7gfmqmnllhif8f6skv0jwc2gq3mi855p4mm6qyiia"; }; subPackages = [ @@ -51,6 +51,8 @@ in buildGoPackage rec { sed -e "s|PyChecksPath =.*|PyChecksPath = \"$bin/${python.sitePackages}\"|" \ -e "s|distPath =.*|distPath = \"$bin/share/datadog-agent\"|" \ -i cmd/agent/common/common_nix.go + sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \ + -i pkg/util/hostname_nix.go ''; # Install the config files and python modules from the "dist" dir diff --git a/pkgs/tools/networking/dd-agent/deps.nix b/pkgs/tools/networking/dd-agent/deps.nix index eddd16e0ab9..cd26e3c6873 100644 --- a/pkgs/tools/networking/dd-agent/deps.nix +++ b/pkgs/tools/networking/dd-agent/deps.nix @@ -892,12 +892,12 @@ }; } { - goPackagePath = "github.com/spf13/viper"; + goPackagePath = "github.com/DataDog/viper"; fetch = { type = "git"; - url = "https://github.com/spf13/viper"; - rev = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736"; - sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis"; + url = "https://github.com/DataDog/viper"; + rev = "23ced3bc6b3751855704445e48da2c53075ade86"; + sha256 = "1zzf4mqpmk47p3395k2v8q6wi7lnqxr0l55vv4zk9gpqqyifbm9m"; }; } { |