From 0727cd19b4dc6ea6c1eae32f5f48c6c8be46979d Mon Sep 17 00:00:00 2001 From: ramonn Date: Wed, 21 Oct 2009 10:01:34 +0000 Subject: [PATCH] 2009-10-21 Ramon Novoa * lib/PandoraFMS/Core.pm: Fixed max_min alerts. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2044 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 4 ++++ pandora_server/lib/PandoraFMS/Core.pm | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 7361eb0fdf..4aa0b11f20 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,7 @@ +2009-10-21 Ramon Novoa + + * lib/PandoraFMS/Core.pm: Fixed max_min alerts. + 2009-10-21 Sancho Lerena First bug detected & fixed after RC1, whoah :/ diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 6bb1c3d22b..3511b0111c 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -156,8 +156,8 @@ sub pandora_evaluate_alert ($$$$$$) { return $status if ($alert->{'type'} eq "max" && $data <= $alert->{'max_value'}); if ($alert->{'type'} eq "max_min") { - if ($alert->{'matches_value'} != 1) { - return $status if ($data <= $alert->{'min_value'} && + if ($alert->{'matches_value'} == 1) { + return $status if ($data <= $alert->{'min_value'} || $data >= $alert->{'max_value'}); } else { return $status if ($data >= $alert->{'min_value'} &&