upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysutils/monit: merge 1.3 from master

Browse source
This commit is contained in:
Franco Fichtner 2017-07-03 06:04:12 +02:00
parent f61cb01fef
commit eface964fb
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/monit/Makefile
View file

@ -1,5 +1,5 @@
PLUGIN_NAME= monit
PLUGIN_VERSION= 1.1
PLUGIN_VERSION= 1.3
PLUGIN_COMMENT= Proactive system monitoring
PLUGIN_MAINTAINER= frank.brendel@eurolog.com
PLUGIN_DEPENDS= monit

4
sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/general.xml
View file

@ -20,7 +20,9 @@
<field>
<id>monit.general.mailserver</id>
<label>Mail Server</label>
<type>text</type>
<type>select_multiple</type>
<allownew>true</allownew>
<style>tokenize</style>
<help><![CDATA[Comma separated list of SMTP servers for alert delivery.]]></help>
</field>
<field>

9
sysutils/monit/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml
View file

@ -22,10 +22,11 @@
<MaximumValue>86400</MaximumValue>
<ValidationMessage>Start Delay needs to be an integer value between 0 and 86400</ValidationMessage>
</startdelay>
<mailserver type="TextField">
<mailserver type="CSVListField">
<default>127.0.0.1</default>
<Required>Y</Required>
<mask>/^(?:(?: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]?)$/</mask>
<multiple>Y</multiple>
<mask>/^((?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9]),?)+$/</mask>
<ValidationMessage>Mail Server must be a valid IPv4 address</ValidationMessage>
</mailserver>
<port type="IntegerField">
@ -118,8 +119,8 @@
</enabled>
<name type="TextField">
<Required>Y</Required>
<mask>/^([0-9a-zA-Z\._\-]){1,255}$/u</mask>
<ValidationMessage>Should be a string between 1 and 255 characters. Allowed characters are letters and numbers as well as underscore, minus and dot.</ValidationMessage>
<mask>/^([0-9a-zA-Z\._\-\$]){1,255}$/u</mask>
<ValidationMessage>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.</ValidationMessage>
</name>
<type type="OptionField">
<Required>Y</Required>

6
sysutils/monit/src/opnsense/scripts/OPNsense/Monit/post-install.php
View file

@ -54,10 +54,6 @@ $LoadAvg1 = $nCPU[0] * 2;
$LoadAvg5 = $nCPU[0] + ($nCPU[0] / 2);
$LoadAvg15 = $nCPU[0];
// get FQDN
$hostName = $cfgObj->system->hostname;
$domainName = $cfgObj->system->domain;
// inherit SMTP settings from System->Settings->Notifications
$generalSettings = array();
if (!empty($cfgObj->notifications->smtp->ipaddress)) {
@ -101,7 +97,7 @@ $defaultTests = array(
// define system service
$systemService = array(
"enabled" => 1,
"name" => $hostName . "." . $domainName,
"name" => '$HOST',
"type" => "system",
"tests" => ""
);