From ef7cc2ef1270d8d0c15a79b3818615c3aabb1bb9 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Tue, 12 Nov 2019 21:18:15 +0100 Subject: [PATCH 1/3] net-mgmt/zabbix-agent: shorten description This aligns the description with other plugins. Besides that it makes it more usable, especially in "High Availability: Settings" the old description was pretty useless. --- net-mgmt/zabbix-agent/Makefile | 2 +- .../zabbix-agent/src/etc/inc/plugins.inc.d/zabbixagent.inc | 2 +- .../mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-mgmt/zabbix-agent/Makefile b/net-mgmt/zabbix-agent/Makefile index 217e9c047..6f2176603 100644 --- a/net-mgmt/zabbix-agent/Makefile +++ b/net-mgmt/zabbix-agent/Makefile @@ -1,6 +1,6 @@ PLUGIN_NAME= zabbix-agent PLUGIN_VERSION= 1.5 -PLUGIN_COMMENT= Enterprise-class open source distributed monitoring agent +PLUGIN_COMMENT= Zabbix monitoring agent PLUGIN_DEPENDS= zabbix4-agent PLUGIN_MAINTAINER= opnsense@moov.de diff --git a/net-mgmt/zabbix-agent/src/etc/inc/plugins.inc.d/zabbixagent.inc b/net-mgmt/zabbix-agent/src/etc/inc/plugins.inc.d/zabbixagent.inc index 0ebd6d2ae..c5d7a1f0a 100644 --- a/net-mgmt/zabbix-agent/src/etc/inc/plugins.inc.d/zabbixagent.inc +++ b/net-mgmt/zabbix-agent/src/etc/inc/plugins.inc.d/zabbixagent.inc @@ -81,6 +81,6 @@ function zabbixagent_xmlrpc_sync() $result = array(); $result['id'] = 'zabbixagent'; $result['section'] = 'OPNsense.zabbixagent.settings'; - $result['description'] = gettext('Enterprise-class open source distributed monitoring agent'); + $result['description'] = gettext('Zabbix monitoring agent'); return array($result); } 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 c903e10cc..7ceafa2dd 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,7 +1,7 @@ //OPNsense/ZabbixAgent - 1.2.1 - Enterprise-class open source distributed monitoring agent + 1.2.2 + Zabbix monitoring agent From 52350ce4091046be7ca17bb6e1584d172fb1a819 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Tue, 12 Nov 2019 21:32:23 +0100 Subject: [PATCH 2/3] net-mgmt/zabbix-agent: add option to grant sudo root access --- .../controllers/OPNsense/ZabbixAgent/forms/settings.xml | 7 +++++++ .../mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml | 4 ++++ .../service/templates/OPNsense/ZabbixAgent/+TARGETS | 1 + .../service/templates/OPNsense/ZabbixAgent/sudo_rules | 6 ++++++ 4 files changed, 18 insertions(+) create mode 100644 net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/sudo_rules 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 c9a5fe969..fb6c1b5b5 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 @@ -55,6 +55,13 @@ false + + zabbixagent.settings.main.sudoRoot + + checkbox + + false + 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 7ceafa2dd..ac4743576 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 @@ -63,6 +63,10 @@ Y + + 0 + Y + diff --git a/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/+TARGETS b/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/+TARGETS index bf7196672..b32508ca0 100644 --- a/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/+TARGETS +++ b/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/+TARGETS @@ -1,2 +1,3 @@ zabbix_agentd.conf:/usr/local/etc/zabbix_agentd.conf rc.conf.d:/etc/rc.conf.d/zabbix_agentd +sudo_rules:/usr/local/etc/sudoers.d/opnsense_zabbix_agent diff --git a/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/sudo_rules b/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/sudo_rules new file mode 100644 index 000000000..fc7790502 --- /dev/null +++ b/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/sudo_rules @@ -0,0 +1,6 @@ +# +# Automatically generated configuration. +# Do not edit this file manually. +{% if helpers.exists('OPNsense.ZabbixAgent.settings') and OPNsense.ZabbixAgent.settings.main.sudoRoot|default('0') == '1' %} +zabbix ALL=(ALL) NOPASSWD: ALL +{% endif %} From 27ca705d3488e48fc6368e352c23a4f7f5664c93 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Tue, 12 Nov 2019 21:39:01 +0100 Subject: [PATCH 3/3] net-mgmt/zabbix-agent: bump version --- net-mgmt/zabbix-agent/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-mgmt/zabbix-agent/Makefile b/net-mgmt/zabbix-agent/Makefile index 6f2176603..521a2a13f 100644 --- a/net-mgmt/zabbix-agent/Makefile +++ b/net-mgmt/zabbix-agent/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= zabbix-agent -PLUGIN_VERSION= 1.5 +PLUGIN_VERSION= 1.6 PLUGIN_COMMENT= Zabbix monitoring agent PLUGIN_DEPENDS= zabbix4-agent PLUGIN_MAINTAINER= opnsense@moov.de