prometheus-collectd-exporter: fix options for new version

Changed files
+9 -9
nixos
modules
services
monitoring
prometheus
exporters
+9 -9
nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
···
};
logFormat = mkOption {
-
type = types.str;
-
default = "logger:stderr";
-
example = "logger:syslog?appname=bob&local=7 or logger:stdout?json=true";
+
type = types.enum [ "logfmt" "json" ];
+
default = "logfmt";
+
example = "json";
description = ''
-
Set the log target and format.
+
Set the log format.
'';
};
···
};
serviceOpts = let
collectSettingsArgs = if (cfg.collectdBinary.enable) then ''
-
-collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \
-
-collectd.security-level ${cfg.collectdBinary.securityLevel} \
+
--collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \
+
--collectd.security-level ${cfg.collectdBinary.securityLevel} \
'' else "";
in {
serviceConfig = {
ExecStart = ''
${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \
-
-log.format ${escapeShellArg cfg.logFormat} \
-
-log.level ${cfg.logLevel} \
-
-web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+
--log.format ${escapeShellArg cfg.logFormat} \
+
--log.level ${cfg.logLevel} \
+
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
${collectSettingsArgs} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';