diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml index 4594818ae..0e726a008 100644 --- a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml +++ b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml @@ -75,7 +75,7 @@ output.graphite_server text - Set the IP and port where metrics shoud be sent to. + Set the IP and port where metrics shoud be sent to. Format: IP:port. output.graphite_prefix @@ -91,10 +91,16 @@ output.graphite_verify - + checkbox This will enable verification of a secure connection to Graphite. Default is disabled for compatibility reasons. + + output.graphite_ssl_disable + + checkbox + This will disable SSL/TLS connection to Graphite host. Default is encrypted connection. + output.graphite_tagsupport diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml index bd48099a4..7b479f0c9 100644 --- a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml +++ b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml @@ -1,7 +1,7 @@ //OPNsense/telegraf/output Telegraf outputs configuration - 1.4.0 + 1.4.1 0 @@ -40,6 +40,10 @@ N + + 0 + N + 0 N diff --git a/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf b/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf index afc552c6d..84f994bc4 100644 --- a/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf +++ b/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf @@ -87,10 +87,12 @@ template = "{{ OPNsense.telegraf.output.graphite_template }}" {% endif %} timeout = 2 -{% if helpers.exists('OPNsense.telegraf.output.graphite_verify') and OPNsense.telegraf.output.graphite_verify == '0' %} +{% if helpers.exists('OPNsense.telegraf.output.graphite_ssl_disable') and OPNsense.telegraf.output.graphite_ssl_disable != '1' %} +{% if helpers.exists('OPNsense.telegraf.output.graphite_verify') and OPNsense.telegraf.output.graphite_verify == '0' %} insecure_skip_verify = true -{% else %} +{% else %} insecure_skip_verify = false +{% endif %} {% endif %} {% if helpers.exists('OPNsense.telegraf.output.graphite_tagsupport') and OPNsense.telegraf.output.graphite_tagsupport == '1' %} graphite_tag_support = true