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 a75cc7eb2..9e9a174ea 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 @@ -155,6 +155,34 @@ true IP address of host allowed to retrieve proxy statistics. + + general.vmwarecachesize + + text + Shared memory size for storing VMware data. + true + + + general.vmwarefrequency + + text + Delay in seconds between data gathering from a single VMware service. + true + + + general.vmwareperffrequency + + text + Delay in seconds between performance counter statistics retrieval from a single VMware service. + true + + + general.vmwaretimeout + + text + The maximum number of seconds vmware collector will wait for a response from VMware service. + true + general.syslogEnable 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 fc214f691..36692f1ae 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 @@ -50,6 +50,21 @@ , Y + + /^\d+[KMG]$/ + + + 10 + 86400 + + + 10 + 86400 + + + 1 + 300 + 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 80373b0e1..90d7e38ac 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 @@ -84,6 +84,18 @@ HistoryCacheSize={{ OPNsense.zabbixproxy.general.historycachesize }} {% if helpers.exists('OPNsense.zabbixproxy.general.historyindexcachesize') and OPNsense.zabbixproxy.general.historyindexcachesize != '' %} HistoryIndexCacheSize={{ OPNsense.zabbixproxy.general.historyindexcachesize }} {% endif %} +{% if helpers.exists('OPNsense.zabbixproxy.general.vmwarecachesize') and OPNsense.zabbixproxy.general.vmwarecachesize != '' %} +VMwareCacheSize={{ OPNsense.zabbixproxy.general.vmwarecachesize }} +{% endif %} +{% if helpers.exists('OPNsense.zabbixproxy.general.vmwarefrequency') and OPNsense.zabbixproxy.general.vmwarefrequency != '' %} +VMwareFrequency={{ OPNsense.zabbixproxy.general.vmwarefrequency }} +{% endif %} +{% if helpers.exists('OPNsense.zabbixproxy.general.vmwareperffrequency') and OPNsense.zabbixproxy.general.vmwareperffrequency != '' %} +VMwarePerfFrequency={{ OPNsense.zabbixproxy.general.vmwareperffrequency }} +{% endif %} +{% if helpers.exists('OPNsense.zabbixproxy.general.vmwaretimeout') and OPNsense.zabbixproxy.general.vmwaretimeout != '' %} +VMwareTimeout={{ OPNsense.zabbixproxy.general.vmwaretimeout }} +{% endif %} {% if helpers.exists('OPNsense.zabbixproxy.general.timeout') and OPNsense.zabbixproxy.general.timeout != '' %} Timeout={{ OPNsense.zabbixproxy.general.timeout }} {% endif %}