From aba5c5bc2cc5aa3df881198202fe58f8f7f26b2b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Jun 2023 13:13:31 +0200 Subject: [PATCH 1/2] grafana: 9.5.3 -> 10.0.1 https://grafana.com/docs/grafana/latest/whatsnew/whats-new-in-v10-0/ ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.0.0-preview ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.0.0 ChangeLog: https://github.com/grafana/grafana/releases/tag/v10.0.1 Also fixes CVE-2023-3128, see https://grafana.com/blog/2023/06/22/grafana-security-release-for-cve-2023-3128/?pg=graf&plcmt=top-promo-banner --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 33590dd04f3f..d745f1b2dbef 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.5.3"; + version = "10.0.1"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - hash = "sha256-b9FkyDEidM7n+eY9IlZT9vysphe4CW5vGXYn9M5BIJM="; + hash = "sha256-7yxdUb0rP8yCyiy/IsMD3De66fwhY7KI8GNhwsbIB1o="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - hash = "sha256-PfdRPMQrEaTwg9wWeyJo6I9HuQX6sxl1JbT9CTixnyc="; + hash = "sha256-dENdPLbXka1NKix9KqgZ/K5RAB4jVZsVeDpnoPllnEM="; }; - vendorHash = "sha256-E9Qdsk691+laPrQQnYBIwxAIbXh7wxB0G2e/Vp+4x98="; + vendorHash = "sha256-ZDUEqueAr0z8+8+CxgfWhc4xgYU+X+aU9Kl48NcNIbM="; nativeBuildInputs = [ wire ]; From 6e6c2e653040634bb0c5624906ea4d8bc4cacf89 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Jun 2023 13:45:12 +0200 Subject: [PATCH 2/2] nixos/grafana: clarify that there's still a bit of time until notifiers are removed See https://github.com/grafana/grafana/pull/66269 --- nixos/modules/services/monitoring/grafana.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 1786b09e28af..8fe84e1206e3 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -1726,7 +1726,7 @@ in # Warn about deprecated notifiers. deprecatedNotifiers = optional (cfg.provision.notifiers != [ ]) '' - Notifiers are deprecated upstream and will be removed in Grafana 10. + Notifiers are deprecated upstream and will be removed in Grafana 11. Use `services.grafana.provision.alerting.contactPoints` instead. '';