tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-09-17 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/Core.pm: Added support for inverse intervals when calculating
	  the status of a module.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6978 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2012-09-17 15:05:48 +00:00
parent 67d6c4b894
commit 85f1fe1b08
2 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2012-09-17 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added support for inverse intervals when calculating
the status of a module.
2012-09-17 Vanessa Gil <vanessa.gil@artica.es> 2012-09-17 Vanessa Gil <vanessa.gil@artica.es>
* lib/PandoraFMS/ReconServer.pm: Added new fields * lib/PandoraFMS/ReconServer.pm: Added new fields

41
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -2740,22 +2740,47 @@ sub get_module_status ($$$) {
# Critical # Critical
if ($critical_min ne $critical_max) { if ($critical_min ne $critical_max) {
return 1 if ($data >= $critical_min && $data < $critical_max); # [critical_min, critical_max]
return 1 if ($data >= $critical_min && $critical_max < $critical_min); if ($module->{'critical_inverse'} == 0) {
return 1 if ($data >= $critical_min && $data < $critical_max);
return 1 if ($data >= $critical_min && $critical_max < $critical_min);
}
# (-inf, critical_min), (critical_max, +inf)
else {
return 1 if ($data < $critical_min || $data > $critical_max);
}
} }
# Warning # Warning
if ($warning_min ne $warning_max) { if ($warning_min ne $warning_max) {
return 2 if ($data >= $warning_min && $data < $warning_max); # [warning_min, warning_max]
return 2 if ($data >= $warning_min && $warning_max < $warning_min); if ($module->{'warning_inverse'} == 0) {
return 2 if ($data >= $warning_min && $data < $warning_max);
return 2 if ($data >= $warning_min && $warning_max < $warning_min);
}
# (-inf, warning_min), (warning_max, +inf)
else {
return 2 if ($data < $warning_min || $data > $warning_max);
}
} }
} }
# String
else {
# Critical # Critical
return 1 if ($critical_str ne '' && $data =~ /$critical_str/); if ($module->{'critical_inverse'} == 0) {
return 1 if ($critical_str ne '' && $data =~ /$critical_str/);
} else {
return 1 if ($critical_str ne '' && $data !~ /$critical_str/);
}
# Warning # Warning
return 2 if ($warning_str ne '' && $data =~ /$warning_str/); if ($module->{'warning_inverse'} == 0) {
return 2 if ($warning_str ne '' && $data =~ /$warning_str/);
} else {
return 2 if ($warning_str ne '' && $data !~ /$warning_str/);
}
}
# Normal # Normal
return 0; return 0;