diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-09-08 00:46:04 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:13:21 +0000 |
commit | afcf2d55332c5c01c2d989e9d010577d257cb6cc (patch) | |
tree | e1c816a271686b014a6403bcad7c57dd2ee4d9c7 /nixpkgs/nixos/modules/services/monitoring/prometheus | |
parent | 175b9acd282aaf65b5f354ea6e95c1348fe3daa3 (diff) | |
parent | 4e60699fa727e4a0f9a3e78948012f86da32cfef (diff) | |
download | nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.gz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.bz2 nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.lz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.xz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.zst nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.zip |
Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'
Diffstat (limited to 'nixpkgs/nixos/modules/services/monitoring/prometheus')
-rw-r--r-- | nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix | 12 | ||||
-rw-r--r-- | nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index 2ab8910ff9db..b69310c34ff5 100644 --- a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -132,14 +132,10 @@ let in mkIf conf.enable { warnings = conf.warnings or []; - users.users = (mkIf (conf.user == "${name}-exporter" && !enableDynamicUser) { - "${name}-exporter" = { - description = '' - Prometheus ${name} exporter service user - ''; - isSystemUser = true; - inherit (conf) group; - }; + users.users."${name}-exporter" = (mkIf (conf.user == "${name}-exporter" && !enableDynamicUser) { + description = "Prometheus ${name} exporter service user"; + isSystemUser = true; + inherit (conf) group; }); users.groups = (mkIf (conf.group == "${name}-exporter" && !enableDynamicUser) { "${name}-exporter" = {}; diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix index 7e394e8463e0..adc2abe0b91c 100644 --- a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -9,7 +9,7 @@ in port = 9100; extraOpts = { enabledCollectors = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = []; example = ''[ "systemd" ]''; description = '' |