chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

grafana-loki,promtail: 3.4.3 -> 3.5.1 (#401011)

Browse Source
This commit is contained in:
Adam C. Stephens
2025-06-10 13:43:05 -04:00
committed by GitHub
parent 744c1f9c61 9a893f033b
commit 7c5d8d24e8
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/tests/loki.nix
View File

@@ -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 = {

4
pkgs/by-name/gr/grafana-loki/package.nix
View File

@@ -12,14 +12,14 @@
}:
buildGoModule rec {
version = "3.4.3";
version = "3.5.1";
pname = "grafana-loki";
src = fetchFromGitHub {
owner = "grafana";
repo = "loki";
rev = "v${version}";
hash = "sha256-1tI9X2eIKuWEWJBbN4UAw8yeRrjgfqcenJyTNMk5rqU=";
hash = "sha256-aDUQe4OJtrmZ9RXvNkS4lDne5fKzrzNm003ElA+IF5U=";
};
vendorHash = null;