diff options
| author | Martin Milata <martin@martinmilata.cz> | 2020-03-06 01:11:21 +0100 |
|---|---|---|
| committer | Martin Milata <martin@martinmilata.cz> | 2020-03-06 01:43:20 +0100 |
| commit | 2a080ac4349899a9d1d103ba42b0c8ecba95dba0 (patch) | |
| tree | 5f42d19c7a29325e89b869db730cfbee06784a02 | |
| parent | 87f87fb3e98d49bc7e48b22fb5086de75af46736 (diff) | |
| download | nixpkgs-2a080ac4349899a9d1d103ba42b0c8ecba95dba0.tar nixpkgs-2a080ac4349899a9d1d103ba42b0c8ecba95dba0.tar.gz nixpkgs-2a080ac4349899a9d1d103ba42b0c8ecba95dba0.tar.bz2 nixpkgs-2a080ac4349899a9d1d103ba42b0c8ecba95dba0.tar.lz nixpkgs-2a080ac4349899a9d1d103ba42b0c8ecba95dba0.tar.xz nixpkgs-2a080ac4349899a9d1d103ba42b0c8ecba95dba0.tar.zst nixpkgs-2a080ac4349899a9d1d103ba42b0c8ecba95dba0.zip | |
nixos/prometheus-snmp-exporter: fix assertion
The assertion was printed when user explicitly defined only the configurationPath option.
| -rw-r--r-- | nixos/modules/services/monitoring/prometheus/exporters.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/monitoring/prometheus/exporters/snmp.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 36ebffa4463..e9845fc4bb8 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -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! diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix index ddde3c10481..045e48a3d0f 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix @@ -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 = '' |