From 187485e9dd8f97094d0d080f7ab5b5c9b20335e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Dec 2024 08:20:33 +0000
Subject: [PATCH 1/2] grafana-loki: 3.2.1 -> 3.3.1

---
 pkgs/servers/monitoring/loki/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix
index 5725c565662f..f5b9cfdceeda 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@@ -10,14 +10,14 @@
 }:
 
 buildGoModule rec {
-  version = "3.2.1";
+  version = "3.3.1";
   pname = "grafana-loki";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "loki";
     rev = "v${version}";
-    hash = "sha256-PhvXuRWpOA+5sPiTSDEwpZ8KEfV/UHM2W6RnG9z9Sp0=";
+    hash = "sha256-oibZFCuwHtg/A7AJfNqGKyRFhPLdOkX8uULx2rc7Fs8=";
   };
 
   vendorHash = null;

From f73d66273e668c55bf43e32bc05a8bcec7ec4476 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 18 Dec 2024 13:01:48 +0100
Subject: [PATCH 2/2] tests/loki: temporarily patch broken upstream conf

---
 nixos/tests/loki.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/loki.nix b/nixos/tests/loki.nix
index 81103a5ee4ca..8f5e23c3ac08 100644
--- a/nixos/tests/loki.nix
+++ b/nixos/tests/loki.nix
@@ -13,7 +13,12 @@ import ./make-test-python.nix (
       {
         services.loki = {
           enable = true;
-          configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml";
+
+          # FIXME(globin) revert to original file when upstream fix released
+          # configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml";
+          configFile = pkgs.runCommandNoCC "patched-loki-cfg.yml" { } ''
+            sed '/metric_aggregation/!b;n;/enable/d' "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml" > $out
+          '';
         };
         services.promtail = {
           enable = true;