From df9a28b49f12e7bd7a676498e96e17ade49559af Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 20 Jul 2009 08:36:55 +0000 Subject: [PATCH] 2009-07-20 Miguel de Dios * include/functions_reporting.php: fix bug the any number of modules in unknown status for any agent paint with its colour in the list of agents. Now for the agent has a box colour with color for unknown, it must has all modules in unknown status. Fixes: 2805029 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1811 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/include/functions_reporting.php | 13 ++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 69d869352a..77ce6757eb 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2009-07-20 Miguel de Dios + + * include/functions_reporting.php: fix bug the any number of modules in + unknown status for any agent paint with its colour in the list of + agents. Now for the agent has a box colour with color for unknown, it must + has all modules in unknown status. + Fixes: 2805029 + 2009-07-17 Miguel de Dios * operation/agentes/status_monitor.php: fix bug default group in form. diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 2869196648..2f22dcd061 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -806,16 +806,15 @@ function get_agent_module_info ($id_agent) { $return["monitor_normal"]++; } } - - //No modules is by default + if ($return["modules"] > 0) { - if ($return["monitor_critical"] > 0) { + if ($return["modules"] == $return["monitor_down"]) + $return["status_img"] = print_status_image (STATUS_AGENT_DOWN, __('At least one module is in UKNOWN status'), true); + else if ($return["monitor_critical"] > 0) $return["status_img"] = print_status_image (STATUS_AGENT_CRITICAL, __('At least one module in CRITICAL status'), true); - } elseif ($return["monitor_warning"] > 0) { + else if ($return["monitor_warning"] > 0) $return["status_img"] = print_status_image (STATUS_AGENT_WARNING, __('At least one module in WARNING status'), true); - } elseif ($return["monitor_down"] > 0) { - $return["status_img"] = print_status_image (STATUS_AGENT_DOWN, __('At least one module is in UKNOWN status'), true); - } else { + else $return["status_img"] = print_status_image (STATUS_AGENT_OK, __('All Monitors OK'), true); } }