diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-28 08:26:42 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-28 08:26:42 +0200 |
commit | 5061fe0c2c7743370e1d379d6fa60eed26ff1470 (patch) | |
tree | 4a4ee79a6e0694d3c7ad6fbeff33343d83458e6c /pkgs/servers/monitoring/prometheus | |
parent | a2538606e3115e16db2e5075ecf37b886ad64ede (diff) | |
parent | 98640fd48212f8e6552517f667bba1901f5936d4 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/monitoring/prometheus')
13 files changed, 27 insertions, 21 deletions
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 95e2822d65ba5..f1dbf0e51445e 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "alertmanager"; - version = "0.16.2"; + version = "0.18.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "0zjyr9964qxv5fsb17qhmxa1v4z0c7va60n05p9w6j2ah4dmcd8q"; + sha256 = "17f3a4fiwycpd031k1d9irhd96cklbh2ygs35j5r6hgw2130sy4p"; }; buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' @@ -33,7 +33,7 @@ buildGoPackage rec { description = "Alert dispatcher for the Prometheus monitoring system"; homepage = https://github.com/prometheus/alertmanager; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz ]; + maintainers = with maintainers; [ benley fpletz globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 8806a88693bed..627186e47ac37 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -37,7 +37,7 @@ in rec { description = "Service monitoring system and time series database"; homepage = https://prometheus.io; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz ]; + maintainers = with maintainers; [ benley fpletz globin ]; platforms = platforms.unix; }; } // attrs'); @@ -48,7 +48,7 @@ in rec { }; prometheus_2 = buildPrometheus { - version = "2.11.1"; - sha256 = "1d4kiv88v1p74cm1wg6wk1cs963xg2rlhkxw86slf9hmldlgww2l"; + version = "2.12.0"; + sha256 = "1ci9dc512c1hry1b8jqif0mrnks6w3yagwm3jf69ihcwilr2n7vs"; }; } diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index b01fa0024de52..d1cb5dcec9cb7 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -19,6 +19,6 @@ buildGoPackage rec { inherit (src.meta) homepage; description = "A dnsmasq exporter for Prometheus"; license = licenses.asl20; - maintainers = with maintainers; [ willibutz ]; + maintainers = with maintainers; [ willibutz globin ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index 6f6370ce14df8..479ff174d1142 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -19,6 +19,6 @@ buildGoPackage rec { inherit (src.meta) homepage; description = "Prometheus metrics exporter for Dovecot"; license = licenses.asl20; - maintainers = with maintainers; [ willibutz ]; + maintainers = with maintainers; [ willibutz globin ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 21c6c8da64393..947dfc2b70c3e 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -24,7 +24,7 @@ buildGoPackage rec { description = "Export Prometheus-style metrics about mail server functionality"; homepage = "https://github.com/cherti/mailexporter"; license = licenses.gpl3; - maintainers = with maintainers; [ willibutz ]; + maintainers = with maintainers; [ willibutz globin ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index a7934227ffab2..f5c438a87dc11 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "mysqld_exporter"; - version = "0.10.0"; + version = "0.11.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/mysqld_exporter"; @@ -11,14 +11,14 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "mysqld_exporter"; - sha256 = "1133bgyp5vljz2qvfh0qzq8h8bkc8vci3jnmbr633bh3jpaqm2py"; + sha256 = "1684jf96dy5bs0y0689vlcw82lqw8kw2phlnp6pq1cq56fcwdxjn"; }; meta = with stdenv.lib; { description = "Prometheus exporter for MySQL server metrics"; homepage = https://github.com/prometheus/mysqld_exporter; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index c51574610e87a..cc527c29ac215 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -23,7 +23,7 @@ buildGoPackage rec { description = "NGINX Prometheus Exporter for NGINX and NGINX Plus"; homepage = "https://github.com/nginxinc/nginx-prometheus-exporter"; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz willibutz ]; + maintainers = with maintainers; [ benley fpletz willibutz globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index d0f55226d2fff..857a7667c13fb 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "node_exporter"; - version = "0.17.0"; + version = "0.18.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/node_exporter"; @@ -11,17 +11,23 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "08g4dg6zcr95j88apsxp828jfyx4vq271w1mgkf77c46c16d2nh0"; + sha256 = "0s3sp1gj86p7npxl38hkgs6ymd3wjjmc5hydyg1b5wh0x3yvpx07"; }; # FIXME: tests fail due to read-only nix store doCheck = false; + buildFlagsArray = '' + -ldflags= + -X ${goPackagePath}/vendor/github.com/prometheus/common/version.Version=${version} + -X ${goPackagePath}/vendor/github.com/prometheus/common/version.Revision=${rev} + ''; + meta = with stdenv.lib; { description = "Prometheus exporter for machine metrics"; homepage = https://github.com/prometheus/node_exporter; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz ]; + maintainers = with maintainers; [ benley fpletz globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index 5dfada4f55d71..5d62ff8c50f99 100644 --- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -20,6 +20,6 @@ buildGoPackage rec { inherit (src.meta) homepage; description = "Prometheus exporter for OpenVPN"; license = licenses.asl20; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 01d9ec0283381..8202a8c8c29f3 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -51,6 +51,6 @@ buildGoPackage rec { inherit (src.meta) homepage; description = "A Prometheus exporter for Postfix"; license = licenses.asl20; - maintainers = with maintainers; [ willibutz ]; + maintainers = with maintainers; [ willibutz globin ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index 57574481cf68c..abc7db8086bb3 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -19,6 +19,6 @@ buildGoPackage rec { inherit (src.meta) homepage; description = "A Prometheus exporter for PostgreSQL"; license = licenses.asl20; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index cd72f98ecfba2..5682c3ccd2a07 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { description = "Prometheus exporter that exposes metrics from a Ubiquiti UniFi Controller and UniFi devices"; homepage = https://github.com/mdlayher/unifi_exporter; license = licenses.mit; - maintainers = with maintainers; [ bachp ]; + maintainers = with maintainers; [ bachp globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 1b4ffd61ec78e..80fe9b2357f4b 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { description = "A Prometheus exporter for WireGuard, written in Rust."; license = licenses.mit; homepage = https://github.com/MindFlavor/prometheus_wireguard_exporter; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ma27 globin ]; }; } |