From 5541b58c04e9850cfd8767dfb11dc9f5c603eea5 Mon Sep 17 00:00:00 2001 From: "thomas.laerm" Date: Tue, 19 May 2026 00:12:03 +0200 Subject: [PATCH 1/4] Add header config to OpenTelemetry output and fix service_address string --- net-mgmt/telegraf/Makefile | 2 +- net-mgmt/telegraf/pkg-descr | 5 +++++ .../controllers/OPNsense/Telegraf/forms/output.xml | 14 +++++++++++++- .../mvc/app/models/OPNsense/Telegraf/Output.xml | 8 +++++++- .../templates/OPNsense/Telegraf/telegraf.conf | 8 ++++++-- 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile index 8217de4b1..cc1d6f967 100644 --- a/net-mgmt/telegraf/Makefile +++ b/net-mgmt/telegraf/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= telegraf -PLUGIN_VERSION= 1.12.14 +PLUGIN_VERSION= 1.12.15 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 367925c76..a5dae08ef 100644 --- a/net-mgmt/telegraf/pkg-descr +++ b/net-mgmt/telegraf/pkg-descr @@ -12,6 +12,11 @@ WWW: https://www.influxdata.com/time-series-platform/telegraf/ Plugin Changelog ================ +1.12.15 + +* Add custom header support for OpenTelemetry output +* Quote OpenTelemetry service_address in config + 1.12.14 * Add name_prefix in influxdb config 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 ba6b50c21..9f79ea655 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 @@ -347,7 +347,7 @@ output.opentelemetry_server text - Set the IP and port where metrics shoud be sent to, e.g. 192.168.0.1:4317. + For gRPC, set the address and port, e.g. 192.168.0.1:4317. For HTTP, use a full URL, e.g. https://collector.example.com/v1/metrics. output.opentelemetry_compression @@ -367,4 +367,16 @@ checkbox This will skip chain and host verification. + + output.opentelemetry_header_name + + text + Name of an additional HTTP header to send with requests, e.g. Authorization. + + + output.opentelemetry_header_value + + text + Value for the custom header, e.g. Bearer your-token-here. + 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 8c3828957..47a6f3e37 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.6 + 1.4.7 0 @@ -204,5 +204,11 @@ none + + 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 acc65c904..bd11ec9d7 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 @@ -143,7 +143,7 @@ {% if helpers.exists('OPNsense.telegraf.output.opentelemetry_enable') and OPNsense.telegraf.output.opentelemetry_enable == '1' %} [[outputs.opentelemetry]] {% if helpers.exists('OPNsense.telegraf.output.opentelemetry_server') and OPNsense.telegraf.output.opentelemetry_server != '' %} - service_address = {{ OPNsense.telegraf.output.opentelemetry_server }} + service_address = "{{ OPNsense.telegraf.output.opentelemetry_server }}" {% endif %} {% if helpers.exists('OPNsense.telegraf.output.opentelemetry_timeout') and OPNsense.telegraf.output.opentelemetry_timeout != '' %} timeout = "{{ OPNsense.telegraf.output.opentelemetry_timeout }}s" @@ -155,7 +155,11 @@ {% endif %} {% if helpers.exists('OPNsense.telegraf.output.opentelemetry_compression') and OPNsense.telegraf.output.opentelemetry_compression != '' %} compression = "{{ OPNsense.telegraf.output.opentelemetry_compression }}" -{% endif %} +{% endif %} +{% if helpers.exists('OPNsense.telegraf.output.opentelemetry_header_name') and OPNsense.telegraf.output.opentelemetry_header_name != '' %} +[outputs.opentelemetry.headers] + "{{ OPNsense.telegraf.output.opentelemetry_header_name }}" = "{{ OPNsense.telegraf.output.opentelemetry_header_value }}" +{% endif %} {% endif %} {% if helpers.exists('OPNsense.telegraf.output.graphite_enable') and OPNsense.telegraf.output.graphite_enable == '1' %} From 582c4a80a4f4decb44cf7f60bbf1cbd571652473 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 19 May 2026 07:33:23 +0200 Subject: [PATCH 2/4] Apply suggestion from @fichtner --- .../opnsense/service/templates/OPNsense/Telegraf/telegraf.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bd11ec9d7..3978a3213 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 @@ -155,7 +155,7 @@ {% endif %} {% if helpers.exists('OPNsense.telegraf.output.opentelemetry_compression') and OPNsense.telegraf.output.opentelemetry_compression != '' %} compression = "{{ OPNsense.telegraf.output.opentelemetry_compression }}" -{% endif %} +{% endif %} {% if helpers.exists('OPNsense.telegraf.output.opentelemetry_header_name') and OPNsense.telegraf.output.opentelemetry_header_name != '' %} [outputs.opentelemetry.headers] "{{ OPNsense.telegraf.output.opentelemetry_header_name }}" = "{{ OPNsense.telegraf.output.opentelemetry_header_value }}" From bea4384972557000e1013f273785da823059b99f Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 19 May 2026 07:33:47 +0200 Subject: [PATCH 3/4] Apply suggestion from @fichtner --- .../src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 47a6f3e37..87fa538fb 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.7 + 1.4.6 0 From 0bbfb18a17b9e60e97b7579b7de9b49555780617 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 19 May 2026 07:34:24 +0200 Subject: [PATCH 4/4] Apply suggestion from @fichtner --- .../opnsense/service/templates/OPNsense/Telegraf/telegraf.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3978a3213..3bcb8354d 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 @@ -159,7 +159,7 @@ {% if helpers.exists('OPNsense.telegraf.output.opentelemetry_header_name') and OPNsense.telegraf.output.opentelemetry_header_name != '' %} [outputs.opentelemetry.headers] "{{ OPNsense.telegraf.output.opentelemetry_header_name }}" = "{{ OPNsense.telegraf.output.opentelemetry_header_value }}" -{% endif %} +{% endif %} {% endif %} {% if helpers.exists('OPNsense.telegraf.output.graphite_enable') and OPNsense.telegraf.output.graphite_enable == '1' %}