diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile index c8732d79c..a7e3d647a 100644 --- a/net-mgmt/telegraf/Makefile +++ b/net-mgmt/telegraf/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= telegraf -PLUGIN_VERSION= 1.11.0 +PLUGIN_VERSION= 1.12.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 b36867f33..0ab481d8f 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.0 + +* Allow to start telegraf with wheel group permissions +* Add Unbound input + 1.11.0 * Set telegraf.d as additional config include diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/general.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/general.xml index ff2eea081..95a80b7fd 100644 --- a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/general.xml +++ b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/general.xml @@ -5,6 +5,12 @@ checkbox This will activate the telegraf agent. + + general.wheelgroup + + checkbox + This will start the process with wheel group permission. Please use this with care, currently only needed for Unbound and Suricata. + general.interval diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/input.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/input.xml index 992c4bb37..7f318d9c2 100644 --- a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/input.xml +++ b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/input.xml @@ -142,5 +142,11 @@ checkbox Requires Intrustion detection alerts are stored locally. - + + + input.unbound + + checkbox + Enable the collection of Unbound metrics. + diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/General.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/General.xml index e994cd877..ed05705e3 100644 --- a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/General.xml +++ b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/General.xml @@ -1,12 +1,16 @@ //OPNsense/telegraf/general Telegraf general configuration - 1.0.1 + 1.0.2 0 Y + + 0 + Y + 10 Y diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Input.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Input.xml index 721ea4e98..3e4f6e85d 100644 --- a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Input.xml +++ b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Input.xml @@ -93,5 +93,8 @@ 0 N + + N + diff --git a/net-mgmt/telegraf/src/opnsense/scripts/OPNsense/Telegraf/setup.sh b/net-mgmt/telegraf/src/opnsense/scripts/OPNsense/Telegraf/setup.sh index c18039d0b..e4329aafe 100755 --- a/net-mgmt/telegraf/src/opnsense/scripts/OPNsense/Telegraf/setup.sh +++ b/net-mgmt/telegraf/src/opnsense/scripts/OPNsense/Telegraf/setup.sh @@ -5,3 +5,4 @@ chown -R telegraf:telegraf /usr/local/etc/telegraf.d /var/log/telegraf chmod 750 /usr/local/etc/telegraf.d /var/log/telegraf /usr/sbin/pw groupmod proxy -m telegraf +/usr/sbin/pw groupmod unbound -m telegraf diff --git a/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf b/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf index 193a97c65..54ccc238f 100644 --- a/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf +++ b/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf @@ -1,4 +1,7 @@ {% if helpers.exists('OPNsense.telegraf.general.enabled') and OPNsense.telegraf.general.enabled == '1' %} +{% if OPNsense.telegraf.general.wheelgroup == '1' %} +telegraf_group="wheel" +{% endif %} telegraf_var_script="/usr/local/opnsense/scripts/OPNsense/Telegraf/setup.sh" telegraf_enable="YES" telegraf_confdir="/usr/local/etc/telegraf.d" 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 f553999f7..f74f87854 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 @@ -263,4 +263,11 @@ json_string_fields = ["*"] {% endif %} +{% if helpers.exists('OPNsense.telegraf.input.unbound') and OPNsense.telegraf.input.unbound == '1' %} +[[inputs.unbound]] + binary = "/usr/local/sbin/unbound-control" + config_file = "/var/unbound/unbound.conf" + thread_as_tag = true +{% endif %} + {% endif %}