diff --git a/Makefile b/Makefile index ac4ed951f..aa157d595 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ PAGER?= less -PLUGIN_ABI= 19.1 +PLUGIN_ABI= 19.7 all: @cat ${.CURDIR}/README.md | ${PAGER} diff --git a/net-mgmt/zabbix-proxy/Makefile b/net-mgmt/zabbix-proxy/Makefile deleted file mode 100644 index 089e297d7..000000000 --- a/net-mgmt/zabbix-proxy/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -PLUGIN_NAME= zabbix-proxy -PLUGIN_VERSION= 1.1 -PLUGIN_COMMENT= Zabbix Proxy enables decentralized monitoring -PLUGIN_DEPENDS= zabbix3-proxy -PLUGIN_CONFLICTS= zabbix4-proxy -PLUGIN_MAINTAINER= m.muenz@gmail.com - -.include "../../Mk/plugins.mk" diff --git a/net-mgmt/zabbix-proxy/pkg-descr b/net-mgmt/zabbix-proxy/pkg-descr deleted file mode 100644 index d18a4485b..000000000 --- a/net-mgmt/zabbix-proxy/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Zabbix is an enterprise-class open source distributed monitoring solution. - -Zabbix is software that monitors numerous parameters of a network and the -health and integrity of servers. Zabbix uses a flexible notification -mechanism that allows users to configure e-mail based alerts for virtually -any event. This allows a fast reaction to server problems. Zabbix offers -excellent reporting and data visualisation features based on the stored -data. This makes Zabbix ideal for capacity planning. - -WWW: http://www.zabbix.com/ diff --git a/net-mgmt/zabbix-proxy/src/etc/inc/plugins.inc.d/zabbixproxy.inc b/net-mgmt/zabbix-proxy/src/etc/inc/plugins.inc.d/zabbixproxy.inc deleted file mode 100644 index d26017268..000000000 --- a/net-mgmt/zabbix-proxy/src/etc/inc/plugins.inc.d/zabbixproxy.inc +++ /dev/null @@ -1,49 +0,0 @@ - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - -function zabbixproxy_services() -{ - global $config; - - $services = array(); - - if (isset($config['OPNsense']['zabbixproxy']['general']['enabled']) && $config['OPNsense']['zabbixproxy']['general']['enabled'] == 1) { - $services[] = array( - 'description' => gettext('Zabbix Proxy'), - 'configd' => array( - 'restart' => array('zabbixproxy restart'), - 'start' => array('zabbixproxy start'), - 'stop' => array('zabbixproxy stop'), - ), - 'name' => 'zabbixproxy', - 'pidfile' => '/var/run/zabbix/zabbix_proxy.pid' - ); - } - - return $services; -} diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/Api/GeneralController.php b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/Api/GeneralController.php deleted file mode 100644 index 21532e210..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/Api/GeneralController.php +++ /dev/null @@ -1,77 +0,0 @@ - - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -namespace OPNsense\Zabbixproxy\Api; - -use \OPNsense\Base\ApiControllerBase; -use \OPNsense\Zabbixproxy\General; -use \OPNsense\Core\Config; - -class GeneralController extends ApiControllerBase -{ - public function getAction() - { - // define list of configurable settings - $result = array(); - if ($this->request->isGet()) { - $mdlGeneral = new General(); - $result['general'] = $mdlGeneral->getNodes(); - } - return $result; - } - - public function setAction() - { - $result = array("result"=>"failed"); - if ($this->request->isPost()) { - // load model and update with provided data - $mdlGeneral = new General(); - $mdlGeneral->setNodes($this->request->getPost("general")); - - // perform validation - $valMsgs = $mdlGeneral->performValidation(); - foreach ($valMsgs as $field => $msg) { - if (!array_key_exists("validations", $result)) { - $result["validations"] = array(); - } - $result["validations"]["general.".$msg->getField()] = $msg->getMessage(); - } - - // serialize model to config and save - if ($valMsgs->count() == 0) { - $mdlGeneral->serializeToConfig(); - Config::getInstance()->save(); - $result["result"] = "saved"; - } - } - return $result; - } -} diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/Api/ServiceController.php b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/Api/ServiceController.php deleted file mode 100644 index 087acf88d..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/Api/ServiceController.php +++ /dev/null @@ -1,153 +0,0 @@ - - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -namespace OPNsense\Zabbixproxy\Api; - -use \OPNsense\Base\ApiControllerBase; -use \OPNsense\Core\Backend; -use \OPNsense\Zabbixproxy\General; - -/** - * Class ServiceController - * @package OPNsense\Zabbixproxy - */ -class ServiceController extends ApiControllerBase -{ - /** - * start zabbixproxy service (in background) - * @return array - */ - public function startAction() - { - if ($this->request->isPost()) { - // close session for long running action - $this->sessionClose(); - $backend = new Backend(); - $response = $backend->configdRun("zabbixproxy start"); - return array("response" => $response); - } else { - return array("response" => array()); - } - } - - /** - * stop zabbixproxy service - * @return array - */ - public function stopAction() - { - if ($this->request->isPost()) { - // close session for long running action - $this->sessionClose(); - $backend = new Backend(); - $response = $backend->configdRun("zabbixproxy stop"); - return array("response" => $response); - } else { - return array("response" => array()); - } - } - - /** - * restart zabbixproxy service - * @return array - */ - public function restartAction() - { - if ($this->request->isPost()) { - // close session for long running action - $this->sessionClose(); - $backend = new Backend(); - $response = $backend->configdRun("zabbixproxy restart"); - return array("response" => $response); - } else { - return array("response" => array()); - } - } - - /** - * retrieve status of zabbixproxy - * @return array - * @throws \Exception - */ - public function statusAction() - { - $backend = new Backend(); - $mdlGeneral = new General(); - $response = $backend->configdRun("zabbixproxy status"); - - if (strpos($response, "not running") > 0) { - if ($mdlGeneral->enabled->__toString() == 1) { - $status = "stopped"; - } else { - $status = "disabled"; - } - } elseif (strpos($response, "is running") > 0) { - $status = "running"; - } elseif ($mdlGeneral->enabled->__toString() == 0) { - $status = "disabled"; - } else { - $status = "unkown"; - } - - return array("status" => $status); - } - - /** - * reconfigure zabbixproxy, generate config and reload - */ - public function reconfigureAction() - { - if ($this->request->isPost()) { - // close session for long running action - $this->sessionClose(); - - $mdlGeneral = new General(); - $backend = new Backend(); - - $runStatus = $this->statusAction(); - - // stop zabbixproxy if it is running or not - $this->stopAction(); - - // generate template - $backend->configdRun('template reload OPNsense/Zabbixproxy'); - - // (res)start daemon - if ($mdlGeneral->enabled->__toString() == 1) { - $this->startAction(); - } - - return array("status" => "ok"); - } else { - return array("status" => "failed"); - } - } -} diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/GeneralController.php b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/GeneralController.php deleted file mode 100644 index 925117107..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/GeneralController.php +++ /dev/null @@ -1,38 +0,0 @@ - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - -namespace OPNsense\Zabbixproxy; - -class GeneralController extends \OPNsense\Base\IndexController -{ - public function indexAction() - { - $this->view->generalForm = $this->getForm("general"); - $this->view->pick('OPNsense/Zabbixproxy/general'); - } -} 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 deleted file mode 100644 index e680d0b3f..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml +++ /dev/null @@ -1,137 +0,0 @@ -
- - general.enabled - - checkbox - This will activate the Zabbix Proxy service. - - - general.proxymode - - checkbox - Active (default) or passive mode, only switch to passive if you know what you are doing. - - - general.server - - text - IP address or hostname of Zabbix server. - - - general.serverport - - text - Port of Zabbix trapper on Zabbix server. Default is fine for most scenarios. - - - general.hostname - - text - The name of this Zabbix instance. It has to match with the defined name in the central Zabbix server. - - - general.listenip - - text - List of comma delimited IP addresses that the trapper should listen on. Trapper will listen on all network interfaces if this parameter is missing. - - - general.listenport - - text - Listen port for trapper. Default is just fine. - - - general.sourceip - - text - Source IP address for outgoing connections. - - - general.startpollers - - text - Number of pre-forked instances of pollers. - - - general.startipmipollers - - text - Number of pre-forked instances of IPMI pollers. - - - general.startpollersunreachable - - text - Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java). - - - general.starttrappers - - text - Number of pre-forked instances of trappers. Trappers accept incoming connections from Zabbix sender and active agents. - - - general.startpingers - - text - Number of pre-forked instances of ICMP pingers. - - - general.startdiscoverers - - text - Number of pre-forked instances of discoverers. - - - general.starthttppollers - - text - Number of pre-forked instances of HTTP pollers. - - - general.cachesize - - text - Size of configuration cache, in bytes. Shared memory size, for storing hosts and items data. Range: 128K-8G - - - general.historycachesize - - text - Size of history cache in bytes. Shared memory size for storing history data. Range: 128K-2G - - - general.historyindexcachesize - - text - Size of history index cache in bytes. Shared memory size for indexing history cache. Range: 128K-2G - - - general.timeout - - text - Specifies how long we wait for agent, SNMP device or external check (in seconds). - - - general.encryption - - checkbox - Enable PSK based encryption for communicating with the Zabbix server - true - - - general.encryptionidentity - - text - The PSK identity configured on the Zabbix server - true - - - general.encryptionpsk - - text - The PSK configured on the Zabbix server - true - -
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/ACL/ACL.xml b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/ACL/ACL.xml deleted file mode 100644 index 6166a2c68..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/ACL/ACL.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Services: Zabbix Proxy - - ui/zabbixproxy/* - api/zabbixproxy/* - - - diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.php b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.php deleted file mode 100644 index 82a50f1c2..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.php +++ /dev/null @@ -1,35 +0,0 @@ - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - -namespace OPNsense\Zabbixproxy; - -use OPNsense\Base\BaseModel; - -class General extends BaseModel -{ -} 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 deleted file mode 100644 index aefdc4007..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml +++ /dev/null @@ -1,99 +0,0 @@ - - //OPNsense/zabbixproxy/general - Zabbix Proxy configuration - 1.1.0 - - - 0 - Y - - - 0 - Y - - - - N - - - 10051 - N - - - Zabbix proxy - Y - - - 10051 - N - - - - N - - - - N - - - 5 - N - - - 0 - N - - - 1 - N - - - 5 - N - - - 1 - N - - - 1 - N - - - 1 - N - - - 8M - N - - - 16M - N - - - 4M - N - - - 4 - N - - - 0 - Y - - - - N - /^.{1,128}$/ - Should be a string between 1 and 128 characters. - - - - N - /^[A-Fa-f0-9]{32,512}$/ - Should be a hexadecimal string between 32 and 512 characters. - - - diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/Menu/Menu.xml b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/Menu/Menu.xml deleted file mode 100644 index 7b5301743..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/Menu/Menu.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/views/OPNsense/Zabbixproxy/general.volt b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/views/OPNsense/Zabbixproxy/general.volt deleted file mode 100644 index 3466d36e9..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/views/OPNsense/Zabbixproxy/general.volt +++ /dev/null @@ -1,61 +0,0 @@ -{# - -OPNsense® is Copyright © 2014 – 2017 by Deciso B.V. -This file is Copyright © 2017 by Michael Muenz -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, -OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -#} -
- {{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_general_settings'])}} -
-
- -
-
- - diff --git a/net-mgmt/zabbix-proxy/src/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh b/net-mgmt/zabbix-proxy/src/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh deleted file mode 100755 index 4ce930e20..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# Setup database directory -mkdir -p /var/db/zabbix -chown -R zabbix:zabbix /var/db/zabbix -chmod 755 /var/db/zabbix - -# Setup logging -touch /var/log/zabbix_proxy.log -chown -R zabbix:zabbix /var/log/zabbix_proxy.log - -# Setup PID directory -mkdir -p /var/run/zabbix -chown -R zabbix:zabbix /var/run/zabbix -chmod 755 /var/run/zabbix diff --git a/net-mgmt/zabbix-proxy/src/opnsense/service/conf/actions.d/actions_zabbixproxy.conf b/net-mgmt/zabbix-proxy/src/opnsense/service/conf/actions.d/actions_zabbixproxy.conf deleted file mode 100644 index 7904a1445..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/service/conf/actions.d/actions_zabbixproxy.conf +++ /dev/null @@ -1,23 +0,0 @@ -[start] -command:/usr/local/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh;/usr/local/etc/rc.d/zabbix_proxy start -parameters: -type:script -message:starting Zabbix Proxy - -[stop] -command:/usr/local/etc/rc.d/zabbix_proxy stop; exit 0 -parameters: -type:script -message:stopping Zabbix Proxy - -[restart] -command:/usr/local/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh;/usr/local/etc/rc.d/zabbix_proxy restart -parameters: -type:script -message:restarting Zabbix Proxy - -[status] -command:/usr/local/etc/rc.d/zabbix_proxy status;exit 0 -parameters: -type:script_output -message:request Zabbix Proxy status diff --git a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/+TARGETS b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/+TARGETS deleted file mode 100644 index 557e72c25..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/+TARGETS +++ /dev/null @@ -1,3 +0,0 @@ -zabbix_proxy:/etc/rc.conf.d/zabbix_proxy -zabbix_proxy.conf:/usr/local/etc/zabbix3/zabbix_proxy.conf -zabbix_proxy.psk:/usr/local/etc/zabbix3/zabbix_proxy.psk diff --git a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy deleted file mode 100644 index f9c1bb348..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy +++ /dev/null @@ -1,6 +0,0 @@ -{% if helpers.exists('OPNsense.zabbixproxy.general.enabled') and OPNsense.zabbixproxy.general.enabled == '1' %} -zabbix_proxy_var_script="/usr/local/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh" -zabbix_proxy_enable="YES" -{% else %} -zabbix_proxy_enable="NO" -{% endif %} diff --git a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf deleted file mode 100644 index 6ccb03d01..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf +++ /dev/null @@ -1,73 +0,0 @@ -{% if helpers.exists('OPNsense.zabbixproxy.general.enabled') and OPNsense.zabbixproxy.general.enabled == '1' %} - -{% if helpers.exists('OPNsense.zabbixproxy.general.proxymode') and OPNsense.zabbixproxy.general.proxymode == '1' %} -ProxyMode=1 -{% else %} -ProxyMode=0 -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.server') and OPNsense.zabbixproxy.general.server != '' %} -Server={{ OPNsense.zabbixproxy.general.server }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.serverport') and OPNsense.zabbixproxy.general.serverport != '' %} -ServerPort={{ OPNsense.zabbixproxy.general.serverport }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.hostname') and OPNsense.zabbixproxy.general.hostname != '' %} -Hostname={{ OPNsense.zabbixproxy.general.hostname }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.listenport') and OPNsense.zabbixproxy.general.listenport != '' %} -ListenPort={{ OPNsense.zabbixproxy.general.listenport }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.sourceip') and OPNsense.zabbixproxy.general.sourceip != '' %} -SourceIP={{ OPNsense.zabbixproxy.general.sourceip }} -{% endif %} -LogFile=/var/log/zabbix_proxy.log -PidFile=/var/run/zabbix/zabbix_proxy.pid -DBName=/var/db/zabbix/zabbix_proxy.db -{% if helpers.exists('OPNsense.zabbixproxy.general.startpollers') and OPNsense.zabbixproxy.general.startpollers != '' %} -StartPollers={{ OPNsense.zabbixproxy.general.startpollers }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.startipmipollers') and OPNsense.zabbixproxy.general.startipmipollers != '' %} -StartIPMIPollers={{ OPNsense.zabbixproxy.general.startipmipollers }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.startpollersunreachable') and OPNsense.zabbixproxy.general.startpollersunreachable != '' %} -StartPollersUnreachable={{ OPNsense.zabbixproxy.general.startpollersunreachable }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.starttrappers') and OPNsense.zabbixproxy.general.starttrappers != '' %} -StartTrappers={{ OPNsense.zabbixproxy.general.starttrappers }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.startpingers') and OPNsense.zabbixproxy.general.startpingers != '' %} -StartPingers={{ OPNsense.zabbixproxy.general.startpingers }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.startdiscoverers') and OPNsense.zabbixproxy.general.startdiscoverers != '' %} -StartDiscoverers={{ OPNsense.zabbixproxy.general.startdiscoverers }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.starthttppollers') and OPNsense.zabbixproxy.general.starthttppollers != '' %} -StartHTTPPollers={{ OPNsense.zabbixproxy.general.starthttppollers }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.listenip') and OPNsense.zabbixproxy.general.listenip != '' %} -ListenIP={{ OPNsense.zabbixproxy.general.listenip }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.cachesize') and OPNsense.zabbixproxy.general.cachesize != '' %} -CacheSize={{ OPNsense.zabbixproxy.general.cachesize }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.historycachesize') and OPNsense.zabbixproxy.general.historycachesize != '' %} -HistoryCacheSize={{ OPNsense.zabbixproxy.general.historycachesize }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.historyindexcachesize') and OPNsense.zabbixproxy.general.historyindexcachesize != '' %} -HistoryIndexCacheSize={{ OPNsense.zabbixproxy.general.historyindexcachesize }} -{% endif %} -{% if helpers.exists('OPNsense.zabbixproxy.general.timeout') and OPNsense.zabbixproxy.general.timeout != '' %} -Timeout={{ OPNsense.zabbixproxy.general.timeout }} -{% endif %} -FpingLocation=/usr/local/sbin/fping -Fping6Location=/usr/local/sbin/fping6 -{% if helpers.exists('OPNsense.zabbixproxy.general.encryption') and OPNsense.zabbixproxy.general.encryption == '1' %} -{% if helpers.exists('OPNsense.zabbixproxy.general.proxymode') and OPNsense.zabbixproxy.general.proxymode == '1' %} -TLSAccept=psk -{% else %} -TLSConnect=psk -{% endif %} -TLSPSKFile=/usr/local/etc/zabbix3/zabbix_proxy.psk -TLSPSKIdentity={{ OPNsense.zabbixproxy.general.encryptionidentity }} -{% endif %} -{% endif %} diff --git a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.psk b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.psk deleted file mode 100644 index 1e53053b5..000000000 --- a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.psk +++ /dev/null @@ -1,5 +0,0 @@ -{% if helpers.exists('OPNsense.zabbixproxy.general.enabled') and OPNsense.zabbixproxy.general.enabled == '1' %} -{% if helpers.exists('OPNsense.zabbixproxy.general.encryption') and OPNsense.zabbixproxy.general.encryption == '1' %} -{{ OPNsense.zabbixproxy.general.encryptionpsk }} -{% endif %} -{% endif %} diff --git a/net-mgmt/zabbix4-proxy/Makefile b/net-mgmt/zabbix4-proxy/Makefile index 8aeb13b65..b8da74ab5 100644 --- a/net-mgmt/zabbix4-proxy/Makefile +++ b/net-mgmt/zabbix4-proxy/Makefile @@ -3,7 +3,6 @@ PLUGIN_VERSION= 1.0 PLUGIN_REVISION= 1 PLUGIN_COMMENT= Zabbix Proxy enables decentralized monitoring PLUGIN_DEPENDS= zabbix4-proxy -PLUGIN_CONFLICTS= zabbix-proxy PLUGIN_MAINTAINER= m.muenz@gmail.com .include "../../Mk/plugins.mk"