Unverified Commit 7c5d8d24 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

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

parents 744c1f9c 9a893f03

nixos/tests/loki.nix

+6 −3
Original line number Diff line number Diff line
@@ -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 = {

pkgs/by-name/gr/grafana-loki/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;