diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile index 284cc8f35..c5279eb7a 100644 --- a/net-mgmt/telegraf/Makefile +++ b/net-mgmt/telegraf/Makefile @@ -1,6 +1,5 @@ PLUGIN_NAME= telegraf -PLUGIN_VERSION= 1.8.3 -PLUGIN_REVISION= 1 +PLUGIN_VERSION= 1.9.0 PLUGIN_COMMENT= Agent for collecting metrics and data PLUGIN_DEPENDS= telegraf PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/net-mgmt/telegraf/pkg-descr b/net-mgmt/telegraf/pkg-descr index 5dd3e3a58..b49f834fb 100644 --- a/net-mgmt/telegraf/pkg-descr +++ b/net-mgmt/telegraf/pkg-descr @@ -11,6 +11,10 @@ Kafka, MQTT, NSQ, and many others. Plugin Changelog ================ +1.9.0 + +* Add Datadog output + 1.8.2 * Add 'ntpq' input 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 0e726a008..89f8ee137 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 @@ -167,4 +167,22 @@ checkbox Send string metrics as Prometheus labels. + + output.datadog_enable + + checkbox + This will enable Datadog output. + + + output.datadog_url + + text + Set the URL where metrics shoud be sent to. Format is without square brackets, just like https://app.datadoghq.com/api/v1/series. + + + output.datadog_apikey + + text + Set the API Key for accessing Datadog. + 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 7b479f0c9..c3b090acf 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.1 + 1.4.2 0 @@ -109,5 +109,17 @@ N + + 0 + N + + + + N + + + + 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 f9e83ea4d..07d1d38b8 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 @@ -75,6 +75,17 @@ {% endif %} {% endif %} +{% if helpers.exists('OPNsense.telegraf.output.datadog_enable') and OPNsense.telegraf.output.datadog_enable == '1' %} +[[outputs.datadog]] +{% if helpers.exists('OPNsense.telegraf.output.datadog_url') and OPNsense.telegraf.output.datadog_url != '' %} + url = "{{ OPNsense.telegraf.output.datadog_url }}" +{% endif %} +{% if helpers.exists('OPNsense.telegraf.output.datadog_apikey') and OPNsense.telegraf.output.datadog_apikey != '' %} + apikey = "{{ OPNsense.telegraf.output.datadog_apikey }}" +{% endif %} + timeout = "5s" +{% endif %} + {% if helpers.exists('OPNsense.telegraf.output.graphite_enable') and OPNsense.telegraf.output.graphite_enable == '1' %} [[outputs.graphite]] {% if helpers.exists('OPNsense.telegraf.output.graphite_server') and OPNsense.telegraf.output.graphite_server != '' %}