diff --git a/net-mgmt/zabbix-proxy/Makefile b/net-mgmt/zabbix-proxy/Makefile index 362f05058..06492f992 100644 --- a/net-mgmt/zabbix-proxy/Makefile +++ b/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 diff --git a/net-mgmt/zabbix-proxy/pkg-descr b/net-mgmt/zabbix-proxy/pkg-descr index 9a405114b..ca419ae32 100644 --- a/net-mgmt/zabbix-proxy/pkg-descr +++ b/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) diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml index 771ad073d..8124eaa21 100644 --- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml +++ b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml @@ -139,6 +139,14 @@ text Specifies the time how often the proxy will send collected data to the server (in seconds). + + general.statsip + + + select_multiple + true + IP address of host allowed to retrieve proxy statistics. + general.encryption diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml index 45029f7c3..6602576a2 100644 --- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml +++ b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml @@ -1,7 +1,7 @@ //OPNsense/zabbixproxy/general Zabbix Proxy configuration - 2.0.2 + 2.0.3 0 @@ -96,6 +96,12 @@ N + + + , + Y + N + 0 Y diff --git a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in index f4b2adf11..9eace261b 100644 --- a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in +++ b/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' %}