diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/monitoring')
9 files changed, 49 insertions, 82 deletions
diff --git a/nixpkgs/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/nixpkgs/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix index 10bf273497dd..67a1218d1bd1 100644 --- a/nixpkgs/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix @@ -4,7 +4,7 @@ }: buildGoModule rec { pname = "buildkite-agent-metrics"; - version = "5.8.0"; + version = "5.9.2"; outputs = [ "out" "lambda" ]; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "buildkite"; repo = "buildkite-agent-metrics"; rev = "v${version}"; - hash = "sha256-QPtjKjUGKlqgklZ0wUOJ1lXuXHhWVC83cEJ4QVtgdl4="; + hash = "sha256-JYpsQUIKTlQz1VUmPfTzvgh++0p3NAoa105mvGoqgt8="; }; - vendorHash = "sha256-KgTzaF8dFD4VwcuSqmOy2CSfLuA0rjFwtCqGNYHFFlc="; + vendorHash = "sha256-2EbZLLaddR7oWXb9H9E35foevp6gMbWfoymDf2lQuto="; postInstall = '' mkdir -p $lambda/bin diff --git a/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 72ffed83f37c..325909ad6686 100644 --- a/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.9.2"; + version = "2.9.3"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-CYF0cse8NyHEnSZPRI9LNI09vr7kWPXHNibiEbW484E="; + hash = "sha256-9EUlznnZczgHXUy784830FvUS6OwaFf7FmUJGeWeXP0="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 16c8992ee039..8f1d6579158f 100644 --- a/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.77.0"; + version = "2.78.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-xU/1Bs3uIFomy6w2Vf50O3VbwoGfJMng88J1NXfg1pQ="; + hash = "sha256-5a9mrRd3YqKuz/VG7/CheMWpy99PpnyPaA5/VFEvj3Y="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix b/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix index 638d7fad330c..8961bc549535 100644 --- a/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, removeReferencesTo +{ lib, stdenv, fetchurl, fetchpatch , file, openssl, perl, perlPackages, nettools , withPerlTools ? false }: let @@ -45,7 +45,14 @@ in stdenv.mkDerivation rec { substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat" ''; - nativeBuildInputs = [ nettools removeReferencesTo file ]; + postConfigure = '' + # libraries contain configure options. Mangle store paths out from + # ./configure-generated file. + sed -i include/net-snmp/net-snmp-config.h \ + -e "/NETSNMP_CONFIGURE_OPTIONS/ s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" + ''; + + nativeBuildInputs = [ nettools file ]; buildInputs = [ openssl ] ++ lib.optional withPerlTools perlWithPkgs; @@ -61,9 +68,6 @@ in stdenv.mkDerivation rec { done mkdir $dev/bin mv $bin/bin/net-snmp-config $dev/bin - # libraries contain configure options - find $lib/lib -type f -exec remove-references-to -t $bin '{}' + - find $lib/lib -type f -exec remove-references-to -t $dev '{}' + ''; meta = with lib; { diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/atlas-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/atlas-exporter.nix new file mode 100644 index 000000000000..ce40a93e66f8 --- /dev/null +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/atlas-exporter.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "atlas-exporter"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "czerwonk"; + repo = "atlas_exporter"; + rev = version; + sha256 = "sha256-vhUhWO7fQpUHT5nyxbT8AylgUqDNZRSb+EGRNGZJ14E="; + }; + + vendorHash = "sha256-tR+OHxj/97AixuAp0Kx9xQsKPAxpvF6hDha5BgMBha0="; + + meta = with lib; { + description = "Prometheus exporter for RIPE Atlas measurement results "; + homepage = "https://github.com/czerwonk/atlas_exporter"; + license = licenses.lgpl3; + maintainers = with maintainers; [ clerie ]; + }; +} diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index b24c86cefb30..76a0155e7dfd 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.48.0"; + version = "2.48.1"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-B7BXjzTbIEEOYxgy0uvnbHPMV8WD9sRAW9yQd0h6vVc="; + hash = "sha256-8by9sz0EtiVuyoXR32h4++Fy01CyO8DfcsqPK3pSWHc="; }; in buildGoModule rec { @@ -47,7 +47,7 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; rev = "v${version}"; - hash = "sha256-4mQcfYk+DwhVADVQ1JuNn4ZDq2xDyzcDZHMozFrSLyo="; + hash = "sha256-9vdbjqmIaomg0acWguWELIxmEZ9jVXYvFlAF+Uo3dMw="; }; vendorHash = "sha256-OHTmAfhN+aPOJAIweW+GuvN2lNn2A+JeVU8chT1hqLU="; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/smartctl-exporter/0001-Return-the-cached-value-if-it-s-not-time-to-scan-aga.patch b/nixpkgs/pkgs/servers/monitoring/prometheus/smartctl-exporter/0001-Return-the-cached-value-if-it-s-not-time-to-scan-aga.patch deleted file mode 100644 index 28616251f37e..000000000000 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/smartctl-exporter/0001-Return-the-cached-value-if-it-s-not-time-to-scan-aga.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e81b06df67b1d42ef915615fafa0b56ef956673b Mon Sep 17 00:00:00 2001 -From: Andreas Fuchs <asf@boinkor.net> -Date: Thu, 11 Feb 2021 17:30:44 -0500 -Subject: [PATCH] Return the cached value if it's not time to scan again yet - -This should ensure that if we have a valid value cached (which ought -to be every time after the first scan), we return it as metrics. - -This fixes the crashes that would happen if queries happened earlier -than the re-scan interval allowed. - -Address review feedback: Shorten the time-to-scan logic - -We can express this in a single if statement, so it takes fewer lines -to do the "should we check again" check. ---- - readjson.go | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) - -diff --git a/readjson.go b/readjson.go -index da35448..c9996fd 100644 ---- a/readjson.go -+++ b/readjson.go -@@ -78,14 +78,7 @@ func readData(device string) (gjson.Result, error) { - - if _, err := os.Stat(device); err == nil { - cacheValue, cacheOk := jsonCache[device] -- timeToScan := false -- if cacheOk { -- timeToScan = time.Now().After(cacheValue.LastCollect.Add(options.SMARTctl.CollectPeriodDuration)) -- } else { -- timeToScan = true -- } -- -- if timeToScan { -+ if !cacheOk || time.Now().After(cacheValue.LastCollect.Add(options.SMARTctl.CollectPeriodDuration)) { - json, ok := readSMARTctl(device) - if ok { - jsonCache[device] = JSONCache{JSON: json, LastCollect: time.Now()} -@@ -93,7 +86,7 @@ func readData(device string) (gjson.Result, error) { - } - return gjson.Parse(DEFAULT_EMPTY_JSON), fmt.Errorf("smartctl returned bad data for device %s", device) - } -- return gjson.Parse(DEFAULT_EMPTY_JSON), fmt.Errorf("Too early collect called for device %s", device) -+ return cacheValue.JSON, nil - } - return gjson.Parse(DEFAULT_EMPTY_JSON), fmt.Errorf("Device %s unavialable", device) - } --- -2.33.1 - diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index f9d9ce499b5f..da6013b9b5ec 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -9,27 +9,18 @@ python3Packages.buildPythonApplication rec { pname = "prometheus-xmpp-alerts"; - version = "0.5.6"; + version = "0.5.8"; + format = "pyproject"; src = fetchFromGitHub { owner = "jelmer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PwShGS1rbfZCK5OS6Cnn+mduOpWAD4fC69mcGB5GB1c="; + sha256 = "sha256-iwqcowwJktZQfdxykpsw/MweAPY0KF7ojVwvk1LP8a4="; }; - patches = [ - # Required until https://github.com/jelmer/prometheus-xmpp-alerts/pull/33 is merged - # and contained in a release - (fetchpatch { - name = "Fix-outdated-entrypoint-definiton.patch"; - url = "https://github.com/jelmer/prometheus-xmpp-alerts/commit/c41dd41dbd3c781b874bcf0708f6976e6252b621.patch"; - hash = "sha256-G7fRLSXbkI5EDgGf4n9xSVs54IPD0ev8rTEFffRvLY0="; - }) - ]; - postPatch = '' - substituteInPlace setup.cfg \ + substituteInPlace pyproject.toml \ --replace "bs4" "beautifulsoup4" ''; @@ -46,6 +37,7 @@ python3Packages.buildPythonApplication rec { ]); nativeCheckInputs = with python3Packages; [ + setuptools unittestCheckHook pytz ]; diff --git a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index 8dcee384d6da..0cd20589caa2 100644 --- a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.28.5"; + version = "1.29.0"; subPackages = [ "cmd/telegraf" ]; @@ -16,10 +16,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-dmePzJ10VgzN6CxFAz7QloIsPULuTZH+Pjkd/kIQUmU="; + hash = "sha256-I6fc2cjM9dFOKvUBcMA5Suvwe3oQw2kKswfkoSJZf5I="; }; - vendorHash = "sha256-3buC6N/tHTf6FMEXU3+XlJVGntLe86Hx3eNpn7w0yMs="; + vendorHash = "sha256-frLMaB+n2YYsdmh3C7xPmZXwm984mYBws9jUPNhfIaU="; proxyVendor = true; ldflags = [ |