diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 22:46:05 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 22:46:05 +0200 |
commit | 66bc7fc1b3e7a85a2cfde9bb121498a181d411a4 (patch) | |
tree | fa53c32dfef1265496170172a28a3c71bb32a655 /pkgs/servers/monitoring | |
parent | f9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (diff) | |
parent | cfe51be04f8b7c36fe9f71ca5835bd683ede087f (diff) | |
download | nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.gz nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.bz2 nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.lz nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.xz nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.zst nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/monitoring')
-rw-r--r-- | pkgs/servers/monitoring/prometheus/default.nix | 82 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/snmp-exporter.nix | 4 |
2 files changed, 39 insertions, 47 deletions
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 627186e47ac3..e55d0018b882 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,54 +1,46 @@ -{ stdenv, go, buildGoPackage, fetchFromGitHub }: +{ lib, go, buildGoPackage, fetchFromGitHub }: let goPackagePath = "github.com/prometheus/prometheus"; -in rec { - buildPrometheus = { version, sha256, doCheck ? true, ... }@attrs: - let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in - buildGoPackage ({ - name = "prometheus-${version}"; +in +buildGoPackage rec { + pname = "prometheus"; + version = "2.12.0"; - inherit goPackagePath; + inherit goPackagePath; - src = fetchFromGitHub { - rev = "v${version}"; - owner = "prometheus"; - repo = "prometheus"; - inherit sha256; - }; - - buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=unknown - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - -X ${t}.GoVersion=${stdenv.lib.getVersion go} - ''; - - preInstall = '' - mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus" - cp -a $src/documentation/* $bin/share/doc/prometheus - cp -a $src/console_libraries $src/consoles $bin/etc/prometheus - ''; - - meta = with stdenv.lib; { - description = "Service monitoring system and time series database"; - homepage = https://prometheus.io; - license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz globin ]; - platforms = platforms.unix; - }; - } // attrs'); - - prometheus_1 = buildPrometheus { - version = "1.8.2"; - sha256 = "088flpg3qgnj9afl9vbaa19v2s1d21yxy38nrlv5m7cxwy2pi5pv"; + src = fetchFromGitHub { + rev = "v${version}"; + owner = "prometheus"; + repo = "prometheus"; + sha256 = "1ci9dc512c1hry1b8jqif0mrnks6w3yagwm3jf69ihcwilr2n7vs"; }; - prometheus_2 = buildPrometheus { - version = "2.12.0"; - sha256 = "1ci9dc512c1hry1b8jqif0mrnks6w3yagwm3jf69ihcwilr2n7vs"; + buildFlagsArray = let + t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; + in '' + -ldflags= + -X ${t}.Version=${version} + -X ${t}.Revision=unknown + -X ${t}.Branch=unknown + -X ${t}.BuildUser=nix@nixpkgs + -X ${t}.BuildDate=unknown + -X ${t}.GoVersion=${lib.getVersion go} + ''; + + preInstall = '' + mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus" + cp -a $src/documentation/* $bin/share/doc/prometheus + cp -a $src/console_libraries $src/consoles $bin/etc/prometheus + ''; + + doCheck = true; + + meta = with lib; { + description = "Service monitoring system and time series database"; + homepage = "https://prometheus.io"; + license = licenses.asl20; + maintainers = with maintainers; [ benley fpletz globin willibutz ]; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index cbafabb18b52..dfa81d4da832 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "snmp_exporter"; - version = "0.13.0"; + version = "0.15.0"; goPackagePath = "github.com/prometheus/snmp_exporter"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "prometheus"; repo = "snmp_exporter"; rev = "v${version}"; - sha256 = "071v9qqhp2hcbgml94dm1l212qi18by88r9755npq9ycrsmawkll"; + sha256 = "1cnz1wapxs3fkghzy6v90s56vd0ngynypyapcpbmx5y66rlpdxx6"; }; buildInputs = [ net_snmp ]; |