git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #146653 from DarkDNA/nixos/fix-systemd-exporter/extraFlags

nixos/prometheus/systemd: Implement the extraFlags config option.

commit06c57317c20943e7936d953cb10764d19c4124ff authorpennae <82953136+pennae@users.noreply.github.com> dateWed 9 Mar 2022, 16:12 (5 years ago) parent12d3b34f1bcb88
2 files changed+10−1
compare with master
unifiedsplit
nixos/modules/services/monitoring/prometheus/exporters/systemd.nix+1−1 nixos/tests/prometheus-exporters.nix+9
nixos/modules/services/monitoring/prometheus/exporters/systemd.nix+1−1
@@ -11,7 +11,7 @@ in {
1111 serviceConfig = {
1212 ExecStart = ''
1313 ${pkgs.prometheus-systemd-exporter}/bin/systemd_exporter \
14− --web.listen-address ${cfg.listenAddress}:${toString cfg.port}
14+ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags}
1515 '';
1616 RestrictAddressFamilies = [
1717 # Need AF_UNIX to collect data
nixos/tests/prometheus-exporters.nix+9
@@ -1156,6 +1156,10 @@ let
11561156 systemd = {
11571157 exporterConfig = {
11581158 enable = true;
1159+
1160+ extraFlags = [
1161+ "--collector.enable-restart-count"
1162+ ];
11591163 };
11601164 metricProvider = { };
11611165 exporterTest = ''
@@ -1166,6 +1170,11 @@ let
11661170 'systemd_unit_state{name="basic.target",state="active",type="target"} 1'
11671171 )
11681172 )
1173+ succeed(
1174+ "curl -sSf localhost:9558/metrics | grep '{}'".format(
1175+ 'systemd_service_restart_total{state="prometheus-systemd-exporter.service"} 0'
1176+ )
1177+ )
11691178 '';
11701179 };
11711180