From 94d081176d1fa26468c2999074f4f671b37bfcfb Mon Sep 17 00:00:00 2001 From: slerena Date: Tue, 22 May 2012 10:00:21 +0000 Subject: [PATCH] 2012-05-22 Sancho Lerena * include/functions_ui.php: Added definition for module unknown. * operation/agentes/status_monitor.php: unknown modules are always drawn in grey. Fixed inconsistent behaviour. * images/status_sets/color_text/module_unknown.png: Missing image. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6333 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 10 ++++++++++ .../status_sets/color_text/module_unknown.png | Bin 0 -> 422 bytes pandora_console/include/functions_ui.php | 1 + .../operation/agentes/status_monitor.php | 6 +++--- 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100755 pandora_console/images/status_sets/color_text/module_unknown.png diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 3b0d5f3a76..d9ac5b713b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2012-05-22 Sancho Lerena + + * include/functions_ui.php: Added definition for module unknown. + + * operation/agentes/status_monitor.php: unknown modules are always + drawn in grey. Fixed inconsistent behaviour. + + * images/status_sets/color_text/module_unknown.png: Missing image. + + 2012-05-22 Junichi Satoh * operation/messages/message_edit.php, diff --git a/pandora_console/images/status_sets/color_text/module_unknown.png b/pandora_console/images/status_sets/color_text/module_unknown.png new file mode 100755 index 0000000000000000000000000000000000000000..03e06e3283bc5dfea121ec8ff7b4eeb26c9bc7bb GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<>!3HEX<>xE|QjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sf9ab?;eG`qtY!iS&vL&t&CC>S| zxv6<249-QVi6yBi3gww4844j8sS56%z5(x3RP%re|9ZMOhIkxLzO%Lbc72;8&kPAR zONr74E0`rEBqZ+4*}Gv=;-9OluRWTQoRE;PqxLnQb4rEI;a#TEY-%jm*F+uv@c20Y znxf_Ya}!srT9J6-+{pwEE>4A;IbvBB0j{Al6E7drjd(gs`nJTa-BA)-wrt7nv`Nu{7NVH@`AoTvBMve)g}7mtq(3( zzP?*AKPTzPf#b*9L-W)9r4MgRJ}xPy7vW>g?&i{Jye4{gW8&RgygY&v6D2)p>WG8X^{8aWj&%97?K`&glzdK4h&HS22WQ% Jmvv4FO#qAeqdout literal 0 HcmV?d00001 diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index db80ad36e8..5dc8d9bede 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1580,6 +1580,7 @@ define ('STATUS_MODULE_OK', 'module_ok.png'); define ('STATUS_MODULE_CRITICAL', 'module_critical.png'); define ('STATUS_MODULE_WARNING', 'module_warning.png'); define ('STATUS_MODULE_NO_DATA', 'module_no_data.png'); +define ('STATUS_MODULE_UNKNOWN', 'module_unknown.png'); define ('STATUS_AGENT_CRITICAL', 'agent_critical.png'); define ('STATUS_AGENT_WARNING', 'agent_warning.png'); diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index c7fb1d7f40..ba15557066 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -601,13 +601,13 @@ foreach ($result as $row) { $last_status = modules_get_agentmodule_last_status($row['id_agente_modulo']); switch($last_status) { case 0: - $data[5] = ui_print_status_image(STATUS_MODULE_OK, __('UNKNOWN')." - ".__('Last status')." ".__('NORMAL').": ".$row["datos"], true); + $data[5] = ui_print_status_image(STATUS_MODULE_UNKNOWN, __('UNKNOWN')." - ".__('Last status')." ".__('NORMAL').": ".$row["datos"], true); break; case 1: - $data[5] = ui_print_status_image(STATUS_MODULE_CRITICAL, __('UNKNOWN')." - ".__('Last status')." ".__('CRITICAL').": ".$row["datos"], true); + $data[5] = ui_print_status_image(STATUS_MODULE_UNKNOWN, __('UNKNOWN')." - ".__('Last status')." ".__('CRITICAL').": ".$row["datos"], true); break; case 2: - $data[5] = ui_print_status_image(STATUS_MODULE_WARNING, __('UNKNOWN')." - ".__('Last status')." ".__('WARNING').": ".$row["datos"], true); + $data[5] = ui_print_status_image(STATUS_MODULE_UNKNOWN, __('UNKNOWN')." - ".__('Last status')." ".__('WARNING').": ".$row["datos"], true); break; } }