nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 08:02:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Honour 'Disable all alerting for this host'

Browse Source 
Fixes some redundancy in macros (parentesis)
This commit is contained in:
f0o
2015-05-18 10:23:55 +00:00
parent b8b9ef7abe
commit 4c10cb625b
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/alerts.inc.php
+1 -1
View File
@@ -162,7 +162,7 @@ function RunMacros($rule,$x=1) {
krsort($config['alert']['macros']['rule']);
foreach( $config['alert']['macros']['rule'] as $macro=>$value ) {
if( !strstr($macro," ") ) {
$rule = str_replace('%macros.'.$macro,$value,$rule);
$rule = str_replace('%macros.'.$macro,'('.$value.')',$rule);
}
}
if( strstr($rule,"%macros") ) {
includes/defaults.inc.php
+6 -6
View File
@@ -215,14 +215,14 @@ $config['alert'] = array(
'past_60m' => 'DATE_SUB(NOW(),INTERVAL 60 MINUTE)',
//Device Macros
'device' => '(%devices.disabled = "0" && %devices.ignore = "0")',
'device_up' => '(%devices.status = "1" && %macros.device)',
'device_down' => '(%devices.status = "0" && %macros.device)',
'device' => '%devices.disabled = "0" && %devices.ignore = "0"',
'device_up' => '%devices.status = "1" && %macros.device',
'device_down' => '%devices.status = "0" && %macros.device',
//Port Macros
'port' => '(%ports.deleted = "0" && %ports.ignore = "0" && %ports.disabled = "0")',
'port_up' => '(%ports.ifOperStatus = "up" && %ports.ifAdminStatus = "up" && %macros.port)',
'port_down' => '(%ports.ifOperStatus = "down" && %ports.ifAdminStatus != "down" && %macros.port)',
'port' => '%ports.deleted = "0" && %ports.ignore = "0" && %ports.disabled = "0"',
'port_up' => '%ports.ifOperStatus = "up" && %ports.ifAdminStatus = "up" && %macros.port',
'port_down' => '%ports.ifOperStatus = "down" && %ports.ifAdminStatus != "down" && %macros.port',
'port_usage_perc' => '((%ports.ifInOctets_rate*8)/%ports.ifSpeed)*100',
//Misc Macros