diff --git a/hosts/sentinel/default.nix b/hosts/sentinel/default.nix index 3853e65..d44550b 100644 --- a/hosts/sentinel/default.nix +++ b/hosts/sentinel/default.nix @@ -29,7 +29,7 @@ networking.hosts.${config.extra.wireguard.proxy-sentinel.ipv4} = [config.providedDomains.influxdb]; extra.telegraf = { enable = true; - influxdb2.url = config.providedDomains.influxdb; + influxdb2.domain = config.providedDomains.influxdb; influxdb2.organization = "servers"; influxdb2.bucket = "telegraf"; }; diff --git a/hosts/ward/default.nix b/hosts/ward/default.nix index 4507424..42171bd 100644 --- a/hosts/ward/default.nix +++ b/hosts/ward/default.nix @@ -30,7 +30,7 @@ networking.hosts.${nodes.sentinel.config.extra.wireguard.proxy-sentinel.ipv4} = [nodes.sentinel.config.providedDomains.influxdb]; extra.telegraf = { enable = true; - influxdb2.url = nodes.sentinel.config.providedDomains.influxdb; + influxdb2.domain = nodes.sentinel.config.providedDomains.influxdb; influxdb2.organization = "servers"; influxdb2.bucket = "telegraf"; }; diff --git a/hosts/ward/microvms/adguardhome/default.nix b/hosts/ward/microvms/adguardhome/default.nix index 8ba4817..bdb6ac0 100644 --- a/hosts/ward/microvms/adguardhome/default.nix +++ b/hosts/ward/microvms/adguardhome/default.nix @@ -21,7 +21,7 @@ in { networking.hosts.${sentinelCfg.extra.wireguard.proxy-sentinel.ipv4} = [sentinelCfg.providedDomains.influxdb]; extra.telegraf = { enable = true; - influxdb2.url = sentinelCfg.providedDomains.influxdb; + influxdb2.domain = sentinelCfg.providedDomains.influxdb; influxdb2.organization = "servers"; influxdb2.bucket = "telegraf"; }; diff --git a/hosts/ward/microvms/grafana/default.nix b/hosts/ward/microvms/grafana/default.nix index 378c5ca..03a4c87 100644 --- a/hosts/ward/microvms/grafana/default.nix +++ b/hosts/ward/microvms/grafana/default.nix @@ -22,7 +22,7 @@ in { networking.hosts.${sentinelCfg.extra.wireguard.proxy-sentinel.ipv4} = [sentinelCfg.providedDomains.influxdb]; extra.telegraf = { enable = true; - influxdb2.url = sentinelCfg.providedDomains.influxdb; + influxdb2.domain = sentinelCfg.providedDomains.influxdb; influxdb2.organization = "servers"; influxdb2.bucket = "telegraf"; }; diff --git a/hosts/ward/microvms/influxdb/default.nix b/hosts/ward/microvms/influxdb/default.nix index cc842e1..6c804c1 100644 --- a/hosts/ward/microvms/influxdb/default.nix +++ b/hosts/ward/microvms/influxdb/default.nix @@ -24,7 +24,7 @@ in { networking.hosts.${sentinelCfg.extra.wireguard.proxy-sentinel.ipv4} = [sentinelCfg.providedDomains.influxdb]; extra.telegraf = { enable = true; - influxdb2.url = sentinelCfg.providedDomains.influxdb; + influxdb2.domain = sentinelCfg.providedDomains.influxdb; influxdb2.organization = "servers"; influxdb2.bucket = "telegraf"; }; diff --git a/hosts/ward/microvms/kanidm/default.nix b/hosts/ward/microvms/kanidm/default.nix index 6ac467e..089a9af 100644 --- a/hosts/ward/microvms/kanidm/default.nix +++ b/hosts/ward/microvms/kanidm/default.nix @@ -23,7 +23,7 @@ in { networking.hosts.${sentinelCfg.extra.wireguard.proxy-sentinel.ipv4} = [sentinelCfg.providedDomains.influxdb]; extra.telegraf = { enable = true; - influxdb2.url = sentinelCfg.providedDomains.influxdb; + influxdb2.domain = sentinelCfg.providedDomains.influxdb; influxdb2.organization = "servers"; influxdb2.bucket = "telegraf"; }; diff --git a/hosts/ward/microvms/loki/default.nix b/hosts/ward/microvms/loki/default.nix index ad0d1fe..362cded 100644 --- a/hosts/ward/microvms/loki/default.nix +++ b/hosts/ward/microvms/loki/default.nix @@ -21,7 +21,7 @@ in { networking.hosts.${sentinelCfg.extra.wireguard.proxy-sentinel.ipv4} = [sentinelCfg.providedDomains.influxdb]; extra.telegraf = { enable = true; - influxdb2.url = sentinelCfg.providedDomains.influxdb; + influxdb2.domain = sentinelCfg.providedDomains.influxdb; influxdb2.organization = "servers"; influxdb2.bucket = "telegraf"; }; diff --git a/hosts/ward/microvms/vaultwarden/default.nix b/hosts/ward/microvms/vaultwarden/default.nix index a305b8a..9c5c682 100644 --- a/hosts/ward/microvms/vaultwarden/default.nix +++ b/hosts/ward/microvms/vaultwarden/default.nix @@ -21,7 +21,7 @@ in { networking.hosts.${sentinelCfg.extra.wireguard.proxy-sentinel.ipv4} = [sentinelCfg.providedDomains.influxdb]; extra.telegraf = { enable = true; - influxdb2.url = sentinelCfg.providedDomains.influxdb; + influxdb2.domain = sentinelCfg.providedDomains.influxdb; influxdb2.organization = "servers"; influxdb2.bucket = "telegraf"; }; diff --git a/modules/telegraf.nix b/modules/telegraf.nix index 46a2c0a..80f9e39 100644 --- a/modules/telegraf.nix +++ b/modules/telegraf.nix @@ -22,10 +22,10 @@ in { options.extra.telegraf = { enable = mkEnableOption (mdDoc "telegraf to push metrics to influx."); influxdb2 = { - url = mkOption { + domain = mkOption { type = types.str; - example = "https://influxdb.example.com"; - description = mdDoc "The influxdb v2 database url to push to."; + example = "influxdb.example.com"; + description = mdDoc "The influxdb v2 database to push to. https will be enforced."; }; organization = mkOption { @@ -65,7 +65,7 @@ in { }; outputs = { influxdb_v2 = { - urls = [cfg.influxdb2.url]; + urls = ["https://${cfg.influxdb2.domain}"]; token = "$INFLUX_TOKEN"; inherit (cfg.influxdb2) organization bucket; };