nixos/prometheus-snmp-exporter: fix assertion

The assertion was printed when user explicitly defined only the
configurationPath option.
This commit is contained in:
Martin Milata 2020-03-06 01:11:21 +01:00
parent 87f87fb3e9
commit 2a080ac434
2 changed files with 5 additions and 3 deletions

View file

@ -197,7 +197,9 @@ in
config = mkMerge ([{
assertions = [ {
assertion = (cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null);
assertion = cfg.snmp.enable -> (
(cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null)
);
message = ''
Please ensure you have either `services.prometheus.exporters.snmp.configuration'
or `services.prometheus.exporters.snmp.configurationPath' set!

View file

@ -19,7 +19,7 @@ in
configuration = mkOption {
type = types.nullOr types.attrs;
default = {};
default = null;
description = ''
Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option.
'';
@ -54,7 +54,7 @@ in
serviceOpts = let
configFile = if cfg.configurationPath != null
then cfg.configurationPath
else "${pkgs.writeText "snmp-eporter-conf.yml" (builtins.toJSON cfg.configuration)}";
else "${pkgs.writeText "snmp-exporter-conf.yml" (builtins.toJSON cfg.configuration)}";
in {
serviceConfig = {
ExecStart = ''