grafana-loki: 3.2.1 -> 3.3.1 (#360603)

NixOS · Dec 18, 2024 · ea47143 · ea47143
2 parents ea08036 + f73d662
commit ea47143
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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;

diff --git 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;