diff --git a/README.md b/README.md index 5592d54b4..df0079997 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,6 @@ security/tinc -- Tinc VPN security/tor -- The Onion Router sysutils/boot-delay -- Apply a persistent 10 second boot delay sysutils/lcdproc-sdeclcd -- LCDProc for SDEC LCD devices -sysutils/monit -- Proactive system monitoring sysutils/node_exporter -- Prometheus exporter for machine metrics sysutils/nut -- Network UPS Tools sysutils/smart -- SMART tools diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile deleted file mode 100644 index fcf7f8619..000000000 --- a/sysutils/monit/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -PLUGIN_NAME= monit -PLUGIN_VERSION= 1.7 -PLUGIN_VERSION= 1 -PLUGIN_COMMENT= Proactive system monitoring -PLUGIN_MAINTAINER= frank.brendel@eurolog.com -PLUGIN_DEPENDS= monit - -.include "../../Mk/plugins.mk" diff --git a/sysutils/monit/pkg-descr b/sysutils/monit/pkg-descr deleted file mode 100644 index 742dea329..000000000 --- a/sysutils/monit/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Monit is a utility for managing and monitoring processes, -files, directories, devices and network services on a Unix system. -Monit conducts automatic maintenance and repair and can execute -meaningful causal actions in error situations. - -WWW: http://mmonit.com/monit/ diff --git a/sysutils/monit/src/etc/inc/plugins.inc.d/monit.inc b/sysutils/monit/src/etc/inc/plugins.inc.d/monit.inc deleted file mode 100644 index b8f1a5382..000000000 --- a/sysutils/monit/src/etc/inc/plugins.inc.d/monit.inc +++ /dev/null @@ -1,66 +0,0 @@ - gettext('Monit System Monitoring'), - 'configd' => array( - 'restart' => array('monit restart'), - 'start' => array('monit start'), - 'stop' => array('monit stop'), - ), - 'name' => 'monit', - ); - } - return $services; -} - -/** - * sync configuration via xmlrpc - * @return array - */ -function monit_xmlrpc_sync() -{ - $result = array(); - - $result[] = array( - 'description' => gettext('Monit System Monitoring'), - 'section' => 'OPNsense.monit', - 'id' => 'monit', - ); - - return $result; -} diff --git a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/ServiceController.php b/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/ServiceController.php deleted file mode 100644 index 0b1a73522..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/ServiceController.php +++ /dev/null @@ -1,79 +0,0 @@ -request->isPost()) { - $this->sessionClose(); - - $backend = new Backend(); - - $result['function'] = "configtest"; - $result['template'] = trim($backend->configdRun('template reload OPNsense/Monit')); - if ($result['template'] != 'OK') { - $result['result'] = "Template error: " . $result['template']; - return $result; - } - $result['result'] = trim($backend->configdRun('monit configtest')); - return $result; - } else { - return array('status' => 'failed'); - } - } - - /** - * avoid restarting Relayd on reconfigure - */ - protected function reconfigureForceRestart() - { - return 0; - } -} diff --git a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php b/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php deleted file mode 100644 index 51b0f7529..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php +++ /dev/null @@ -1,341 +0,0 @@ - "failed"); - if ($this->request->isGet() && $nodeType != null) { - $this->validateNodeType($nodeType); - $mdlMonit = new Monit(); - if ($nodeType == 'general') { - $node = $mdlMonit->getNodeByReference($nodeType); - } else { - if ($uuid != null) { - $node = $mdlMonit->getNodeByReference($nodeType . '.' . $uuid); - } else { - $node = $mdlMonit->$nodeType->Add(); - } - } - if ($node != null) { - $result['monit'] = array($nodeType => $node->getNodes()); - $result['result'] = 'ok'; - } - } - return $result; - } - - /** - * set monit properties - * @param $nodeType - * @param $uuid - * @return status array - */ - public function setAction($nodeType = null, $uuid = null) - { - $result = array("result" => "failed", "validations" => array()); - if ($this->request->isPost() && $this->request->hasPost("monit") && $nodeType != null) { - $this->validateNodeType($nodeType); - $mdlMonit = new Monit(); - if ($nodeType == 'general') { - $node = $mdlMonit->getNodeByReference($nodeType); - } else { - if ($uuid != null) { - $node = $mdlMonit->getNodeByReference($nodeType . '.' . $uuid); - } else { - $node = $mdlMonit->$nodeType->Add(); - } - } - if ($node != null) { - $monitInfo = $this->request->getPost("monit"); - - // perform plugin specific validations - if ($nodeType == 'service') { - switch ($monitInfo[$nodeType]['type']) { - case 'process': - if (empty($monitInfo[$nodeType]['pidfile']) && empty($monitInfo[$nodeType]['match'])) { - $result["validations"]['monit.service.pidfile'] = "Please set at least one of Pidfile or Match."; - $result["validations"]['monit.service.match'] = $result["validations"]['monit.service.pidfile']; - } - break; - case 'host': - if (empty($monitInfo[$nodeType]['address'])) { - $result["validations"]['monit.service.address'] = "Address is mandatory for 'Remote Host' checks."; - } - break; - case 'network': - if (empty($monitInfo[$nodeType]['address']) && empty($monitInfo[$nodeType]['interface'])) { - $result["validations"]['monit.service.address'] = "Please set at least one of Address or Interface."; - $result["validations"]['monit.service.interface'] = $result["validations"]['monit.service.address']; - } - break; - case 'system': - break; - default: - if (empty($monitInfo[$nodeType]['path'])) { - $result["validations"]['monit.service.path'] = "Path is mandatory."; - } - } - } - - $node->setNodes($monitInfo[$nodeType]); - $valMsgs = $mdlMonit->performValidation(); - foreach ($valMsgs as $field => $msg) { - $fieldnm = str_replace($node->__reference, "monit." . $nodeType, $msg->getField()); - $result["validations"][$fieldnm] = $msg->getMessage(); - } - if (empty($result["validations"])) { - unset($result["validations"]); - $result['result'] = 'ok'; - $mdlMonit->serializeToConfig(); - Config::getInstance()->save(); - if ($nodeType == 'general' && $monitInfo['general']['enabled'] == '0') { - $svcMonit = new ServiceController(); - $result = $svcMonit->stopAction(); - } - } - } - } - return $result; - } - - /** - * delete monit settings - * @param $nodeType - * @param $uuid - * @return status array - */ - public function delAction($nodeType = null, $uuid = null) - { - $result = array("result" => "failed"); - if ($nodeType != null) { - $this->validateNodeType($nodeType); - if ($uuid != null) { - $mdlMonit = new Monit(); - $node = $mdlMonit->getNodeByReference($nodeType . '.' . $uuid); - if ($node != null) { - if ($mdlMonit->$nodeType->del($uuid) == true) { - // delete relations - if ($nodeType == 'test') { - $nodeName = $mdlMonit->getNodeByReference($nodeType . '.' . $uuid . '.name'); - if ($nodeName != null) { - $nodeName = $nodeName->__toString(); - $this->deleteRelations('service', 'tests', $uuid, 'test', $nodeName, $mdlMonit); - } - } - $mdlMonit->serializeToConfig(); - Config::getInstance()->save(); - $result["result"] = "ok"; - } - } - } - } - return $result; - } - - /** - * toggle monit items (enable/disable) - * @param $nodeType - * @param $uuid - * @return result array - */ - public function toggleAction($nodeType = null, $uuid = null) - { - $result = array("result" => "failed"); - if ($this->request->isPost() && $nodeType != null) { - $mdlMonit = new Monit(); - if ($uuid != null) { - $node = $mdlMonit->getNodeByReference($nodeType . '.' . $uuid); - if ($node != null) { - if ($node->enabled->__toString() == "1") { - $node->enabled = "0"; - } else { - $node->enabled = "1"; - } - $mdlMonit->serializeToConfig(); - Config::getInstance()->save(); - $svcMonit = new ServiceController(); - $result= $svcMonit->reloadAction(); - } else { - $result['result'] = "not found"; - } - } else { - $result['result'] = "uuid not given"; - } - } - return $result; - } - - /** - * search monit settings - * @param $nodeType - * @return result array - */ - public function searchAction($nodeType = null) - { - $this->sessionClose(); - if ($this->request->isPost() && $nodeType != null) { - $this->validateNodeType($nodeType); - $mdlMonit = new Monit(); - $grid = new UIModelGrid($mdlMonit->$nodeType); - $fields = array(); - switch ($nodeType) { - case 'alert': - $fields = array("enabled", "recipient", "noton", "events", "description"); - break; - case 'service': - $fields = array("enabled", "name", "type", "description"); - break; - case 'test': - $fields = array("name", "condition", "action"); - break; - } - return $grid->fetchBindRequest($this->request, $fields); - } - } - - /** - * import system notification settings - * @return result array - */ - public function notificationAction() - { - $result = array("result" => "failed"); - if ($this->request->isPost()) { - $this->sessionClose(); - - $cfg = Config::getInstance(); - $cfgObj = $cfg->object(); - $mdlMonit = new Monit(); - $node = $mdlMonit->getNodeByReference('general'); - $generalSettings = array(); - - // inherit SMTP settings from System->Settings->Notifications - if (!empty($cfgObj->notifications->smtp->ipaddress)) { - $generalSettings['mailserver'] = $cfgObj->notifications->smtp->ipaddress; - } - if (!empty($cfgObj->notifications->smtp->port)) { - $generalSettings['port'] = $cfgObj->notifications->smtp->port; - } - $generalSettings['username'] = $cfgObj->notifications->smtp->username; - $generalSettings['password'] = $cfgObj->notifications->smtp->password; - if ((!empty($cfgObj->notifications->smtp->tls) && $cfgObj->notifications->smtp->tls == 1) || - (!empty($cfgObj->notifications->smtp->ssl) && $cfgObj->notifications->smtp->ssl == 1)) { - $generalSettings['ssl'] = 1; - } else { - $generalSettings['ssl'] = 0; - } - - // apply them - $node->setNodes($generalSettings); - $valMsgs = $mdlMonit->performValidation(); - foreach ($valMsgs as $field => $msg) { - $fieldnm = str_replace($node->__reference, "monit.general.", $msg->getField()); - $result["validations"][$fieldnm] = $msg->getMessage(); - } - if (empty($result["validations"])) { - unset($result["validations"]); - $result['result'] = 'ok'; - $mdlMonit->serializeToConfig(); - Config::getInstance()->save(); - } - } - return $result; - } - - /** - * validate nodeType - * @param $nodeType - * @throws \Exception - */ - private function validateNodeType($nodeType = null) - { - if (array_search($nodeType, $this->nodeTypes) === false) { - throw new \Exception('unknown nodeType: ' . $nodeType); - } - } - - /** - * delete relations - * @param $nodeType - * @param $uuid - * @param $relNodeType - * @param &$mdlMonit - * @throws \Exception - */ - private function deleteRelations($nodeType = null, $nodeField = null, $relUuid = null, $relNodeType = null, $relNodeName = null, &$mdlMonit = null) - { - $nodes = $mdlMonit->$nodeType->getNodes(); - // get nodes with relations - foreach ($nodes as $nodeUuid => $node) { - // get relation uuids - foreach ($node[$nodeField] as $fieldUuid => $field) { - // remove uuid from field - if ($fieldUuid == $relUuid) { - $refField = $nodeType . '.' . $nodeUuid . '.' . $nodeField; - $relNode = $mdlMonit->getNodeByReference($refField); - $nodeRels = str_replace($relUuid, '', $relNode->__toString()); - $nodeRels = str_replace(',,', ',', $nodeRels); - $nodeRels = rtrim($nodeRels, ','); - $nodeRels = ltrim($nodeRels, ','); - $mdlMonit->setNodeByReference($refField, $nodeRels); - if ($relNode->isEmptyAndRequired()) { - $nodeName = $mdlMonit->getNodeByReference($nodeType . '.' . $nodeUuid . '.name')->__toString(); - throw new \Exception("Cannot delete $relNodeType '$relNodeName' from $nodeType '$nodeName'"); - } - } - } - } - } -} diff --git a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/StatusController.php b/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/StatusController.php deleted file mode 100644 index 65646590a..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/StatusController.php +++ /dev/null @@ -1,144 +0,0 @@ - "failed"); - - $socketPath = "/var/run/monit.sock"; - - // map the requested html format from the status page to the Monit text format - $format = $format == 'html' ? 'text' : $format; - - // check monit httpd socket defined in monitrc by 'set httpd ...' - if (file_exists($socketPath) && filetype($socketPath) == "socket") { - // set curl options - $ch = curl_init("http://127.0.0.1/_status?format=" . $format); - curl_setopt($ch, CURLOPT_UNIX_SOCKET_PATH, $socketPath); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - - // get credentials if configured - $mdlMonit = new Monit(); - if ($mdlMonit->general->httpdUsername->__toString() != null && trim($mdlMonit->general->httpdUsername->__toString()) !== "" && - $mdlMonit->general->httpdPassword->__toString() != null && trim($mdlMonit->general->httpdPassword->__toString()) !== "") { - curl_setopt($ch, CURLOPT_USERPWD, $mdlMonit->general->httpdUsername->__toString() . ":" . $mdlMonit->general->httpdPassword->__toString()); - } - - // send request - if (!$response = curl_exec($ch)) { - $result['status'] = curl_error($ch); - return $result; - } - $HTTPCode = curl_getinfo($ch, CURLINFO_HTTP_CODE); - - if ($HTTPCode != 200) { - $result['status'] = 'Monit returns with code ' . $HTTPCode; - } else { - $result['result'] = "ok"; - - // format the response - if ($format == 'xml') { - $result['status'] = simplexml_load_string($response); - } elseif ($format === 'text') { - $result['status'] = '
' . $this->bashColorToCSS($response) . '
'; - } - } - } else { - $msg = " -Either the file " . $socketPath . " does not exists or it is not a unix socket. -Please check if the Monit service is running. - -If you have started Monit recently, wait for StartDelay seconds and refresh this page."; - if ($format == 'xml') { - $result['status'] = $msg; - } elseif ($format === 'text') { - $result['status'] = '
' . $msg . '
'; - } - } - return $result; - } - - /** - * convert bash color escape codes to CSS - * @param $string - * @return string - */ - private function bashColorToCSS($string) - { - $colors = [ - '/\x1b\[0;30m(.*?)\x1b\[0m/s' => '$1', - - '/\x1b\[0;30m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;31m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;32m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;33m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;34m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;35m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;36m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;37m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;39m(.*?)\x1b\[0m/s' => '$1', - - '/\x1b\[1;30m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[1;31m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[1;32m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[1;33m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[1;34m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[1;35m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[1;36m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[1;37m(.*?)\x1b\[0m/s' => '$1', - - '/\x1b\[0;90m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;91m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;92m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;93m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;94m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;95m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;96m(.*?)\x1b\[0m/s' => '$1', - '/\x1b\[0;97m(.*?)\x1b\[0m/s' => '$1' - ]; - return preg_replace(array_keys($colors), $colors, $string); - } -} diff --git a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/IndexController.php b/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/IndexController.php deleted file mode 100644 index 07493b51b..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/IndexController.php +++ /dev/null @@ -1,51 +0,0 @@ -view->formGeneralSettings = $this->getForm("general"); - $this->view->formDialogEditAlert = $this->getForm("alerts"); - $this->view->formDialogEditService = $this->getForm("services"); - $this->view->formDialogEditTest = $this->getForm("tests"); - $this->view->pick('OPNsense/Monit/index'); - } -} diff --git a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/StatusController.php b/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/StatusController.php deleted file mode 100644 index 963836f19..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/StatusController.php +++ /dev/null @@ -1,46 +0,0 @@ -view->pick('OPNsense/Monit/status'); - } -} diff --git a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/alerts.xml b/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/alerts.xml deleted file mode 100644 index 643de6d59..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/alerts.xml +++ /dev/null @@ -1,47 +0,0 @@ -
- - monit.alert.enabled - - checkbox - - - - monit.alert.recipient - - text - - - - - monit.alert.noton - - checkbox - - - - monit.alert.events - - select_multiple - 28 - - - - - monit.alert.format - - text - - Subject: $SERVICE on $HOST failed]]> - - - monit.alert.reminder - - text - - - - monit.alert.description - - text - -
diff --git a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/general.xml b/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/general.xml deleted file mode 100644 index 1f5e476f4..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/general.xml +++ /dev/null @@ -1,124 +0,0 @@ -
- - monit.general.enabled - - checkbox - - - - monit.general.interval - - text - - - - monit.general.startdelay - - text - - - - monit.general.mailserver - - select_multiple - true - - - - - monit.general.port - - text - - - - monit.general.username - - text - - - - monit.general.password - - password - - - - monit.general.ssl - - checkbox - - - - monit.general.logfile - - text - syslog or the path to a file.]]> - true - - - monit.general.statefile - - text - - true - - - monit.general.eventqueuePath - - text - - true - - - monit.general.eventqueueSlots - - text - - true - - - monit.general.httpdEnabled - - checkbox - - true - - - monit.general.httpdPort - - text - - true - - - monit.general.httpdAllow - - select_multiple - - true - See Monit Authentication]]> - true - user:password, @group... Finish with TAB. - - - monit.general.mmonitUrl - - text - https://user:pass@192.168.1.10:8443/collector
If you want to control Monit services from your M/Monit instance you have to configure the Monit Port too and add corresponding firewall rules as well.]]> - true - - - monit.general.mmonitTimeout - - text - true - - - monit.general.mmonitRegisterCredentials - - checkbox - - true - -
diff --git a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml b/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml deleted file mode 100644 index 434f09e68..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml +++ /dev/null @@ -1,74 +0,0 @@ -
- - monit.service.enabled - - checkbox - - - - monit.service.name - - text - - - - monit.service.type - - dropdown - - - - monit.service.pidfile - - text - - - - monit.service.match - - text - monit procmatch <PATTERN>]]> - - - monit.service.path - - text - - - - monit.service.address - - text - - - - monit.service.interface - - dropdown - - - - monit.service.start - - text - - - - monit.service.stop - - text - - - - monit.service.tests - - select_multiple - - - - - monit.service.description - - text - -
diff --git a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/tests.xml b/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/tests.xml deleted file mode 100644 index 5d96a0a21..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/tests.xml +++ /dev/null @@ -1,26 +0,0 @@ -
- - monit.test.name - - text - - - - monit.test.condition - - text - cpu is greater than 50%
failed host 127.0.0.1 port 22 protocol ssh
]]> - - - monit.test.action - - dropdown - alert or restart the service or execute a program.]]> - - - monit.test.path - - text - - -
diff --git a/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/ACL/ACL.xml b/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/ACL/ACL.xml deleted file mode 100644 index 72937387e..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/ACL/ACL.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - WebCfg - Services: Monit System Monitoring page - Allow access to the 'Services: Monit System Monitoring' page. - - ui/monit/* - api/monit/* - - - diff --git a/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/Menu/Menu.xml b/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/Menu/Menu.xml deleted file mode 100644 index 39a9defcd..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/Menu/Menu.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/Migrations/M1_0_0.php b/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/Migrations/M1_0_0.php deleted file mode 100644 index 8b0c1adac..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/Migrations/M1_0_0.php +++ /dev/null @@ -1,142 +0,0 @@ -object(); - $shellObj = new Shell(); - - srand(); - $model->general->httpdUsername = 'root'; - $model->general->httpdPassword = substr( - str_shuffle(str_repeat('0123456789AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz', 32)), - rand(0, 16), - rand(17, 32) - ); - - /* get number of cpus and calculate load average limits */ - $nCPU = array(); - $shellObj->exec('/sbin/sysctl -n kern.smp.cpus', false, $nCPU); - $LoadAvg1 = $nCPU[0] * 2; - $LoadAvg5 = $nCPU[0] + ($nCPU[0] / 2); - $LoadAvg15 = $nCPU[0]; - - /* inherit SMTP settings from System->Settings->Notifications */ - if (!empty($cfgObj->notifications->smtp->ipaddress)) { - $model->general->mailserver = $cfgObj->notifications->smtp->ipaddress; - } - if (!empty($cfgObj->notifications->smtp->port)) { - $model->general->port = $cfgObj->notifications->smtp->port; - } - if (!empty($cfgObj->notifications->smtp->username)) { - $model->general->username = $cfgObj->notifications->smtp->username; - } - if (!empty($cfgObj->notifications->smtp->password)) { - $model->general->password = $cfgObj->notifications->smtp->password; - } - if ((!empty($cfgObj->notifications->smtp->tls) && $cfgObj->notifications->smtp->tls == 1) || - (!empty($cfgObj->notifications->smtp->ssl) && $cfgObj->notifications->smtp->ssl == 1)) { - $model->general->ssl = 1; - } - - $alertSettings = array(); - if (!empty($cfgObj->notifications->smtp->notifyemailaddress)) { - $alertSettings['recipient'] = $cfgObj->notifications->smtp->notifyemailaddress; - } - if (!empty($cfgObj->notifications->smtp->fromaddress)) { - $alertSettings['format'] = 'from: ' . $cfgObj->notifications->smtp->fromaddress; - } - $alertNode = $model->alert->Add(); - $alertNode->setNodes($alertSettings); - - /* define some tests */ - $defaultTests = array( - array("name" => "Ping", "condition" => "failed ping", "action" => "alert"), - array("name" => "NetworkLink", "condition" => "failed link", "action" => "alert"), - array("name" => "NetworkSaturation", "condition" => "saturation is greater than 75%", "action" => "alert"), - array("name" => "MemoryUsage", "condition" => "memory usage is greater than 75%", "action" => "alert"), - array("name" => "CPUUsage", "condition" => "cpu usage is greater than 75%", "action" => "alert"), - array("name" => "LoadAvg1", "condition" => "loadavg (1min) is greater than $LoadAvg1", "action" => "alert"), - array("name" => "LoadAvg5", "condition" => "loadavg (5min) is greater than $LoadAvg5", "action" => "alert"), - array("name" => "LoadAvg15", "condition" => "loadavg (15min) is greater than $LoadAvg15", "action" => "alert"), - array("name" => "SpaceUsage", "condition" => "space usage is greater than 75%", "action" => "alert") - ); - - /* define system service */ - $systemService = array( - 'enabled' => 1, - 'name' => '$HOST', - 'type' => 'system', - 'tests' => '' - ); - - /* define root filesystem service */ - $rootFsService = array( - 'enabled' => 1, - 'name' => 'RootFs', - 'type' => 'filesystem', - 'path' => '/', - 'tests' => '' - ); - - foreach ($defaultTests as $defaultTest) { - $testNode = $model->test->add(); - $testNode->setNodes($defaultTest); - if ($defaultTest['name'] == 'MemoryUsage' || - $defaultTest['name'] == 'CPUUsage' || - $defaultTest['name'] == 'LoadAvg1' || - $defaultTest['name'] == 'LoadAvg5' ) { - $systemService['tests'] .= $testNode->getAttributes()['uuid'] . ','; - } - if ($defaultTest['name'] == 'SpaceUsage') { - $rootFsService['tests'] .= $testNode->getAttributes()['uuid'] . ','; - } - } - - /* remove last comma from tests csv */ - $systemService['tests'] = substr($systemService['tests'], 0, -1); - $rootFsService['tests'] = substr($rootFsService['tests'], 0, -1); - - /* add system service */ - $serviceNode = $model->service->add(); - $serviceNode->setNodes($systemService); - - /* add root filesystem service */ - $rootFsNode = $model->service->add(); - $rootFsNode->setNodes($rootFsService); - } -} diff --git a/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.php b/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.php deleted file mode 100644 index a386f7c00..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.php +++ /dev/null @@ -1,41 +0,0 @@ - - //OPNsense/monit - 1.0.3 - Monit settings - - - - 0 - Y - - - 120 - Y - 0 - 86400 - Polling Interval needs to be an integer value between 0 and 86400 - - - 120 - Y - 0 - 86400 - Start Delay needs to be an integer value between 0 and 86400 - - - 127.0.0.1 - Y - Y - /^([0-9a-zA-Z\.,_\-:]){0,1024}$/u - lower - Please specify a valid servername or IP address. - - - Y - 25 - 0 - 65535 - Port needs to be an integer value between 0 and 65535 - - - N - - - N - - - 0 - Y - - - N - syslog facility log_daemon - /^(\/[^\/ ]*)+\/?|syslog.*$/ - Should be a valid absolute path to the log file or the keyword "syslog". - - - N - /^(\/[^\/ ]*)+\/?$/ - Should be a valid absolute path to the state file. - - - N - /^(\/[^\/ ]*)+\/?$/ - Should be a valid absolute path to the eventqueue directory. - - - N - Eventqueue Slots must be a numeric value. - - - 0 - Y - - - - - 2812 - Y - 1 - 65535 - Local Monit Port needs to be an integer value between 0 and 65535 - - - N - Y - - - N - - - 5 - Y - 0 - 86400 - M/Monit Timeout needs to be an integer value between 0 and 86400 - - - 1 - Y - - - - - 0 - Y - - - root@localhost.local - Y - Please enter a valid email address. - - - Y - 0 - - - N - - Action done - Checksum failed - Download bytes exceeded - Upload bytes exceeded - Connection failed - Content failed - Data access error - Execution failed - Filesystem flags failed - GID failed - Ping failed - Monit instance changed - Invalid type - Does not exist - Download packets exceeded - Upload packets exceeded - Permission failed - PID failed - PPID failed - Resource limit matched - Saturation exceeded - Size failed - Speed failed - Status failed - Timeout - Timestamp failed - UID failed - Uptime failed - - - - N - /^.{1,255}$/u - Message format should be a string between 1 and 255 characters. - - - 10 - N - 0 - 86400 - Reminder needs to be an integer value between 0 and 86400 - - - N - /^.{1,255}$/u - Enter a description. - - - - - 0 - Y - - - Y - /^([0-9a-zA-Z\._\-\$]){1,255}$/u - Should be a string between 1 and 255 characters. Allowed characters are letters and numbers as well as underscore, minus, dot and the dollar sign. - - - Y - - Process - File - Fifo - Filesystem - Directory - Remote Host - System - Custom - Network - - - - N - /^(\/[^\/ ]*)+\/?$/ - Should be a valid absolute path to the PID file of the process. - - - N - - - N - /^(\/[^\/ ]*)+\/?.*$/ - Should be a valid absolute file or folder path. - -
- N - /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-4]|2[0-5][0-9]|[01]?[0-9][0-9]?)$/ - Address must be a valid IPv4 address -
- - N - N - - /^(?!0).*$/ - /^((?!dhcp).)*$/ - - - - N - /^(\/[^\/ ]*)+\/? .*$/ - Should be a valid absolute path to the executable with its arguments. - - - N - /^(\/[^\/ ]*)+\/? .*$/ - Should be a valid absolute path to the executable with its arguments. - - - - - - Related item not found - Y - N - - - - - Y - /^([0-9a-zA-Z\._\- ]){1,255}$/u - Should be a string between 1 and 255 characters. Allowed characters are letters and numbers as well as underscore, minus, dot and space. - - - Y - /^.{1,255}$/u - Should be a string between 1 and 255 characters. - - - Y - - Alert - Restart - Start - Stop - Execute - Unmonitor - - - - N - /^(\/[^\/ ]*)+\/?.*$/ - Should be a valid absolute file path. - - - - diff --git a/sysutils/monit/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt b/sysutils/monit/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt deleted file mode 100644 index e4fd2fada..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt +++ /dev/null @@ -1,369 +0,0 @@ -{# - -Copyright © 2017-2018 by EURO-LOG AG -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':formGeneralSettings,'id':'frm_GeneralSettings','apply_btn_id':'btn_ApplyGeneralSettings'])}} -
-
- - - - - - - - - - - - - - - - - - - - -
{{ lang._('Enabled') }}{{ lang._('Recipient') }}{{ lang._('Events') }}{{ lang._('Description') }}{{ lang._('ID') }}{{ lang._('Edit') }} | {{ lang._('Delete') }}
- - -
-
-
- - - - - - - - - - - - - - - - - -
{{ lang._('Enabled') }}{{ lang._('Name') }}{{ lang._('ID') }}{{ lang._('Edit') }} | {{ lang._('Delete') }}
- - -
-
-
- - - - - - - - - - - - - - - - - - -
{{ lang._('Name') }}{{ lang._('Condition') }}{{ lang._('Action') }}{{ lang._('ID') }}{{ lang._('Edit') }} | {{ lang._('Delete') }}
- - -
-
-
-
- - -
-
-
-
-{# include dialogs #} -{{ partial("layout_partials/base_dialog",['fields':formDialogEditAlert,'id':'DialogEditAlert','label':'Edit Alert  NOTE: For a detailed description see monit(1) section "ALERT MESSAGES".'])}} -{{ partial("layout_partials/base_dialog",['fields':formDialogEditService,'id':'DialogEditService','label':'Edit Service'])}} -{{ partial("layout_partials/base_dialog",['fields':formDialogEditTest,'id':'DialogEditTest','label':'Edit Test  NOTE: For a detailed description see monit(1) section "SERVICE TESTS".'])}} diff --git a/sysutils/monit/src/opnsense/mvc/app/views/OPNsense/Monit/status.volt b/sysutils/monit/src/opnsense/mvc/app/views/OPNsense/Monit/status.volt deleted file mode 100644 index e9c279c01..000000000 --- a/sysutils/monit/src/opnsense/mvc/app/views/OPNsense/Monit/status.volt +++ /dev/null @@ -1,45 +0,0 @@ -{# - -Copyright © 2017-2018 by EURO-LOG AG -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. - -#} - - -
-Loading... -
diff --git a/sysutils/monit/src/opnsense/scripts/OPNsense/Monit/setup.sh b/sysutils/monit/src/opnsense/scripts/OPNsense/Monit/setup.sh deleted file mode 100755 index cf200fd2e..000000000 --- a/sysutils/monit/src/opnsense/scripts/OPNsense/Monit/setup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# change permissions of the monit configuration file -chmod 600 /usr/local/etc/monitrc || exit 1 -exit 0 diff --git a/sysutils/monit/src/opnsense/service/conf/actions.d/actions_monit.conf b/sysutils/monit/src/opnsense/service/conf/actions.d/actions_monit.conf deleted file mode 100644 index 025e0185d..000000000 --- a/sysutils/monit/src/opnsense/service/conf/actions.d/actions_monit.conf +++ /dev/null @@ -1,29 +0,0 @@ -[start] -command:/usr/local/opnsense/scripts/OPNsense/Monit/setup.sh; /usr/local/etc/rc.d/monit start -type:script -message:starting monit - -[stop] -command:/usr/local/etc/rc.d/monit stop -type:script -message:stopping monit - -[status] -command:/usr/local/etc/rc.d/monit status; exit 0 -type:script_output -message:get monit status - -[restart] -command:/usr/local/opnsense/scripts/OPNsense/Monit/setup.sh; /usr/local/etc/rc.d/monit restart -type:script -message:restarting monit - -[reload] -command:/usr/local/opnsense/scripts/OPNsense/Monit/setup.sh; /usr/local/etc/rc.d/monit reload -type:script -message:reload monit configuration - -[configtest] -command:/usr/local/opnsense/scripts/OPNsense/Monit/setup.sh; /usr/local/bin/monit -t 2>&1 || exit 0 -type:script_output -message:testing monit configuration diff --git a/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/+TARGETS b/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/+TARGETS deleted file mode 100644 index d5be9309b..000000000 --- a/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/+TARGETS +++ /dev/null @@ -1,2 +0,0 @@ -monitrc:/usr/local/etc/monitrc -rc.conf.d:/etc/rc.conf.d/monit diff --git a/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/monitrc b/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/monitrc deleted file mode 100644 index 1fa8bc96e..000000000 --- a/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/monitrc +++ /dev/null @@ -1,133 +0,0 @@ -# DO NOT EDIT THIS FILE -- OPNsense auto-generated file - -{% from 'OPNsense/Macros/interface.macro' import physical_interface %} -{% if helpers.exists('OPNsense.monit.general') %} -{% if helpers.exists('OPNsense.monit.general.httpdEnabled') and OPNsense.monit.general.httpdEnabled|default('0') == '1' %} -{% set httpdCredentials = OPNsense.monit.general.httpdUsername ~ ':"' ~ OPNsense.monit.general.httpdPassword ~ '"' %} -{% set httpdport = "port " ~ OPNsense.monit.general.httpdPort %} -set httpd unixsocket /var/run/monit.sock {{ httpdport }} - allow localhost - allow {{ httpdCredentials }} -{% if helpers.exists('OPNsense.monit.general.httpdAllow') %} -{% for allow in OPNsense.monit.general.httpdAllow.split(",") %} -{% set cred = allow.split(":") %} -{% if cred[1] %} -{% set pass = cred[1].split() %} -{% set allow = cred[0] ~ ':"' ~ pass[0] ~ '" ' ~ pass[1] %} -{% endif %} - allow {{ allow }} -{% endfor %} -{% endif %} -{% if helpers.exists('OPNsense.monit.general.mmonitUrl') and OPNsense.monit.general.mmonitUrl|default('') != '' %} -{% set mregister = 'register without credentials' if OPNsense.monit.general.mmonitRegisterCredentials|default('1') == '0' %} - -set mmonit {{ OPNsense.monit.general.mmonitUrl }} timeout {{ OPNsense.monit.general.mmonitTimeout }} seconds {{ mregister }} -{% endif %} -{% else %} -set httpd unixsocket /var/run/monit.sock - allow localhost -{% endif %} - -set daemon {{ OPNsense.monit.general.interval }} with start delay {{ OPNsense.monit.general.startdelay }} - -{% if helpers.exists('OPNsense.monit.general.logfile') and OPNsense.monit.general.logfile|default('') != '' %} -set logfile {{ OPNsense.monit.general.logfile }} -{% else %} -set logfile syslog facility log_daemon -{% endif %} - -{% if helpers.exists('OPNsense.monit.general.statefile') and OPNsense.monit.general.statefile|default('') != '' %} -set statefile {{ OPNsense.monit.general.statefile }} -{% endif %} - -{% if helpers.exists('OPNsense.monit.general.eventqueuePath') and OPNsense.monit.general.eventqueuePath|default('') != '' %} -{% set slots = '' %} -{% if helpers.exists('OPNsense.monit.general.eventqueueSlots') %} -{% set slots = "slots " ~ OPNsense.monit.general.eventqueueSlots %} -{% endif %} - -set eventqueue basedir {{ OPNsense.monit.general.eventqueuePath }} {{ slots }} -{% endif %} - -{% if helpers.exists('OPNsense.monit.general.mailserver') %} -{% set port = "port " ~ OPNsense.monit.general.port if OPNsense.monit.general.port|default('') != '' %} -{% set username = '' %} -{% set password = '' %} -{% if helpers.exists('OPNsense.monit.general.username') and helpers.exists('OPNsense.monit.general.password') %} -{% set username = "username " ~ OPNsense.monit.general.username %} -{% set password = "password " ~ '"' ~ OPNsense.monit.general.password ~ '"' %} -{% endif %} -{% set ssl = 'using ssl' if OPNsense.monit.general.ssl|default('0') == '1' %} -set mailserver {{ OPNsense.monit.general.mailserver }} {{ port }} {{ username }} {{ password }} {{ ssl }} -{% endif %} - -{% if helpers.exists('OPNsense.monit.alert') %} -{% for alert in helpers.toList('OPNsense.monit.alert') %} -{% if alert.enabled|default('0') == '1' %} -{% set noton = 'not on' if alert.noton|default('0') == '1' %} -{% set mailformat = "mail-format { " ~ alert.format ~ " }" if alert.format|default('') != '' %} -{% set reminder = "reminder on " ~ alert.reminder ~ " cycles" if alert.reminder|default('0') != '0' %} -{% set events = "{ " ~ alert.events ~ " }" if alert.events|default('') != '' %} -set alert {{ alert.recipient }} {{ noton }} {{ events }} {{ mailformat }} {{ reminder }} -{% endif %} -{% endfor %} -{% endif %} - -{% if helpers.exists('OPNsense.monit.service') %} -{% for service in helpers.toList('OPNsense.monit.service') %} -{% if service.enabled|default('0') == '1' %} -{% set pidfile = '' %} -{% set match = '' %} -{% set path = '' %} -{% set address = '' %} -{% set interface = '' %} -{% if service.type == 'process' %} -{% if service.pidfile|default('') != '' %} -{% set pidfile = "pidfile " ~ service.pidfile %} -{% elif service.match|default('') != '' %} -{% set match = "matching " ~ service.match if service.match|default('') != '' %} -{% endif %} -check {{ service.type }} {{ service.name }} {{ pidfile }} {{ match }} -{% elif service.type == 'host' %} -{% set address = "address " ~ service.address %} -check {{ service.type }} {{ service.name }} {{ address }} -{% elif service.type == 'network' %} -{% if service.address|default('') != '' %} -{% set address = "address " ~ service.address %} -{% elif service.interface|default('') != '' %} -{% set interface = "interface " ~ physical_interface(service.interface) %} -{% endif %} -check {{ service.type }} {{ service.name }} {{ address }} {{ interface }} -{% elif service.type == 'system' %} -check {{ service.type }} {{ service.name }} -{% else %} -{% set path = "with path " ~ service.path %} -{% if service.type == 'custom' %} -check program {{ service.name }} {{ path }} -{% else %} -check {{ service.type }} {{ service.name }} {{ path }} -{% endif %} -{% endif %} -{% if service.start|default('') != '' %} - start program = "{{ service.start }}" -{% endif %} -{% if service.start|default('') != '' %} - stop program = "{{ service.stop }}" -{% endif %} -{% if service.tests is defined %} -{% for test in service.tests.split(",") %} -{% set test = helpers.getUUID(test) %} -{% if test.condition is defined and test.action is defined %} -{% set epath = '' %} -{% if test.action == 'exec' and test.path|default('') != '' %} -{% set epath = test.path %} -{% endif %} - if {{ test.condition }} then {{ test.action }} {{ epath }} -{% endif %} -{% endfor %} -{% endif %} -{% endif %} - -{% endfor %} -{% endif %} -{% endif %} diff --git a/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/rc.conf.d b/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/rc.conf.d deleted file mode 100644 index d19dee084..000000000 --- a/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/rc.conf.d +++ /dev/null @@ -1,7 +0,0 @@ -# DO NOT EDIT THIS FILE -- OPNsense auto-generated file -{% if helpers.exists('OPNsense.monit.general.enabled') and OPNsense.monit.general.enabled|default("0") == "1" %} -monit_var_script="/usr/local/opnsense/scripts/OPNsense/Monit/setup.sh" -monit_enable="YES" -{% else %} -monit_enable="NO" -{% endif %}