net-mgmt/telegraf: add unbound (#2488)

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

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

net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/general.xml

@@ -5,6 +5,12 @@
         <type>checkbox</type>
         <help>This will activate the telegraf agent.</help>
     </field>
+    <field>
+        <id>general.wheelgroup</id>
+        <label>Wheel Group</label>
+        <type>checkbox</type>
+        <help>This will start the process with wheel group permission. Please use this with care, currently only needed for Unbound and Suricata.</help>
+    </field>
     <field>
         <id>general.interval</id>
         <label>Interval</label>

net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/input.xml

@@ -142,5 +142,11 @@
         <label>Intrusion Dectection Alerts</label>
         <type>checkbox</type>
         <help>Requires Intrustion detection alerts are stored locally.</help>
-   </field>
+    </field>
+    <field>
+        <id>input.unbound</id>
+        <label>Unbound</label>
+        <type>checkbox</type>
+        <help>Enable the collection of Unbound metrics.</help>
+    </field>
 </form>

net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/General.xml

@@ -1,12 +1,16 @@
 <model>
     <mount>//OPNsense/telegraf/general</mount>
     <description>Telegraf general configuration</description>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
             <Required>Y</Required>
         </enabled>
+        <wheelgroup type="BooleanField">
+            <default>0</default>
+            <Required>Y</Required>
+        </wheelgroup>
         <interval type="IntegerField">
             <default>10</default>
             <Required>Y</Required>

net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Input.xml

@@ -93,5 +93,8 @@
             <default>0</default>
             <Required>N</Required>
         </intrusion_detection_alerts>
+        <unbound type="BooleanField">
+            <Required>N</Required>
+        </unbound>
     </items>
 </model>

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

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"

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 %}