diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index 1fc17ec72da..b341a9005c2 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -21,7 +21,7 @@ in { }; environmentFiles = mkOption { - type = types.nullOr (types.listOf types.path); + type = types.listOf types.path; default = []; example = "/run/keys/telegraf.env"; description = '' @@ -38,17 +38,13 @@ in { description = "Extra configuration options for telegraf"; type = settingsFormat.type; example = { - outputs = { - influxdb = { - urls = ["http://localhost:8086"]; - database = "telegraf"; - }; + outputs.influxdb = { + urls = ["http://localhost:8086"]; + database = "telegraf"; }; - inputs = { - statsd = { - service_address = ":8125"; - delete_timings = true; - }; + inputs.statsd = { + service_address = ":8125"; + delete_timings = true; }; }; }; diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix index 938bbd518b5..7f4b3675258 100644 --- a/nixos/tests/telegraf.nix +++ b/nixos/tests/telegraf.nix @@ -6,9 +6,9 @@ import ./make-test-python.nix ({ pkgs, ...} : { machine = { ... }: { services.telegraf.enable = true; - services.telegraf.environmentFiles = [pkgs.writeText "secrets" '' + services.telegraf.environmentFiles = [(pkgs.writeText "secrets" '' SECRET=example - '']; + '')]; services.telegraf.extraConfig = { agent.interval = "1s"; agent.flush_interval = "1s";