From ec55356bd72199954f257e65a550329b8588b063 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Apr 2025 03:31:48 +0000
Subject: [PATCH] grafana-loki,promtail: 3.4.3 -> 3.5.0

https://github.com/grafana/loki/releases/tag/v3.5.0

diff: https://github.com/grafana/loki/compare/v3.4.3...v3.5.0

Co-authored-by: emilylange <git@emilylange.de>
---
 nixos/tests/loki.nix                     | 9 ++++++---
 pkgs/by-name/gr/grafana-loki/package.nix | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/loki.nix b/nixos/tests/loki.nix
index 9c08c4312c97..08cccbb43c0d 100644
--- a/nixos/tests/loki.nix
+++ b/nixos/tests/loki.nix
@@ -13,10 +13,13 @@
       services.loki = {
         enable = true;
 
-        # FIXME(globin) revert to original file when upstream fix released
+        # FIXME: revert to original file when upstream fix released
+        #  https://github.com/grafana/loki/issues/16990
+        #  https://github.com/grafana/loki/issues/17736
         # 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
+        configFile = pkgs.runCommand "patched-loki-cfg.yml" { } ''
+          substitute "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml" "$out" \
+            --replace-fail "enable_multi_variant_queries: true" ""
         '';
       };
       services.promtail = {
diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix
index 2e854d8e18b2..dec858ab3028 100644
--- a/pkgs/by-name/gr/grafana-loki/package.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -12,14 +12,14 @@
 }:
 
 buildGoModule rec {
-  version = "3.4.3";
+  version = "3.5.0";
   pname = "grafana-loki";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "loki";
     rev = "v${version}";
-    hash = "sha256-1tI9X2eIKuWEWJBbN4UAw8yeRrjgfqcenJyTNMk5rqU=";
+    hash = "sha256-XQCEdx6jgV4i6CNQVcu4wrABgiZD7WpS0nM+oF6db9k=";
   };
 
   vendorHash = null;