Unverified Commit fb09b385 authored by Emily's avatar Emily Committed by GitHub
Browse files

grafana-loki,promtail: 3.5.8 -> 3.6.2 (#465320)

parents 09a885c7 b8e7b088

nixos/tests/loki.nix

+1 −9
Original line number Diff line number Diff line
@@ -10,15 +10,7 @@ 
    {

      services.loki = {

        enable = true;



        # 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.runCommand "patched-loki-cfg.yml" { } ''

          substitute "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml" "$out" \

            --replace-fail "enable_multi_variant_queries: true" ""

        '';

        configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml";

      };

      services.promtail = {

        enable = true;

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.5.8";

  version = "3.6.2";

  pname = "grafana-loki";



  src = fetchFromGitHub {

    owner = "grafana";

    repo = "loki";

    rev = "v${version}";

    hash = "sha256-BTAjlA8jk75tkgUpSJrEe4m9aVUav3eeTk7IjT2AYlY=";

    hash = "sha256-7Z1TzAtKBrivnpkgipWK33Yyc6yguoNuinqSvG5gvXM=";

  };



  vendorHash = null;