From 8826fd23fcc63b198a2ce182b6eb98349e7f65e5 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Mon, 3 Feb 2025 12:52:54 +0100 Subject: [PATCH 1/2] prometheus: 3.0.1 -> 3.1.0 Diff: https://github.com/prometheus/prometheus/compare/v3.0.1...v3.1.0 --- pkgs/by-name/pr/prometheus/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index a183cb6573b8..0908777635bb 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.1"; + version = "3.1.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-MP7B7gVRQnspXLLNmPH8t3DYKbsQkDV9hPJYbM2rB9M="; + hash = "sha256-05DaaDIFtADnkLFqdHe5eUvo6LRz6BduMvGVmzOeurM="; }; in buildGoModule rec { @@ -51,11 +51,11 @@ buildGoModule rec { src = fetchFromGitHub { owner = "prometheus"; repo = "prometheus"; - rev = "v${version}"; - hash = "sha256-dN6ckW451G45ZO7baY7H4qEf88ZDeISZwZ3uwWPZsW8="; + tag = "v${version}"; + hash = "sha256-Q3f0L6cRVQRL1AHgUI3VNbMG9eTfcApbXfSjOTHr7Go="; }; - vendorHash = "sha256-c96YnWPLH/tbGRb2Zlqrl3PXSZvI+NeYTGlef6REAOw="; + vendorHash = "sha256-vQwBnSxoyIYTeWLk3GD9pKDuUjjsMfwPptgyVnzcTok="; excludedPackages = [ "documentation/prometheus-mixin" From f980323f54c43c2a6c359fc5b09a58c7edc6ecd0 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Mon, 3 Feb 2025 12:51:48 +0100 Subject: [PATCH 2/2] nixos/doc/rl-2505: document prometheus upgrade --- nixos/doc/manual/release-notes/rl-2505.section.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index a0058d668277..a3ab4a002705 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -262,6 +262,10 @@ - The default version of `z3` has been updated from 4.8 to 4.13. There are still a few packages that need specific older versions; those will continue to be maintained as long as other packages depend on them but may be removed in the future. +- `prometheus` has been updated from 2.55.0 to 3.1.0. + Read the [release blog post](https://prometheus.io/blog/2024/11/14/prometheus-3-0/) and + [migration guide](https://prometheus.io/docs/prometheus/3.1/migration/). + - `kanata` was updated to v1.7.0, which introduces several breaking changes. See the release notes of [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0)