public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #59264 from basvandijk/alertmanager-0.16.2

Browse Source 
alertmanager: 0.15.3 -> 0.16.2
This commit is contained in:
Bas van Dijk 2019-04-10 16:45:18 +02:00 committed by GitHub
commit 08d9cf7ad4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/monitoring/prometheus/alertmanager.nix
View File

@ -151,17 +151,15 @@ in {
systemd.services.alertmanager = { systemd.services.alertmanager = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" ];
script = ''
${cfg.package}/bin/alertmanager \
${concatStringsSep " \\\n " cmdlineArgs}
'';
serviceConfig = { serviceConfig = {
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;
Restart = "always"; Restart = "always";
PrivateTmp = true; PrivateTmp = true;
WorkingDirectory = "/tmp"; WorkingDirectory = "/tmp";
ExecStart = "${cfg.package}/bin/alertmanager" +
optionalString (length cmdlineArgs != 0) (" \\\n " +
concatStringsSep " \\\n " cmdlineArgs);
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
}; };
}; };

7
pkgs/servers/monitoring/prometheus/alertmanager.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
name = "alertmanager-${version}"; name = "alertmanager-${version}";
version = "0.15.3"; version = "0.16.2";
rev = "v${version}"; rev = "v${version}";
goPackagePath = "github.com/prometheus/alertmanager"; goPackagePath = "github.com/prometheus/alertmanager";
@ -11,12 +11,9 @@ buildGoPackage rec {
inherit rev; inherit rev;
owner = "prometheus"; owner = "prometheus";
repo = "alertmanager"; repo = "alertmanager";
sha256 = "037wwfadb9rp1592v8bkqcsy9ym4gbhkg3pz6a6fzirg65d29aia"; sha256 = "0zjyr9964qxv5fsb17qhmxa1v4z0c7va60n05p9w6j2ah4dmcd8q";
}; };
# Tests exist, but seem to clash with the firewall.
doCheck = false;
buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in ''
-ldflags= -ldflags=
-X ${t}.Version=${version} -X ${t}.Version=${version}