Unverified Commit 63af8c02 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #312785 from emilylange/fix-nixos-loki-config-validation 

nixos/loki: skip config validation when it's impossible to validate
parents d0545586 100c1501

nixos/modules/services/monitoring/loki.nix

+7 −2
Original line number Diff line number Diff line
@@ -97,7 +97,12 @@ in { 


      serviceConfig = let

        conf = if cfg.configFile == null

               then prettyJSON cfg.configuration

               then

                 # Config validation may fail when using extraFlags = [ "-config.expand-env=true" ].

                 # To work around this, we simply skip it when extraFlags is not empty.

                 if cfg.extraFlags == []

                 then validateConfig (prettyJSON cfg.configuration)

                 else prettyJSON cfg.configuration

               else cfg.configFile;

        validateConfig = file:

        pkgs.runCommand "validate-loki-conf" {
@@ -108,7 +113,7 @@ in { 
          '';

      in

      {

        ExecStart = "${cfg.package}/bin/loki --config.file=${validateConfig conf} ${escapeShellArgs cfg.extraFlags}";

        ExecStart = "${cfg.package}/bin/loki --config.file=${conf} ${escapeShellArgs cfg.extraFlags}";

        User = cfg.user;

        Restart = "always";

        PrivateTmp = true;