diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-10-11 13:58:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-11 13:58:14 +0000 |
commit | 0aabc77a0336ad4efba606af22cd83e9478e1721 (patch) | |
tree | ead13e763f277f0e44b086e1ae1be03c07f96f3b /nixos/modules | |
parent | 5660ac7ae5851d19cb191792374112ddc4154f3b (diff) | |
parent | 0febc64ed1928e163d9747ee1a7d3d1c7c0f9c6d (diff) | |
download | nixlib-0aabc77a0336ad4efba606af22cd83e9478e1721.tar nixlib-0aabc77a0336ad4efba606af22cd83e9478e1721.tar.gz nixlib-0aabc77a0336ad4efba606af22cd83e9478e1721.tar.bz2 nixlib-0aabc77a0336ad4efba606af22cd83e9478e1721.tar.lz nixlib-0aabc77a0336ad4efba606af22cd83e9478e1721.tar.xz nixlib-0aabc77a0336ad4efba606af22cd83e9478e1721.tar.zst nixlib-0aabc77a0336ad4efba606af22cd83e9478e1721.zip |
Merge pull request #48055 from WilliButz/add-exporter-tests
nixos/tests: add test for prometheus exporters
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/monitoring/prometheus/exporters.nix | 21 | ||||
-rw-r--r-- | nixos/modules/services/monitoring/prometheus/exporters/varnish.nix | 1 |
2 files changed, 12 insertions, 10 deletions
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 1d5f400250fd..ae8caac436da 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -123,15 +123,13 @@ let systemd.services."prometheus-${name}-exporter" = mkMerge ([{ wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - serviceConfig = { - Restart = mkDefault "always"; - PrivateTmp = mkDefault true; - WorkingDirectory = mkDefault /tmp; - } // mkIf (!(serviceOpts.serviceConfig.DynamicUser or false)) { - User = conf.user; - Group = conf.group; - }; - } serviceOpts ]); + serviceConfig.Restart = mkDefault "always"; + serviceConfig.PrivateTmp = mkDefault true; + serviceConfig.WorkingDirectory = mkDefault /tmp; + } serviceOpts ] ++ optional (serviceOpts.serviceConfig.DynamicUser or false) { + serviceConfig.User = conf.user; + serviceConfig.Group = conf.group; + }); }; in { @@ -172,5 +170,8 @@ in }) exporterOpts) ); - meta.doc = ./exporters.xml; + meta = { + doc = ./exporters.xml; + maintainers = [ maintainers.willibutz ]; + }; } diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix index 8dbf2d735ab9..aaed76175b84 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix @@ -69,6 +69,7 @@ in path = [ pkgs.varnish ]; serviceConfig = { DynamicUser = true; + RestartSec = mkDefault 1; ExecStart = '' ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ |