diff options
Diffstat (limited to 'pkgs/servers/monitoring')
12 files changed, 44 insertions, 50 deletions
diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index 1aa1308039130..0ad3d46ed6650 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "do-agent"; - version = "3.15.2"; + version = "3.16.2"; src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; rev = version; - sha256 = "sha256-YK4k2iSKrRVraUjbUCYxNjH+CGn6eASsEKIU5QsfcNM="; + sha256 = "sha256-glHrWRZqkKoCLy3nuOZQG98I35ZR4S9nL6XqBsa2rOQ="; }; ldflags = [ "-X main.version=${version}" ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index c1d7d4fbd566e..ccd7aaa911247 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,16 +2,17 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.30.2"; + version = "0.32.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "sha256-yexCK4GBA997CShtuQQTs1GBsXoknUnWWO0Uotb9EG8="; + sha256 = "sha256-t5rQSNLpX0ktK4mKgX6OhNLkANQ1LbFEjmQo/r7UHOM="; }; - vendorHash = "sha256-Cl3oygH1RPF+ZdJvkDmr7eyU5daxaZwNE8pQOHK/qP4="; + vendorHash = "sha256-5beHG1mZkNcDhccleqTlMA+uiV5d6SSh2QWiL4g3O28="; + proxyVendor = true; # darwin/linux hash mismatch ldflags = let prefix = "github.com/grafana/agent/pkg/build"; @@ -32,26 +33,21 @@ buildGoModule rec { ]; subPackages = [ - "cmd/agent" - "cmd/agentctl" + "cmd/grafana-agent" + "cmd/grafana-agentctl" ]; # uses go-systemd, which uses libsystemd headers # https://github.com/coreos/go-systemd/issues/351 env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isLinux [ "-I${lib.getDev systemd}/include" ]); - # tries to access /sys: https://github.com/grafana/agent/issues/333 - preBuild = '' - rm pkg/integrations/node_exporter/node_exporter_test.go - ''; - # go-systemd uses libsystemd under the hood, which does dlopen(libsystemd) at # runtime. # Add to RUNPATH so it can be found. postFixup = lib.optionalString stdenv.isLinux '' patchelf \ - --set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/agent)" \ - $out/bin/agent + --set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/grafana-agent)" \ + $out/bin/grafana-agent ''; passthru.tests.grafana-agent = nixosTests.grafana-agent; @@ -60,6 +56,6 @@ buildGoModule rec { description = "A lightweight subset of Prometheus and more, optimized for Grafana Cloud"; license = licenses.asl20; homepage = "https://grafana.com/products/cloud"; - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ flokli indeednotjames ]; }; } diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix index ac9ec9f02d7bc..238f497776ed9 100644 --- a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix +++ b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grafana-dash-n-grab"; - version = "0.3.1"; + version = "0.4.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "esnet"; repo = "gdg"; - sha256 = "sha256-M4V4ybOizXCLxTTuS17M0y2tRmjQmTIBdXVbumzOoeA="; + sha256 = "sha256-L7EFDLCbXp8ooQY9QxbfT0ooL1oC+z8LwpEvH4CvivE="; }; - vendorSha256 = "sha256-pXo80Tean5OkQ0Sv2+/RlRnAtaClwGP7tuDC2irsh+E="; + vendorHash = "sha256-7K2NTpknzJvKOfJ4gruV99BIvgtGgsre8ybqWTQ09tQ="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 4249a1e179b5b..e02f94d93dec8 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -28,6 +28,8 @@ buildGoModule rec { "cmd/logcli" ]; + tags = ["promtail_journal_enabled"]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optionals stdenv.isLinux [ systemd.dev ]; diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index 2290e16ef9e95..7451d0e49b026 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.75.1"; + version = "0.75.2"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-haJzhKb0DOMJAlK6tSsx0FMz9ZkYIHT8OGVjwIqzSgU="; + sha256 = "sha256-xRujItV8xgIiQZktcEeq+hCDaD7HaHFEOsbtzmWfLQQ="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorHash = "sha256-VJy9bbVxcekrehq48yaSbZKP8o65IFmFJglYg92HP20="; + vendorHash = "sha256-Ow1Ho6+VMvb0hKsAAd8nieFyVqDDX2prHDIkTuy1je8="; subPackages = [ "." ]; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 466747adcaba0..629bf2e3b7a5e 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.62.0"; + version = "2.64.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-AAQLJ+dipWTPgRJWACF7DS4IHnDQ6z/ddjW9f/6h734="; + hash = "sha256-/5ozeabGqFpEfBi2WVRHUpaSwQjvuq8RRw2hNDp8j34="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index 17775b491c64b..f4535624f5b69 100644 --- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "artifactory_exporter"; - version = "1.12.0"; + version = "1.13.0"; rev = "v${version}"; src = fetchFromGitHub { owner = "peimanja"; repo = pname; rev = rev; - hash = "sha256-EFjWDoWPePbPX9j4vuI41TAlGcFRlUyPpSvJriZdR0U="; + hash = "sha256-URavjOb0OEFul4jM3VR0buIMXmNU7nLJ0R3e8vRUWQ8="; }; - vendorHash = "sha256-5yzBKgjJCv4tgdBS6XmZUq1ebbka0LOuv6BARWO7kQg="; + vendorHash = "sha256-Gin134G4NPK8M2E2RrgH62ieiuCw15jwm9SJg03w9ts="; subPackages = [ "." ]; diff --git a/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/pkgs/servers/monitoring/prometheus/exportarr/default.nix index e7fed1b10e794..e8cd4a1234278 100644 --- a/pkgs/servers/monitoring/prometheus/exportarr/default.nix +++ b/pkgs/servers/monitoring/prometheus/exportarr/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "exportarr"; - version = "1.2.6"; + version = "1.3.1"; src = fetchFromGitHub { owner = "onedr0p"; repo = "exportarr"; rev = "v${version}"; - sha256 = "sha256-iiMfPqXUdmSAkzeRHZ3ZQHeQGtWxpiYCF0K7gZYly94="; + sha256 = "sha256-QZI3tYh2HXBDlZJWHQUAl/Yeyc/qCZGcfyFHbjCHlbU="; }; - vendorHash = "sha256-c09aWDxD11XEoR3sLlhteZXAK/Bd6DnJXmGEBofUl7s="; + vendorHash = "sha256-2Eb8FhbRu5M5u8HGa2bgAvZZkwHycBu8UiNKHG5/fFw="; subPackages = [ "cmd/exportarr" ]; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index a457a2ee39cf9..75cf7c5a53242 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.48.0"; + version = "1.50.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-hBkekoVwNuRDGhpvbW57eR+UUMkntdEcHJAVQbwk7NE="; + sha256 = "sha256-FP5X+2OFEFUJWtMKbVgcCkNSV3BtQyMVsXGD6dn3mjY="; }; vendorHash = "sha256-Owfxy7WkucQ6BM8yjnZg9/8CgopGTtbQTTUuxoT3RRE="; diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index 8b1cbb962ade2..8515bcdd59a4e 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -1,18 +1,14 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: -let - baseVersion = "0.4.2"; - commit = "722200c4adbd6d1e5d847dfbbd9dec07aa4ca38d"; -in buildGoModule rec { pname = "smokeping_prober"; - version = "${baseVersion}-g${commit}"; + version = "0.6.1"; ldflags = let - setVars = { - Version = baseVersion; - Revision = commit; - Branch = commit; + setVars = rec { + Version = version; + Revision = "722200c4adbd6d1e5d847dfbbd9dec07aa4ca38d"; + Branch = Revision; BuildUser = "nix"; }; varFlags = lib.concatStringsSep " " (lib.mapAttrsToList (name: value: "-X github.com/prometheus/common/version.${name}=${value}") setVars); @@ -21,12 +17,12 @@ buildGoModule rec { ]; src = fetchFromGitHub { - rev = commit; owner = "SuperQ"; repo = "smokeping_prober"; - sha256 = "1lpcjip6qxhalldgm6i2kgbajfqy3vwfyv9jy0jdpii13lv6mzlz"; + rev = "v${version}"; + sha256 = "sha256-tph9TZwMWKlJC/YweO9BU3+QRIugqc3ob5rqXThyR1c="; }; - vendorSha256 = "0p2jmlxpvpaqc445j39b4z4i3mnjrm25khv3sq6ylldcgfd31vz8"; + vendorHash = "sha256-emabuOm5tuPNZWmPHJWUWzFVjuLrY7biv8V/3ru73aU="; doCheck = true; diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 5184d2c6408ed..76c8996dd7f86 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.30.2"; + version = "0.31.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "sha256-3IkqaWMQGJssxsAF+BZphEpufR4G5E5bYJvioSO2hJ4="; + sha256 = "sha256-EJZGc4thu0WhVSSRolIRYg39S81Cgm+JHwpW5eE7mDc="; }; - vendorHash = "sha256-JtjVdr23wI5ZM5LlFApWurTTzLkLI4nzA9/bWoOrGSM="; + vendorHash = "sha256-bNQwDttJ7YuQFrpp0alqe37/lue0CX5gB2UDRWWtTXQ="; doCheck = false; diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index 9cd912865ede5..fc47453832ba5 100644 --- a/pkgs/servers/monitoring/unpoller/default.nix +++ b/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.7.11"; + version = "2.7.13"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-/tGmMeHrurKTaRQLHusOkjISuxrrT/JjUCimEL7zoIk="; + hash = "sha256-X7ZolDmYXexmERiCUvzKqADpwT1W/pQcaIEwMzfSTR4="; }; - vendorHash = "sha256-ZwJCqL8vU38k8pfNmKGIhJSgMwxQuzBBfl6IduQrQEw="; + vendorHash = "sha256-VkVU+1zX8ENmq7qY7NAEQtLyqc8UNwRQF2wU65B9vpE="; ldflags = [ "-w" "-s" |