b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

prometheus: Use yaml format generator instaed json for prometheus.yml

Browse source 
Additionally remove an unused variable
This commit is contained in:
Shawn8901 2022-11-19 23:56:43 +01:00
parent 7634c3250b
commit 470247d433
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/services/monitoring/prometheus/default.nix
View file

@ -3,7 +3,7 @@
with lib;
let
json = pkgs.formats.json { };
yaml = pkgs.formats.yaml { };
cfg = config.services.prometheus;
checkConfigEnabled =
(lib.isBool cfg.checkConfig && cfg.checkConfig)
@ -11,8 +11,6 @@ let
workingDir = "/var/lib/" + cfg.stateDir;
prometheusYmlOut = "${workingDir}/prometheus-substituted.yaml";
triggerReload = pkgs.writeShellScriptBin "trigger-reload-prometheus" ''
PATH="${makeBinPath (with pkgs; [ systemd ])}"
if systemctl -q is-active prometheus.service; then
@ -38,7 +36,7 @@ let
promtool ${what} $out
'' else file;
generatedPrometheusYml = json.generate "prometheus.yml" promConfig;
generatedPrometheusYml = yaml.generate "prometheus.yml" promConfig;
# This becomes the main config file for Prometheus
promConfig = {