net-mgmt/zabbix-proxy: Add Allowed Stats IP (#2699)

net-mgmt/zabbix-proxy/Makefile

@@ -1,5 +1,5 @@
 PLUGIN_NAME=		zabbix-proxy
-PLUGIN_VERSION=		1.6
+PLUGIN_VERSION=		1.7
 PLUGIN_COMMENT=		Zabbix monitoring proxy
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
 PLUGIN_VARIANTS=	zabbix5 zabbix54 zabbix4

net-mgmt/zabbix-proxy/pkg-descr

@@ -12,6 +12,10 @@ WWW: https://www.zabbix.com/
 Plugin Changelog
 ----------------
 
+1.7 
+
+* Add StatsIP field to allow retrieving statistics (#2697)
+
 1.6
 
 * Fix upgrade path by using a new db file for each version (#1943)

net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml

@@ -139,6 +139,14 @@
         <type>text</type>
         <help>Specifies the time how often the proxy will send collected data to the server (in seconds).</help>
     </field>
+    <field>
+        <id>general.statsip</id>
+        <label>Stats Allowed IP</label>
+        <style>tokenize</style>
+        <type>select_multiple</type>
+        <allownew>true</allownew>
+        <help>IP address of host allowed to retrieve proxy statistics.</help>
+    </field>
     <field>
         <id>general.encryption</id>
         <label>PSK based encryption</label>

net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml

@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/zabbixproxy/general</mount>
     <description>Zabbix Proxy configuration</description>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -96,6 +96,12 @@
         <datasenderfrequency type="IntegerField">
             <Required>N</Required>
         </datasenderfrequency>
+        <statsip type="NetworkField">
+            <default></default>
+            <FieldSeparator>,</FieldSeparator>
+            <asList>Y</asList>
+            <Required>N</Required>
+        </statsip>
         <encryption type="BooleanField">
             <default>0</default>
             <Required>Y</Required>

net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in

@@ -71,6 +71,9 @@ HistoryIndexCacheSize={{ OPNsense.zabbixproxy.general.historyindexcachesize }}
 {% if helpers.exists('OPNsense.zabbixproxy.general.timeout') and OPNsense.zabbixproxy.general.timeout != '' %}
 Timeout={{ OPNsense.zabbixproxy.general.timeout }}
 {% endif %}
+{% if helpers.exists('OPNsense.zabbixproxy.general.statsip') and OPNsense.zabbixproxy.general.statsip != '' %}
+StatsAllowedIP={{ OPNsense.zabbixproxy.general.statsip }}
+{% endif %}
 FpingLocation=/usr/local/sbin/fping
 Fping6Location=/usr/local/sbin/fping6
 {% if helpers.exists('OPNsense.zabbixproxy.general.encryption') and OPNsense.zabbixproxy.general.encryption == '1' %}