lol

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

authored by

WilliButz and committed by
GitHub
ea471430 ea08036f

+8 -3
+6 -1
nixos/tests/loki.nix
··· 13 13 { 14 14 services.loki = { 15 15 enable = true; 16 - configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml"; 16 + 17 + # FIXME(globin) revert to original file when upstream fix released 18 + # configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml"; 19 + configFile = pkgs.runCommandNoCC "patched-loki-cfg.yml" { } '' 20 + sed '/metric_aggregation/!b;n;/enable/d' "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml" > $out 21 + ''; 17 22 }; 18 23 services.promtail = { 19 24 enable = true;
+2 -2
pkgs/servers/monitoring/loki/default.nix
··· 10 10 }: 11 11 12 12 buildGoModule rec { 13 - version = "3.2.1"; 13 + version = "3.3.1"; 14 14 pname = "grafana-loki"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "grafana"; 18 18 repo = "loki"; 19 19 rev = "v${version}"; 20 - hash = "sha256-PhvXuRWpOA+5sPiTSDEwpZ8KEfV/UHM2W6RnG9z9Sp0="; 20 + hash = "sha256-oibZFCuwHtg/A7AJfNqGKyRFhPLdOkX8uULx2rc7Fs8="; 21 21 }; 22 22 23 23 vendorHash = null;