diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-01-03 23:21:08 +0100 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-01-03 23:21:08 +0100 |
commit | 11a0b617832e2f186ca6754f8f7373772321007d (patch) | |
tree | e51ef1d72b8f22a2d6c88e33b388108c33cf9a7e /pkgs/servers/monitoring | |
parent | d69234ac7221ff15869cf13b1b40003afb4294d6 (diff) | |
parent | 3083dde52b0c71e511fbc00a0b509c92a98615fd (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/servers/monitoring')
-rw-r--r-- | pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/openldap-exporter.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/riemann/default.nix | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index 359349c14f4c3..04e2772ca2a11 100644 --- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -11,12 +11,10 @@ buildGoModule rec { sha256 = "0kcwhaf9k7c1xsz78064qz5zb4x3xgi1ifi49qkwiaqrzx2xy26p"; }; - vendorSha256 = "05hisrhlklbs26cgblzfjh6mhaih5asvbll54jngnmwylwjd1mmc"; + vendorSha256 = "sha256-5C5xQx8I5aHgi9P5gpHmPw6nV76D68/agVAP1vGab4w="; subPackages = [ "." ]; - runVend = true; - passthru.tests = { inherit (nixosTests.prometheus-exporters) nginxlog; }; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix index 84cb7a62f243c..c04a3df2e909d 100644 --- a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "openldap_exporter"; - version = "2.1.4"; + version = "2.2.0"; src = fetchFromGitHub { owner = "tomcz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G4bTYFm1Zh+7gfSIZnfrPyQ15967ebEzl33pgZu23D4="; + sha256 = "sha256-+lrLA9CbGNzvvbwn79ili/kFRCr6vMKDtkvyfnL9n9k="; }; ldflags = [ diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 0ea67d61e0678..b07c8b82c4319 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "riemann"; - version = "0.3.6"; + version = "0.3.7"; src = fetchurl { url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0hz69rka4f9h8i8cnswfz80fs0nm7j5436iiyd5i8lzd2avj4bps"; + sha256 = "sha256-WpJsmb74RhMMKGdNHcYcG4TA+QgpliQ2Ae89JkIjaAo="; }; nativeBuildInputs = [ makeWrapper ]; |