From 9f37166cd7568d702e58036e640b5222fc9500ab Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 26 Apr 2018 11:14:38 +0200 Subject: [PATCH] net-mgmt/zabbix-agent: merge version 1.3 from master --- net-mgmt/zabbix-agent/Makefile | 2 +- .../mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net-mgmt/zabbix-agent/Makefile b/net-mgmt/zabbix-agent/Makefile index a1d26a724..030443e50 100644 --- a/net-mgmt/zabbix-agent/Makefile +++ b/net-mgmt/zabbix-agent/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= zabbix-agent -PLUGIN_VERSION= 1.2 +PLUGIN_VERSION= 1.3 PLUGIN_REVISION= 1 PLUGIN_COMMENT= Enterprise-class open source distributed monitoring agent PLUGIN_DEPENDS= zabbix34-agent diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml index 700e6926f..49e39a6e2 100644 --- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml +++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml @@ -1,6 +1,6 @@ //OPNsense/ZabbixAgent - 1.0.0 + 1.1.0 Enterprise-class open source distributed monitoring agent @@ -8,6 +8,7 @@ + Zabbix agent Y /^.{1,255}$/u Should be a string between 1 and 255 characters. @@ -20,6 +21,7 @@ Y + 127.0.0.1 Y Y /^([a-zA-Z0-9\.:\[\]\-]*?,)*([a-zA-Z0-9\.:\[\]\-]*)$/ @@ -33,6 +35,7 @@ Y + 0.0.0.0 Y Y /^((([0-9a-zA-Z._\-\*:]+)([,]){0,1}))*/u