From fde3e54c3a3d1545b785f27d9aaad89f77fc9ed5 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 30 Dec 2024 12:19:40 +0200 Subject: [PATCH 1/2] prometheus: 3.0.0 -> 3.0.1 Diff: https://github.com/prometheus/prometheus/compare/v3.0.0...v3.0.1 --- pkgs/by-name/pr/prometheus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 00dd43637f6d..a183cb6573b8 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -32,10 +32,10 @@ }: let - version = "3.0.0"; + version = "3.0.1"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-a3xyStDsutLjYIEm7t3WilmvO36eMHvd4pOtZYYsJCM="; + hash = "sha256-MP7B7gVRQnspXLLNmPH8t3DYKbsQkDV9hPJYbM2rB9M="; }; in buildGoModule rec { @@ -52,7 +52,7 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; rev = "v${version}"; - hash = "sha256-IMYDtAb2ojzZLBqRJkMcB8yFpmmJPwbbyAxFfbCikkA="; + hash = "sha256-dN6ckW451G45ZO7baY7H4qEf88ZDeISZwZ3uwWPZsW8="; }; vendorHash = "sha256-c96YnWPLH/tbGRb2Zlqrl3PXSZvI+NeYTGlef6REAOw="; From fe6c468ecc4099ad2c100865e0c99fb4e757608a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Dec 2024 13:52:44 +0100 Subject: [PATCH 2/2] nixos/tests/prometheus-pushgateway: remove missing target network-online.target isn't wanted by multi-user.target anymore. --- nixos/tests/prometheus/pushgateway.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/tests/prometheus/pushgateway.nix b/nixos/tests/prometheus/pushgateway.nix index 1b42c965ca50..fb8b6c091aa1 100644 --- a/nixos/tests/prometheus/pushgateway.nix +++ b/nixos/tests/prometheus/pushgateway.nix @@ -66,8 +66,6 @@ import ../make-test-python.nix ( + "jq '.data.result[0].metric.version' | grep '\"${pkgs.prometheus-pushgateway.version}\"'" ) - client.wait_for_unit("network-online.target") - # Add a metric and check in Prometheus client.wait_until_succeeds( "echo 'some_metric 3.14' | curl --data-binary @- http://pushgateway:9091/metrics/job/some_job"