From 311eccb6388a8533e4e41d1ec298660b2a9bb5c3 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 9 Sep 2021 09:50:33 +0200 Subject: [PATCH] net-mgmt/telegraf: Allow Run as Root (#2520) --- net-mgmt/telegraf/Makefile | 2 +- net-mgmt/telegraf/pkg-descr | 4 ++++ .../mvc/app/controllers/OPNsense/Telegraf/forms/general.xml | 4 ++-- .../src/opnsense/service/templates/OPNsense/Telegraf/telegraf | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile index a7e3d647a..71ae1610b 100644 --- a/net-mgmt/telegraf/Makefile +++ b/net-mgmt/telegraf/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= telegraf -PLUGIN_VERSION= 1.12.0 +PLUGIN_VERSION= 1.12.1 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 0ab481d8f..9b28b08a9 100644 --- a/net-mgmt/telegraf/pkg-descr +++ b/net-mgmt/telegraf/pkg-descr @@ -12,6 +12,10 @@ WWW: https://www.influxdata.com/time-series-platform/telegraf/ Plugin Changelog ================ +1.12.1 + +* Rename "Wheel Group" to "Run as Root" and set user permissions + 1.12.0 * Allow to start telegraf with wheel group permissions 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 95a80b7fd..cddb34f67 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 @@ -7,9 +7,9 @@ general.wheelgroup - + checkbox - This will start the process with wheel group permission. Please use this with care, currently only needed for Unbound and Suricata. + This will start the process with wheel group and root user permission. Please use this with care, currently only needed for Unbound and Suricata. general.interval 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 54ccc238f..5e91fffa8 100644 --- a/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf +++ b/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf @@ -1,5 +1,6 @@ {% if helpers.exists('OPNsense.telegraf.general.enabled') and OPNsense.telegraf.general.enabled == '1' %} {% if OPNsense.telegraf.general.wheelgroup == '1' %} +telegraf_user="root" telegraf_group="wheel" {% endif %} telegraf_var_script="/usr/local/opnsense/scripts/OPNsense/Telegraf/setup.sh"