colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
nixos/loki: skip config validation when it's impossible to validate
This commit is contained in:
Pol Dellaiera 2024-05-19 10:40:32 +02:00 committed by GitHub
commit 63af8c029c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/services/monitoring/loki.nix
View File

@ -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;