From 75a4a908b1da13752da311c9599551c841a100e2 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Sun, 11 Jul 2021 13:45:00 +0200 Subject: [PATCH 1/6] net-mgmt/zabbix-agent: allow CIDR notation, resolves #2296 --- net-mgmt/zabbix-agent/pkg-descr | 5 +++++ .../mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/net-mgmt/zabbix-agent/pkg-descr b/net-mgmt/zabbix-agent/pkg-descr index e080b7c51..f8168dc7c 100644 --- a/net-mgmt/zabbix-agent/pkg-descr +++ b/net-mgmt/zabbix-agent/pkg-descr @@ -12,6 +12,11 @@ WWW: https://www.zabbix.com/ Plugin Changelog ---------------- +1.9 + +Added: +* Allow CIDR notation in "Zabbix Servers" field (#2296) + 1.8 * Add Changelog (contributed by Starkstromkonsument) 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 aebf63777..346cba846 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 @@ -22,7 +22,7 @@ 127.0.0.1 Y Y - /^([a-zA-Z0-9\.:\[\]\-]*?,)*([a-zA-Z0-9\.:\[\]\-]*)$/ + /^([a-zA-Z0-9\.:\[\]\-\/]*?,)*([a-zA-Z0-9\.:\[\]\-\/]*)$/ lower Please provide valid Zabbix server addresses, i.e. 10.0.0.1 or zabbix.example.com. From c82fbd5a7591ac86ae244fb1b41f4b6a0ed25047 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Sun, 11 Jul 2021 13:46:47 +0200 Subject: [PATCH 2/6] net-mgmt/zabbix-agent: reformat changelog --- net-mgmt/zabbix-agent/pkg-descr | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net-mgmt/zabbix-agent/pkg-descr b/net-mgmt/zabbix-agent/pkg-descr index f8168dc7c..88a569858 100644 --- a/net-mgmt/zabbix-agent/pkg-descr +++ b/net-mgmt/zabbix-agent/pkg-descr @@ -19,6 +19,11 @@ Added: 1.8 +Added: * Add Changelog (contributed by Starkstromkonsument) + +Fixed: * Fix logformat (contributed by Starkstromkonsument) + +Changed: * Switch to Zabbix Agent 5.0 From cc147ed4ff6002f29953ce39cd89d54398ca4216 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Sun, 11 Jul 2021 13:47:05 +0200 Subject: [PATCH 3/6] net-mgmt/zabbix-agent: bump version --- net-mgmt/zabbix-agent/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net-mgmt/zabbix-agent/Makefile b/net-mgmt/zabbix-agent/Makefile index 40f39eee6..b1160326c 100644 --- a/net-mgmt/zabbix-agent/Makefile +++ b/net-mgmt/zabbix-agent/Makefile @@ -1,6 +1,5 @@ PLUGIN_NAME= zabbix-agent -PLUGIN_VERSION= 1.8 -PLUGIN_REVISION= 2 +PLUGIN_VERSION= 1.9 PLUGIN_COMMENT= Zabbix monitoring agent PLUGIN_DEPENDS= zabbix5-agent PLUGIN_MAINTAINER= opnsense@moov.de From 71afeecb2b0abac2fe67f30983394d64b0c1c738 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Sun, 11 Jul 2021 14:13:19 +0200 Subject: [PATCH 4/6] net-mgmt/zabbix-agent: use "NetworkField" wherever applicable --- net-mgmt/zabbix-agent/pkg-descr | 3 +++ .../OPNsense/ZabbixAgent/forms/settings.xml | 5 +++-- .../models/OPNsense/ZabbixAgent/ZabbixAgent.xml | 17 +++++++++-------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/net-mgmt/zabbix-agent/pkg-descr b/net-mgmt/zabbix-agent/pkg-descr index 88a569858..58fa72932 100644 --- a/net-mgmt/zabbix-agent/pkg-descr +++ b/net-mgmt/zabbix-agent/pkg-descr @@ -17,6 +17,9 @@ Plugin Changelog Added: * Allow CIDR notation in "Zabbix Servers" field (#2296) +Changed: +* Use "NetworkField" wherever applicable for better input validation + 1.8 Added: diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml index 8618b5378..406ae29a4 100644 --- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml +++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml @@ -31,7 +31,8 @@ zabbixagent.settings.main.sourceIP text - + Optional + zabbixagent.settings.main.serverList @@ -112,7 +113,7 @@ select_multiple true - + zabbixagent.settings.features.refreshActiveChecks 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 346cba846..bf622ad70 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 @@ -24,7 +24,7 @@ Y /^([a-zA-Z0-9\.:\[\]\-\/]*?,)*([a-zA-Z0-9\.:\[\]\-\/]*)$/ lower - Please provide valid Zabbix server addresses, i.e. 10.0.0.1 or zabbix.example.com. + Please provide valid Zabbix server addresses, i.e. zabbix.example.com, 10.0.0.2 or 10.0.0.0/24. 10050 @@ -32,18 +32,19 @@ 65535 Y - + 0.0.0.0 Y Y - /^((([0-9a-zA-Z._\-\*:]+)([,]){0,1}))*/u - lower - Please provide valid IP addresses, i.e. 10.0.0.1. + N + Y + , + Please provide one or more valid IP addresses, i.e. 10.0.0.1. - + N - /^.{1,255}$/u - Should be a string between 1 and 255 characters. + N + Please provide a valid IP address, i.e. 10.0.0.1. 100 From fd0aa8e3cd15f02032e6e369adfb0504b533f165 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Sun, 11 Jul 2021 14:24:58 +0200 Subject: [PATCH 5/6] net-mgmt/zabbix-agent: add changelog for past releases --- net-mgmt/zabbix-agent/pkg-descr | 41 +++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/net-mgmt/zabbix-agent/pkg-descr b/net-mgmt/zabbix-agent/pkg-descr index 58fa72932..0bb3b893d 100644 --- a/net-mgmt/zabbix-agent/pkg-descr +++ b/net-mgmt/zabbix-agent/pkg-descr @@ -23,10 +23,47 @@ Changed: 1.8 Added: -* Add Changelog (contributed by Starkstromkonsument) +* Add Changelog (contributed by Starkstromkonsument, #1954) Fixed: -* Fix logformat (contributed by Starkstromkonsument) +* Fix logformat (contributed by Starkstromkonsument, #1954) Changed: * Switch to Zabbix Agent 5.0 + +1.7 + +Added: +* Add support for PSK encryption (#1618) + +Changed: +* Switch to new log view (#1593) + +1.6 + +Added: +* Add option to grant sudo root access + +1.5 + +Fixed: +* Relax validation mask for User Parameters (#1252) + +Changed: +* Migrate to ApiMutableServiceController + +1.4 + +Added: +* Add support for Item Key Aliases +* Add support for User Parameters + +Changed: +* Switch to Zabbix Agent 4.0 (#1091) +* Remove default comments from template + +1.3 + +Fixed: +* Add working default values (#491) +* Fixed service controls (#551) From 3cd19129edcbad077efe3b9728734b0e760447e7 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Sun, 11 Jul 2021 14:34:55 +0200 Subject: [PATCH 6/6] net-mgmt/zabbix-agent: update changelog, bump model version --- net-mgmt/zabbix-agent/pkg-descr | 1 + .../mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/net-mgmt/zabbix-agent/pkg-descr b/net-mgmt/zabbix-agent/pkg-descr index 0bb3b893d..8e22f3335 100644 --- a/net-mgmt/zabbix-agent/pkg-descr +++ b/net-mgmt/zabbix-agent/pkg-descr @@ -16,6 +16,7 @@ Plugin Changelog Added: * Allow CIDR notation in "Zabbix Servers" field (#2296) +* Add syslog option, allow logging to syslog (#2348) Changed: * Use "NetworkField" wherever applicable for better input validation 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 bf622ad70..bbc416f0d 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.2.3 + 1.2.4 Zabbix monitoring agent