From 8f9ed10f16ac710ee9e2e7de5a5771595ba971de Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 3 Mar 2011 10:28:43 +0000 Subject: [PATCH] 2011-03-03 Miguel de Dios * include/functions_reporting.php: refixed the status when the agent have any module critical and any alert fired. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4054 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 ++++ .../include/functions_reporting.php | 27 ++++++++++--------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index cf3a971046..d5562077f2 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2011-03-03 Miguel de Dios + + * include/functions_reporting.php: refixed the status when the agent have + any module critical and any alert fired. + 2011-03-02 Raul Mateos * include/functions*.php: Updated year in files changed this year. Also diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 3d73603492..cc5c9df170 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -1549,24 +1549,26 @@ function get_agent_module_info ($id_agent, $filter = false) { foreach ($modules as $key => $module) { $return["modules"]++; + $alert_status = get_agentmodule_status($key, false); $module_status = get_agentmodule_status($key, true); switch ($module_status) { case 0: - $return["monitor_normal"]++; - break; + $return["monitor_normal"]++; + break; case 1: - $return["monitor_critical"]++; - break; + $return["monitor_critical"]++; + break; case 2: - $return["monitor_warning"]++; - break; + $return["monitor_warning"]++; + break; case 3: - $return["monitor_unknown"]++; - break; - case 4: - $return["monitor_alertsfired"]++; - break; + $return["monitor_unknown"]++; + break; + } + + if ($alert_status == 4) { + $return["monitor_alertsfired"]++; } } @@ -1595,7 +1597,8 @@ function get_agent_module_info ($id_agent, $filter = false) { $return["alert_status"] = "fired"; $return["alert_img"] = print_status_image (STATUS_ALERT_FIRED, __('Alert fired'), true); $return["alert_value"] = STATUS_ALERT_FIRED; - } elseif (give_disabled_group ($return["agent_group"])) { + } + elseif (give_disabled_group ($return["agent_group"])) { $return["alert_status"] = "disabled"; $return["alert_value"] = STATUS_ALERT_DISABLED; $return["alert_img"] = print_status_image (STATUS_ALERT_DISABLED, __('Alert disabled'), true);