alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

datadog-agent: 6.9.0 -> 6.10.0 (#56523)

Browse source
This commit is contained in:
Yurii Izorkin 2019-02-28 22:48:49 +03:00 committed by Wael Nasreddine
parent ab9c2c1148
commit fa20f98571
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/monitoring/datadog-agent.nix
View file

@ -202,7 +202,7 @@ in {
}; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ datadogPkg pkgs.sysstat pkgs.procps ]; environment.systemPackages = [ datadogPkg pkgs.sysstat pkgs.procps pkgs.iproute ];
users.extraUsers.datadog = { users.extraUsers.datadog = {
description = "Datadog Agent User"; description = "Datadog Agent User";
@ -216,7 +216,7 @@ in {
systemd.services = let systemd.services = let
makeService = attrs: recursiveUpdate { 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" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
User = "datadog"; User = "datadog";

8
pkgs/tools/networking/dd-agent/6.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig, systemd }: { lib, stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig, systemd, hostname }:
let let
# keep this in sync with github.com/DataDog/agent-payload dependency # keep this in sync with github.com/DataDog/agent-payload dependency
@ -6,14 +6,14 @@ let
in buildGoPackage rec { in buildGoPackage rec {
name = "datadog-agent-${version}"; name = "datadog-agent-${version}";
version = "6.9.0"; version = "6.10.0";
owner = "DataDog"; owner = "DataDog";
repo = "datadog-agent"; repo = "datadog-agent";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit owner repo; inherit owner repo;
rev = "${version}"; rev = "${version}";
sha256 = "1ddzml9ip5nm5z6cmnsrqxlmcr8411qlyr05hky7yn1dacin9ifw"; sha256 = "076ww3swlqi7gfmqmnllhif8f6skv0jwc2gq3mi855p4mm6qyiia";
}; };
subPackages = [ subPackages = [
@ -51,6 +51,8 @@ in buildGoPackage rec {
sed -e "s|PyChecksPath =.*|PyChecksPath = \"$bin/${python.sitePackages}\"|" \ sed -e "s|PyChecksPath =.*|PyChecksPath = \"$bin/${python.sitePackages}\"|" \
-e "s|distPath =.*|distPath = \"$bin/share/datadog-agent\"|" \ -e "s|distPath =.*|distPath = \"$bin/share/datadog-agent\"|" \
-i cmd/agent/common/common_nix.go -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 # Install the config files and python modules from the "dist" dir

8
pkgs/tools/networking/dd-agent/deps.nix generated
View file

@ -892,12 +892,12 @@
}; };
} }
{ {
goPackagePath = "github.com/spf13/viper"; goPackagePath = "github.com/DataDog/viper";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/spf13/viper"; url = "https://github.com/DataDog/viper";
rev = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736"; rev = "23ced3bc6b3751855704445e48da2c53075ade86";
sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis"; sha256 = "1zzf4mqpmk47p3395k2v8q6wi7lnqxr0l55vv4zk9gpqqyifbm9m";
}; };
} }
{ {