diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index c607d7c020..0ce24f2f1c 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,97 @@ +2013-05-20 Sergio Martin + + * include/styles/pandora.css + include/functions_groups.php + include/functions_graph.php + include/functions_reporting.php + operation/search_results.php + operation/agentes/estado_generalagente.php + operation/agentes/ver_agente.php + operation/agentes/group_view.php + operation/servers/recon_view.php + images/min.png + images/max.png + images/agent.png + images/cross_undo.png + images/policies_brick.png + images/agent_warning.png + images/rosette.png + images/darrowright.png + images/god5.png + images/module_critical.png + images/filter.png + images/help.png + images/darrowup.png + images/wrench_orange.png + images/chart_curve.png + images/control_stop_col.png + images/history_database.png + images/zoom_cross.png + images/agent_critical.png + images/god6.png + images/policies_cog.png + images/heart.png + images/percentile_item.png + images/module_warning.png + images/policies_error.png + images/agent_ok.png + images/os_icons/network_small.png + images/os_icons/network.png + images/god7.png + images/heart_col.png + images/clock2.png + images/div.png + images/policies_error_db.png + images/agent_notinit.png + images/application_not_writable.png + images/delete.png + images/god8.png + images/module.png + images/applications.png + images/cross.png + images/camera.png + images/sub.png + images/tag_red.png + images/module_notinit.png + images/god1.png + images/god9.png + images/version.png + images/chart_curve_threshold.png + images/mul.png + images/god2.png + images/policies_not_brick.png + images/control_pause_col.png + images/history.png + images/pdf.png + images/god3.png + images/chart_bar.png + images/module_ok.png + images/status_sets/faces/module_alertsfired_ball.png + images/status_sets/faces/agent_alertsfired.png + images/status_sets/faces/agent_alertsfired_ball.png + images/status_sets/color_text/module_alertsfired_ball.png + images/status_sets/color_text/agent_alertsfired.png + images/status_sets/color_text/agent_agentsfired_ball.png + images/status_sets/default/module_alertsfired_ball.png + images/status_sets/default/agent_alertsfired.png + images/status_sets/default/agent_alertsfired_ball.png + images/error_red.png + images/wrench.png + images/control_play_col.png + images/sum.png + images/avg.png + images/info.png + images/god4.png + images/module_unknown.png + images/darrowleft.png + images/plus.png + images/information.png + images/darrowdown.png + images/chart_curve_overview.png + godmode/agentes/configurar_agente.php + godmode/servers/plugin.php: Improved visual graphics + included agent layout, icons and group view + 2013-05-20 Miguel de Dios * include/ajax/skins.ajax.php, include/functions_gis.php, diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 1b2dc1ea7e..7e39ed4df1 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -449,8 +449,7 @@ if ($id_agente) { break; } - ui_print_page_header (__('Agent configuration') . ' - ' . - agents_get_name ($id_agente) . + ui_print_page_header (agents_get_name ($id_agente) . ' ' . $tab_description, "images/setup.png", false, $help_header , true, $onheader); } else { diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php index d5204af4da..91dd2848c8 100644 --- a/pandora_console/godmode/servers/plugin.php +++ b/pandora_console/godmode/servers/plugin.php @@ -517,7 +517,7 @@ $(document).ready(function() { update_preview(); - $('.command_component').live( 'keyup', function() { + $('.command_component').keyup(function() { update_preview(); }); diff --git a/pandora_console/images/agent.png b/pandora_console/images/agent.png index d9af1a944f..28758e17c3 100755 Binary files a/pandora_console/images/agent.png and b/pandora_console/images/agent.png differ diff --git a/pandora_console/images/agent_critical.png b/pandora_console/images/agent_critical.png index 7563ac89ea..096c8f4e77 100755 Binary files a/pandora_console/images/agent_critical.png and b/pandora_console/images/agent_critical.png differ diff --git a/pandora_console/images/agent_notinit.png b/pandora_console/images/agent_notinit.png index ac0150c49b..d548ac966d 100755 Binary files a/pandora_console/images/agent_notinit.png and b/pandora_console/images/agent_notinit.png differ diff --git a/pandora_console/images/agent_ok.png b/pandora_console/images/agent_ok.png index 2959a79eb5..796a1fe171 100755 Binary files a/pandora_console/images/agent_ok.png and b/pandora_console/images/agent_ok.png differ diff --git a/pandora_console/images/agent_warning.png b/pandora_console/images/agent_warning.png index 47d4a95e34..0c92600ac2 100755 Binary files a/pandora_console/images/agent_warning.png and b/pandora_console/images/agent_warning.png differ diff --git a/pandora_console/images/application_not_writable.png b/pandora_console/images/application_not_writable.png index ea4e4fe577..61737f2f2a 100644 Binary files a/pandora_console/images/application_not_writable.png and b/pandora_console/images/application_not_writable.png differ diff --git a/pandora_console/images/applications.png b/pandora_console/images/applications.png new file mode 100644 index 0000000000..0859571a78 Binary files /dev/null and b/pandora_console/images/applications.png differ diff --git a/pandora_console/images/avg.png b/pandora_console/images/avg.png index 51c37603c2..c0d3b907eb 100644 Binary files a/pandora_console/images/avg.png and b/pandora_console/images/avg.png differ diff --git a/pandora_console/images/camera.png b/pandora_console/images/camera.png index d131ea3bdc..5cc2c1faaf 100644 Binary files a/pandora_console/images/camera.png and b/pandora_console/images/camera.png differ diff --git a/pandora_console/images/chart_bar.png b/pandora_console/images/chart_bar.png index c3122ffd5b..1bea72456d 100644 Binary files a/pandora_console/images/chart_bar.png and b/pandora_console/images/chart_bar.png differ diff --git a/pandora_console/images/chart_curve.png b/pandora_console/images/chart_curve.png index 7098b604a8..1eb684b745 100644 Binary files a/pandora_console/images/chart_curve.png and b/pandora_console/images/chart_curve.png differ diff --git a/pandora_console/images/chart_curve_overview.png b/pandora_console/images/chart_curve_overview.png index 51f46a656e..477e34f252 100644 Binary files a/pandora_console/images/chart_curve_overview.png and b/pandora_console/images/chart_curve_overview.png differ diff --git a/pandora_console/images/chart_curve_threshold.png b/pandora_console/images/chart_curve_threshold.png index 2ce4ff2594..b018dc6b6a 100644 Binary files a/pandora_console/images/chart_curve_threshold.png and b/pandora_console/images/chart_curve_threshold.png differ diff --git a/pandora_console/images/clock2.png b/pandora_console/images/clock2.png index 9fa87ae00a..bb410c8a53 100644 Binary files a/pandora_console/images/clock2.png and b/pandora_console/images/clock2.png differ diff --git a/pandora_console/images/control_pause_col.png b/pandora_console/images/control_pause_col.png index 804eb98459..e8ac61e82e 100644 Binary files a/pandora_console/images/control_pause_col.png and b/pandora_console/images/control_pause_col.png differ diff --git a/pandora_console/images/control_play_col.png b/pandora_console/images/control_play_col.png index ed7f64238b..d4c528c2ba 100644 Binary files a/pandora_console/images/control_play_col.png and b/pandora_console/images/control_play_col.png differ diff --git a/pandora_console/images/control_stop_col.png b/pandora_console/images/control_stop_col.png index 0872bf721f..d540561c45 100644 Binary files a/pandora_console/images/control_stop_col.png and b/pandora_console/images/control_stop_col.png differ diff --git a/pandora_console/images/cross.png b/pandora_console/images/cross.png index 2475349be1..5164b3c02d 100644 Binary files a/pandora_console/images/cross.png and b/pandora_console/images/cross.png differ diff --git a/pandora_console/images/cross_undo.png b/pandora_console/images/cross_undo.png index e6512f4768..24e0dd0a1d 100644 Binary files a/pandora_console/images/cross_undo.png and b/pandora_console/images/cross_undo.png differ diff --git a/pandora_console/images/darrowdown.png b/pandora_console/images/darrowdown.png index cc90c75dec..f5f2d5a461 100644 Binary files a/pandora_console/images/darrowdown.png and b/pandora_console/images/darrowdown.png differ diff --git a/pandora_console/images/darrowleft.png b/pandora_console/images/darrowleft.png index 6f478cb85e..fc9d1fadb1 100644 Binary files a/pandora_console/images/darrowleft.png and b/pandora_console/images/darrowleft.png differ diff --git a/pandora_console/images/darrowright.png b/pandora_console/images/darrowright.png index f0fd7f78e4..fa2db6935c 100644 Binary files a/pandora_console/images/darrowright.png and b/pandora_console/images/darrowright.png differ diff --git a/pandora_console/images/darrowup.png b/pandora_console/images/darrowup.png index 6665254666..c8b1198d09 100644 Binary files a/pandora_console/images/darrowup.png and b/pandora_console/images/darrowup.png differ diff --git a/pandora_console/images/delete.png b/pandora_console/images/delete.png index 3eb5aec35d..9f5638dc05 100644 Binary files a/pandora_console/images/delete.png and b/pandora_console/images/delete.png differ diff --git a/pandora_console/images/div.png b/pandora_console/images/div.png index 92586d30bd..8b521f40a2 100644 Binary files a/pandora_console/images/div.png and b/pandora_console/images/div.png differ diff --git a/pandora_console/images/error_red.png b/pandora_console/images/error_red.png new file mode 100644 index 0000000000..7e5e138d26 Binary files /dev/null and b/pandora_console/images/error_red.png differ diff --git a/pandora_console/images/filter.png b/pandora_console/images/filter.png index ba11f531b8..5f85304b13 100644 Binary files a/pandora_console/images/filter.png and b/pandora_console/images/filter.png differ diff --git a/pandora_console/images/god1.png b/pandora_console/images/god1.png deleted file mode 100644 index 6a71a8ae3f..0000000000 Binary files a/pandora_console/images/god1.png and /dev/null differ diff --git a/pandora_console/images/god2.png b/pandora_console/images/god2.png deleted file mode 100644 index aa8752cd08..0000000000 Binary files a/pandora_console/images/god2.png and /dev/null differ diff --git a/pandora_console/images/god3.png b/pandora_console/images/god3.png deleted file mode 100644 index 9b3cdbe875..0000000000 Binary files a/pandora_console/images/god3.png and /dev/null differ diff --git a/pandora_console/images/god4.png b/pandora_console/images/god4.png deleted file mode 100644 index eb849b3c4d..0000000000 Binary files a/pandora_console/images/god4.png and /dev/null differ diff --git a/pandora_console/images/god5.png b/pandora_console/images/god5.png deleted file mode 100644 index b65a459540..0000000000 Binary files a/pandora_console/images/god5.png and /dev/null differ diff --git a/pandora_console/images/god6.png b/pandora_console/images/god6.png deleted file mode 100644 index e2d81eecfe..0000000000 Binary files a/pandora_console/images/god6.png and /dev/null differ diff --git a/pandora_console/images/god7.png b/pandora_console/images/god7.png deleted file mode 100644 index 3f02301aa6..0000000000 Binary files a/pandora_console/images/god7.png and /dev/null differ diff --git a/pandora_console/images/god8.png b/pandora_console/images/god8.png deleted file mode 100644 index 202c13c7f6..0000000000 Binary files a/pandora_console/images/god8.png and /dev/null differ diff --git a/pandora_console/images/god9.png b/pandora_console/images/god9.png deleted file mode 100755 index e5f113c5f8..0000000000 Binary files a/pandora_console/images/god9.png and /dev/null differ diff --git a/pandora_console/images/heart.png b/pandora_console/images/heart.png index f7249d8705..00b2578f3c 100644 Binary files a/pandora_console/images/heart.png and b/pandora_console/images/heart.png differ diff --git a/pandora_console/images/heart_col.png b/pandora_console/images/heart_col.png index 3687b42a2e..00b2578f3c 100644 Binary files a/pandora_console/images/heart_col.png and b/pandora_console/images/heart_col.png differ diff --git a/pandora_console/images/help.png b/pandora_console/images/help.png index 1d08b3dfbe..1d5fe71cf8 100644 Binary files a/pandora_console/images/help.png and b/pandora_console/images/help.png differ diff --git a/pandora_console/images/history.png b/pandora_console/images/history.png new file mode 100644 index 0000000000..cc5c867d2c Binary files /dev/null and b/pandora_console/images/history.png differ diff --git a/pandora_console/images/history_database.png b/pandora_console/images/history_database.png new file mode 100644 index 0000000000..da5bb0327a Binary files /dev/null and b/pandora_console/images/history_database.png differ diff --git a/pandora_console/images/info.png b/pandora_console/images/info.png index 787915dc95..1b4058cbd0 100644 Binary files a/pandora_console/images/info.png and b/pandora_console/images/info.png differ diff --git a/pandora_console/images/information.png b/pandora_console/images/information.png index 787915dc95..1b4058cbd0 100644 Binary files a/pandora_console/images/information.png and b/pandora_console/images/information.png differ diff --git a/pandora_console/images/max.png b/pandora_console/images/max.png index a43164e10c..87f2c12155 100644 Binary files a/pandora_console/images/max.png and b/pandora_console/images/max.png differ diff --git a/pandora_console/images/min.png b/pandora_console/images/min.png index dff20616d4..c1dd8d377f 100644 Binary files a/pandora_console/images/min.png and b/pandora_console/images/min.png differ diff --git a/pandora_console/images/module.png b/pandora_console/images/module.png index 00061340c9..ae7d85245e 100755 Binary files a/pandora_console/images/module.png and b/pandora_console/images/module.png differ diff --git a/pandora_console/images/module_critical.png b/pandora_console/images/module_critical.png index c9127ac091..0eb9405e03 100755 Binary files a/pandora_console/images/module_critical.png and b/pandora_console/images/module_critical.png differ diff --git a/pandora_console/images/module_notinit.png b/pandora_console/images/module_notinit.png index d67d0df8da..37fb1e7dc8 100755 Binary files a/pandora_console/images/module_notinit.png and b/pandora_console/images/module_notinit.png differ diff --git a/pandora_console/images/module_ok.png b/pandora_console/images/module_ok.png index fc67a10768..da6f031a95 100755 Binary files a/pandora_console/images/module_ok.png and b/pandora_console/images/module_ok.png differ diff --git a/pandora_console/images/module_unknown.png b/pandora_console/images/module_unknown.png index b503d2ae9c..bb51239835 100755 Binary files a/pandora_console/images/module_unknown.png and b/pandora_console/images/module_unknown.png differ diff --git a/pandora_console/images/module_warning.png b/pandora_console/images/module_warning.png index 389ec6d09f..1f8f3df1cc 100755 Binary files a/pandora_console/images/module_warning.png and b/pandora_console/images/module_warning.png differ diff --git a/pandora_console/images/mul.png b/pandora_console/images/mul.png index 4ec14b4a9f..4207857c11 100644 Binary files a/pandora_console/images/mul.png and b/pandora_console/images/mul.png differ diff --git a/pandora_console/images/os_icons/network.png b/pandora_console/images/os_icons/network.png index 9fa7f8c9d7..09c160ec86 100755 Binary files a/pandora_console/images/os_icons/network.png and b/pandora_console/images/os_icons/network.png differ diff --git a/pandora_console/images/os_icons/network_small.png b/pandora_console/images/os_icons/network_small.png index 5b2dbd1384..5f54055cb6 100755 Binary files a/pandora_console/images/os_icons/network_small.png and b/pandora_console/images/os_icons/network_small.png differ diff --git a/pandora_console/images/pdf.png b/pandora_console/images/pdf.png index 43da6a50a6..1d93e6ed40 100644 Binary files a/pandora_console/images/pdf.png and b/pandora_console/images/pdf.png differ diff --git a/pandora_console/images/percentile_item.png b/pandora_console/images/percentile_item.png index 2dc38fd158..8cfca63aac 100644 Binary files a/pandora_console/images/percentile_item.png and b/pandora_console/images/percentile_item.png differ diff --git a/pandora_console/images/plus.png b/pandora_console/images/plus.png index 6ce4154aad..19c0cf3a5a 100644 Binary files a/pandora_console/images/plus.png and b/pandora_console/images/plus.png differ diff --git a/pandora_console/images/policies_brick.png b/pandora_console/images/policies_brick.png index 009042b6cd..f0db98a255 100644 Binary files a/pandora_console/images/policies_brick.png and b/pandora_console/images/policies_brick.png differ diff --git a/pandora_console/images/policies_cog.png b/pandora_console/images/policies_cog.png index 10cf3fb6b2..8cde10740a 100644 Binary files a/pandora_console/images/policies_cog.png and b/pandora_console/images/policies_cog.png differ diff --git a/pandora_console/images/policies_error.png b/pandora_console/images/policies_error.png index c1113e3176..f421a03ce0 100644 Binary files a/pandora_console/images/policies_error.png and b/pandora_console/images/policies_error.png differ diff --git a/pandora_console/images/policies_error_db.png b/pandora_console/images/policies_error_db.png index ee203f49af..12570c5e5f 100644 Binary files a/pandora_console/images/policies_error_db.png and b/pandora_console/images/policies_error_db.png differ diff --git a/pandora_console/images/policies_not_brick.png b/pandora_console/images/policies_not_brick.png index 30adadc850..1ea9d05104 100644 Binary files a/pandora_console/images/policies_not_brick.png and b/pandora_console/images/policies_not_brick.png differ diff --git a/pandora_console/images/rosette.png b/pandora_console/images/rosette.png index 486913d9f5..83049798b0 100644 Binary files a/pandora_console/images/rosette.png and b/pandora_console/images/rosette.png differ diff --git a/pandora_console/images/status_sets/color_text/agent_agentsfired_ball.png b/pandora_console/images/status_sets/color_text/agent_agentsfired_ball.png new file mode 100644 index 0000000000..c5de4c22c6 Binary files /dev/null and b/pandora_console/images/status_sets/color_text/agent_agentsfired_ball.png differ diff --git a/pandora_console/images/status_sets/color_text/agent_alertsfired.png b/pandora_console/images/status_sets/color_text/agent_alertsfired.png new file mode 100644 index 0000000000..d38f8dc64a Binary files /dev/null and b/pandora_console/images/status_sets/color_text/agent_alertsfired.png differ diff --git a/pandora_console/images/status_sets/color_text/module_alertsfired_ball.png b/pandora_console/images/status_sets/color_text/module_alertsfired_ball.png new file mode 100644 index 0000000000..c5de4c22c6 Binary files /dev/null and b/pandora_console/images/status_sets/color_text/module_alertsfired_ball.png differ diff --git a/pandora_console/images/status_sets/default/agent_alertsfired.png b/pandora_console/images/status_sets/default/agent_alertsfired.png new file mode 100644 index 0000000000..dadff12c92 Binary files /dev/null and b/pandora_console/images/status_sets/default/agent_alertsfired.png differ diff --git a/pandora_console/images/status_sets/default/agent_alertsfired_ball.png b/pandora_console/images/status_sets/default/agent_alertsfired_ball.png new file mode 100644 index 0000000000..711c3a7731 Binary files /dev/null and b/pandora_console/images/status_sets/default/agent_alertsfired_ball.png differ diff --git a/pandora_console/images/status_sets/default/module_alertsfired_ball.png b/pandora_console/images/status_sets/default/module_alertsfired_ball.png new file mode 100644 index 0000000000..711c3a7731 Binary files /dev/null and b/pandora_console/images/status_sets/default/module_alertsfired_ball.png differ diff --git a/pandora_console/images/status_sets/faces/agent_alertsfired.png b/pandora_console/images/status_sets/faces/agent_alertsfired.png new file mode 100644 index 0000000000..dadff12c92 Binary files /dev/null and b/pandora_console/images/status_sets/faces/agent_alertsfired.png differ diff --git a/pandora_console/images/status_sets/faces/agent_alertsfired_ball.png b/pandora_console/images/status_sets/faces/agent_alertsfired_ball.png new file mode 100644 index 0000000000..711c3a7731 Binary files /dev/null and b/pandora_console/images/status_sets/faces/agent_alertsfired_ball.png differ diff --git a/pandora_console/images/status_sets/faces/module_alertsfired_ball.png b/pandora_console/images/status_sets/faces/module_alertsfired_ball.png new file mode 100644 index 0000000000..711c3a7731 Binary files /dev/null and b/pandora_console/images/status_sets/faces/module_alertsfired_ball.png differ diff --git a/pandora_console/images/sub.png b/pandora_console/images/sub.png index 4bfd1c1e5c..8875b77c47 100644 Binary files a/pandora_console/images/sub.png and b/pandora_console/images/sub.png differ diff --git a/pandora_console/images/sum.png b/pandora_console/images/sum.png index 8d3179630c..f2066d8fa9 100644 Binary files a/pandora_console/images/sum.png and b/pandora_console/images/sum.png differ diff --git a/pandora_console/images/tag_red.png b/pandora_console/images/tag_red.png index 933f5cb071..c99a3434c1 100644 Binary files a/pandora_console/images/tag_red.png and b/pandora_console/images/tag_red.png differ diff --git a/pandora_console/images/version.png b/pandora_console/images/version.png index cd08f06584..591403922b 100644 Binary files a/pandora_console/images/version.png and b/pandora_console/images/version.png differ diff --git a/pandora_console/images/wrench.png b/pandora_console/images/wrench.png index 7c8cc7a2ad..49da3f2ffd 100644 Binary files a/pandora_console/images/wrench.png and b/pandora_console/images/wrench.png differ diff --git a/pandora_console/images/wrench_orange.png b/pandora_console/images/wrench_orange.png index a10dc9d5e3..49da3f2ffd 100644 Binary files a/pandora_console/images/wrench_orange.png and b/pandora_console/images/wrench_orange.png differ diff --git a/pandora_console/images/zoom_cross.png b/pandora_console/images/zoom_cross.png index 8ed891c7c8..c27f53a305 100644 Binary files a/pandora_console/images/zoom_cross.png and b/pandora_console/images/zoom_cross.png differ diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index c5b5dd16e7..c8c04778e9 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1419,7 +1419,7 @@ function graph_agent_status ($id_agent = false, $width = 300, $height = 200, $re } $out = pie2d_graph($config['flash_charts'], $data, $width, $height, __("other"), - '', $water_mark, $config['fontpath'], $config['font_size'], 1, "hidden", $colors); + '', '', $config['fontpath'], $config['font_size'], 1, "hidden", $colors); if ($return) { return $out; diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php index 94ef09ed15..2562a2a422 100644 --- a/pandora_console/include/functions_groups.php +++ b/pandora_console/include/functions_groups.php @@ -831,43 +831,54 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) { // Calculate entire row color if ($data["monitor_alerts_fired"] > 0) { $group_class = 'group_view_alrm'; + $status_image = ui_print_status_image ('agent_alertsfired_ball.png', "", true); } elseif ($data["monitor_critical"] > 0) { $group_class = 'group_view_crit'; + $status_image = ui_print_status_image ('agent_critical_ball.png', "", true); } elseif ($data["monitor_warning"] > 0) { $group_class = 'group_view_warn'; + $status_image = ui_print_status_image ('agent_warning_ball.png', "", true); } elseif (($data["monitor_unknown"] > 0) || ($data["agents_unknown"] > 0)) { $group_class = 'group_view_unk'; + $status_image = ui_print_status_image ('agent_no_monitors_ball.png', "", true); } elseif ($data["monitor_ok"] > 0) { $group_class = 'group_view_ok'; + $status_image = ui_print_status_image ('agent_ok_ball.png', "", true); } else { $group_class = 'group_view_normal'; + $status_image = ui_print_status_image ('agent_no_data_ball.png', "", true); } ob_start(); echo ""; - // Group name - echo "  "; - echo $group['prefix'] . ui_print_group_icon ($id_group, true, "groups_small", 'font-size: 7.5pt'); - echo " "; - echo ui_print_truncate_text($group['name']); - echo ""; - echo ""; - echo ""; + // Force + echo ""; if (check_acl ($config['id_user'], $id_group, "AW")) { echo '' . html_print_image("images/target.png", true, array("border" => '0', "alt" => __('Force'))) . ''; } echo ""; + // Status + echo "" . $status_image . ""; + + // Group name + echo "  "; + echo $group['prefix'] . ui_print_group_icon ($id_group, true, "groups_small", 'font-size: 7.5pt'); + echo " "; + echo ui_print_truncate_text($group['name']); + echo ""; + echo ""; + // Total agents - echo ""; + echo ""; if ($data["total_agents"] > 0) echo ""; @@ -895,8 +906,8 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) { // Agents unknown if ($data["agents_unknown"] > 0) { - echo ""; - echo ""; + echo ""; echo $data["agents_unknown"]; echo ""; @@ -908,22 +919,22 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) { // Monitors Unknown if ($data["monitor_unknown"] > 0) { - echo ""; - echo ""; + echo ""; echo $data["monitor_unknown"]; echo ""; echo ""; } else { - echo ""; + echo ""; } // Monitors Not Init if ($data["monitor_not_init"] > 0) { - echo ""; - echo ""; + echo ""; echo $data["monitor_not_init"]; echo ""; @@ -935,9 +946,9 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) { // Monitors OK - echo ""; + echo ""; if ($data["monitor_ok"] > 0) { - echo ""; + echo ""; echo $data["monitor_ok"]; echo ""; } @@ -948,8 +959,8 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) { // Monitors Warning if ($data["monitor_warning"] > 0) { - echo ""; - echo ""; + echo ""; echo $data["monitor_warning"]; echo ""; @@ -961,27 +972,27 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) { // Monitors Critical if ($data["monitor_critical"] > 0) { - echo ""; - echo ""; + echo ""; echo $data["monitor_critical"]; echo ""; echo ""; } else { - echo ""; + echo ""; } // Alerts fired if ($data["monitor_alerts_fired"] > 0) { - echo ""; - echo ""; + echo ""; echo $data["monitor_alerts_fired"]; echo ""; echo ""; } else { - echo ""; + echo ""; } echo ""; diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 7145b981dc..f68ef1e99a 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -1034,29 +1034,29 @@ function reporting_get_stats_modules_status($data, $graph_width = 250, $graph_he $table_mbs = html_get_predefined_table(); $tdata = array(); - $tdata[0] = html_print_image('images/module_critical.png', true, array('title' => __('Monitor critical'), 'width' => '22px')); + $tdata[0] = html_print_image('images/module_critical.png', true, array('title' => __('Monitor critical'))); $tdata[1] = $data["monitor_critical"] <= 0 ? '-' : $data["monitor_critical"]; $tdata[1] = '' . $tdata[1] . ''; - $tdata[2] = html_print_image('images/module_warning.png', true, array('title' => __('Monitor warning'), 'width' => '22px')); + $tdata[2] = html_print_image('images/module_warning.png', true, array('title' => __('Monitor warning'))); $tdata[3] = $data["monitor_warning"] <= 0 ? '-' : $data["monitor_warning"]; $tdata[3] = '' . $tdata[3] . ''; $table_mbs->rowclass[] = ''; $table_mbs->data[] = $tdata; $tdata = array(); - $tdata[0] = html_print_image('images/module_ok.png', true, array('title' => __('Monitor normal'), 'width' => '22px')); + $tdata[0] = html_print_image('images/module_ok.png', true, array('title' => __('Monitor normal'))); $tdata[1] = $data["monitor_ok"] <= 0 ? '-' : $data["monitor_ok"]; $tdata[1] = '' . $tdata[1] . ''; - $tdata[2] = html_print_image('images/module_unknown.png', true, array('title' => __('Monitor unknown'), 'width' => '22px')); + $tdata[2] = html_print_image('images/module_unknown.png', true, array('title' => __('Monitor unknown'))); $tdata[3] = $data["monitor_unknown"] <= 0 ? '-' : $data["monitor_unknown"]; $tdata[3] = '' . $tdata[3] . ''; $table_mbs->rowclass[] = ''; $table_mbs->data[] = $tdata; $tdata = array(); - $tdata[0] = html_print_image('images/module_notinit.png', true, array('title' => __('Monitor not init'), 'width' => '22px')); + $tdata[0] = html_print_image('images/module_notinit.png', true, array('title' => __('Monitor not init'))); $tdata[1] = $data["monitor_not_init"] <= 0 ? '-' : $data["monitor_not_init"]; $tdata[1] = '' . $tdata[1] . ''; @@ -1154,11 +1154,11 @@ function reporting_get_stats_alerts($data) { $table_al = html_get_predefined_table(); $tdata = array(); - $tdata[0] = html_print_image('images/bell.png', true, array('title' => __('Defined alerts'), 'width' => '20px')); + $tdata[0] = html_print_image('images/bell.png', true, array('title' => __('Defined alerts'))); $tdata[1] = $data["monitor_alerts"] <= 0 ? '-' : $data["monitor_alerts"]; $tdata[1] = '' . $tdata[1] . ''; - $tdata[2] = html_print_image('images/bell_error.png', true, array('title' => __('Fired alerts'), 'width' => '20px')); + $tdata[2] = html_print_image('images/bell_error.png', true, array('title' => __('Fired alerts'))); $tdata[3] = $data["monitor_alerts_fired"] <= 0 ? '-' : $data["monitor_alerts_fired"]; $tdata[3] = '' . $tdata[3] . ''; $table_al->rowclass[] = ''; @@ -1189,7 +1189,7 @@ function reporting_get_stats_users($data) { $table_us = html_get_predefined_table(); $tdata = array(); - $tdata[0] = html_print_image('images/user_green.png', true, array('title' => __('Defined users'), 'width' => '20px')); + $tdata[0] = html_print_image('images/user_green.png', true, array('title' => __('Defined users'))); $tdata[1] = count (get_users ()); $tdata[1] = '' . $tdata[1] . ''; @@ -1232,11 +1232,11 @@ function reporting_get_stats_agents_monitors($data) { $table_am = html_get_predefined_table(); $tdata = array(); - $tdata[0] = html_print_image('images/agent.png', true, array('title' => __('Total agents'), 'width' => '22px')); + $tdata[0] = html_print_image('images/agent.png', true, array('title' => __('Total agents'))); $tdata[1] = $data["total_agents"] <= 0 ? '-' : $data["total_agents"]; $tdata[1] = '' . $tdata[1] . ''; - $tdata[2] = html_print_image('images/module.png', true, array('title' => __('Monitor checks'), 'width' => '22px')); + $tdata[2] = html_print_image('images/module.png', true, array('title' => __('Monitor checks'))); $tdata[3] = $data["monitor_checks"] <= 0 ? '-' : $data["monitor_checks"]; $tdata[3] = '' . $tdata[3] . ''; $table_am->rowclass[] = ''; @@ -6757,7 +6757,7 @@ function reporting_get_count_events_validated ($filter, $period = 0, * * @return string html formatted tiny stats of modules/alerts of an agent */ -function reporting_tiny_stats ($counts_info, $return = false, $type = 'agent') { +function reporting_tiny_stats ($counts_info, $return = false, $type = 'agent', $separator = ':') { $out = ''; // Depend the type of object, the stats will refer agents, modules... @@ -6829,17 +6829,17 @@ function reporting_tiny_stats ($counts_info, $return = false, $type = 'agent') { $total_count = 0; } - $out .= '' . '' . $total_count . ''; + $out .= '' . '' . $total_count . ''; if (isset($fired_count) && $fired_count > 0) - $out .= ' : ' . $fired_count . ''; + $out .= ' ' . $separator . ' ' . $fired_count . ''; if (isset($critical_count) && $critical_count > 0) - $out .= ' : ' . $critical_count . ''; + $out .= ' ' . $separator . ' ' . $critical_count . ''; if (isset($warning_count) && $warning_count > 0) - $out .= ' : ' . $warning_count . ''; + $out .= ' ' . $separator . ' ' . $warning_count . ''; if (isset($unknown_count) && $unknown_count > 0) - $out .= ' : ' . $unknown_count . ''; + $out .= ' ' . $separator . ' ' . $unknown_count . ''; if (isset($normal_count) && $normal_count > 0) - $out .= ' : ' . $normal_count . ''; + $out .= ' ' . $separator . ' ' . $normal_count . ''; $out .= ''; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 2c48e7bcb9..72056e5f59 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -1509,6 +1509,7 @@ span.rmess, span.nrmess { border-radius: 4px; padding: 8px 8px 8px 8px; } + table.databox { background-color: #f9faf9; border-spacing: 2px; @@ -1524,6 +1525,10 @@ table.databox { border: 0px solid #fff; } +.databox th { + padding: 10px 7px; +} + .tabletitle { background: url(../../images/header_blackout.png) no-repeat; } @@ -2270,7 +2275,7 @@ tr.group_view_warn, .group_view_warn, tr.group_view_warn.a, a.group_view_warn, t } a.group_view_warn { - color: #111; + color: #111 !important; } tr.group_view_alrm, .group_view_alrm { @@ -2282,30 +2287,9 @@ tr.group_view_unk, .group_view_unk { } tr.group_view_data, .group_view_data { - color: #111; + color: #fff !important; } -.group_view_data_unk { - color: #303030; -} - -.group_view_data_ok{ - color: #00C000; -} - -.group_view_data_crit { - color: #5C0000; -} - -.group_view_data_alrm { - color: #5C1D00; -} - -.group_view_data_warn { - color: #5C5900; -} - - /* classes for event priorities. Sits now in functions.php */ .datos_green, .datos_greenf9, .datos_green a, .datos_greenf9 a { background-color: #6EB432; diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index 888969662e..9859ad1e36 100644 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -56,8 +56,10 @@ $table_agent->width = '100%'; $table_agent->cellspacing = 4; $table_agent->cellpadding = 4; $table_agent->class = 'databox_frame'; -$table_agent->style[1] = 'width: 100px; text-align:center;'; -$table_agent->style[2] = 'width: 16px; text-align:center;'; +$table_agent->style[0] = 'width: 16px; text-align:center; padding: 0px;'; +$table_agent->style[5] = 'width: 16px; text-align:center; padding: 0px;'; +$table_agent->styleTable = 'padding:0px;'; +$table_agent->data = array(); $data = array(); $agent_name = ui_print_agent_name ($agent["id_agente"], true, 500, "font-size: medium;", true); @@ -72,27 +74,38 @@ else { $agent_name = $agent_name; } -$data[0] = ui_print_group_icon ($agent["id_grupo"], true) . ' '; -$data[0] .= $agent_name; +$data[0] = ui_print_group_icon ($agent["id_grupo"], true); +$table_agent->cellstyle[count($table_agent->data)][0] = 'width: 16px; text-align:center; padding: 0px; vertical-align: top;'; + +$data[2] = $agent_name; +$table_agent->colspan[count($table_agent->data)][2] = 3; $status_img = agents_detail_view_status_img ($agent["critical_count"], $agent["warning_count"], $agent["unknown_count"]); -$data[1] = reporting_tiny_stats ($agent, true); -$data[2] = $status_img; +$data[5] = $status_img; $table_agent->data[] = $data; $table_agent->rowclass[] = ''; -$table_agent->cellstyle[][0] = ''; $data = array(); -$data[0] = ui_print_os_icon ($agent["id_os"], true, true, true, false, false, false) . ' '; -$data[0] .= ui_print_help_tip($agent["os_version"], true); -$table_agent->cellstyle[][0] = 'padding-left:40px;'; +//$data[0] = reporting_tiny_stats ($agent, true, 'agent', '
'); +//$table_agent->rowspan[count($table_agent->data)][0] = 6; -$data[1] = graph_agent_status ($id_agente, 160, 120, true); -$table_agent->rowspan[1][1] = 6; +$data[0] = '
'; +$data[0] .= graph_agent_status ($id_agente, 140, 120, true); +$data[0] .= reporting_tiny_stats ($agent, true); +$data[0] .= '
'; +$table_agent->rowspan[count($table_agent->data)][0] = 6; +$table_agent->colspan[count($table_agent->data)][0] = 2; + +$data[2] = ui_print_os_icon ($agent["id_os"], false, true, true, false, false, false); +$table_agent->cellstyle[count($table_agent->data)][2] = 'width: 16px; text-align:center; padding: 0px; vertical-align: top;'; +//$data[3] = get_os_name ((int) $agent["id_os"]); +//$data[3] .= ui_print_help_tip($agent["os_version"], true); +$data[3] = $agent["os_version"]; +$table_agent->colspan[count($table_agent->data)][3] = 2; $table_agent->data[] = $data; $table_agent->rowclass[] = ''; @@ -107,30 +120,34 @@ foreach ($addresses as $k => $add) { if(!empty($address)) { $data = array(); - $data[0] = html_print_image('images/world.png', true, array('title' => __('IP address'))) . '  '; - $data[0] .= ''; - $data[0] .= empty($address) ? '' . __('N/A') . '' : $address; - $data[0] .= ''; - $table_agent->cellstyle[][0] = 'padding-left:40px;'; + $data[2] = html_print_image('images/world.png', true, array('title' => __('IP address'))); + $table_agent->cellstyle[count($table_agent->data)][2] = 'width: 16px; text-align:center; padding: 0px; vertical-align: top;'; + $data[3] = ''; + $data[3] .= empty($address) ? '' . __('N/A') . '' : $address; + $data[3] .= ''; + $table_agent->colspan[count($table_agent->data)][3] = 2; $table_agent->data[] = $data; $table_agent->rowclass[] = ''; } $data = array(); -$data[0] = html_print_image('images/version.png', true, array('title' => __('Agent Version'))) . '  '; -$data[0] .= ''; -$data[0] .= $agent["agent_version"]; -$data[0] .= ''; -$table_agent->cellstyle[][0] = 'padding-left:40px;'; +$data[2] = html_print_image('images/version.png', true, array('title' => __('Agent Version'))); +$table_agent->cellstyle[count($table_agent->data)][2] = 'width: 16px; text-align:center; padding: 0px; vertical-align: top;'; +$data[3] = ''; +$data[3] .= $agent["agent_version"]; +$data[3] .= ''; +$table_agent->colspan[count($table_agent->data)][3] = 2; $table_agent->data[] = $data; $table_agent->rowclass[] = ''; $data = array(); -$data[0] = html_print_image('images/default_list.png', true, array('title' => __('Description'))) . '  '; -$data[0] .= ''; -$data[0] .= empty($agent["comentarios"]) ? '' . __('N/A') . '' : $agent["comentarios"]; -$data[0] .= ''; -$table_agent->cellstyle[][0] = 'padding-left:40px;'; +$data[2] = html_print_image('images/default_list.png', true, array('title' => __('Description'))); +$table_agent->cellstyle[count($table_agent->data)][2] = 'width: 16px; text-align:center; padding: 0px; vertical-align: top;'; +$data[3] = ''; +$data[3] .= empty($agent["comentarios"]) ? '' . __('N/A') . '' : $agent["comentarios"]; +$data[3] .= ''; +$table_agent->colspan[count($table_agent->data)][3] = 2; + $table_agent->data[] = $data; $table_agent->rowclass[] = ''; @@ -301,7 +318,7 @@ $table->data[] = $data; $table->rowclass[] = ''; $data = array(); -$data[0] = '
+$data[0] = '
' . __('Events (24h)') . '' . @@ -312,7 +329,7 @@ $data[0] = '
// ACCESS RATE GRAPH if ($config["agentaccess"]) { - $data[0] .= '
+ $data[0] .= '
' . __('Agent access rate (24h)') . '' . diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php index 2e86b0c173..79f50a2498 100644 --- a/pandora_console/operation/agentes/group_view.php +++ b/pandora_console/operation/agentes/group_view.php @@ -91,18 +91,19 @@ if (count($agents) > 0) { $groups_get_groups_with_agent = groups_get_groups_with_agent($config['id_user'], "AR", true, true); ui_pagination(count($groups_get_groups_with_agent)); - echo ''; + echo '
'; echo ""; - echo ""; - echo ""; - echo ""; + echo ""; + echo ""; + echo ""; + echo ""; echo ""; - echo ""; + echo ""; echo ""; - echo ""; + echo ""; echo ""; - echo ""; - echo ""; + echo ""; + echo ""; $printed_groups = array(); diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index 9aed932085..cf504ae639 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -908,8 +908,7 @@ switch($tab) { break; } -ui_print_page_header(__('Agent') . ' - ' . - agents_get_name($id_agente) . +ui_print_page_header(agents_get_name($id_agente) . $header_description, $icon, false, "", false, $onheader); diff --git a/pandora_console/operation/search_results.php b/pandora_console/operation/search_results.php index 332cad5c76..697a25b9f3 100644 --- a/pandora_console/operation/search_results.php +++ b/pandora_console/operation/search_results.php @@ -105,7 +105,7 @@ else { if ($searchMaps) { $maps_tab = array('text' => "" - . html_print_image ("images/op_network.png", true, array ("title" => __('Maps'))) . "", 'active' => $searchTab == "maps"); + . html_print_image ("images/visual_console.png", true, array ("title" => __('Maps'))) . "", 'active' => $searchTab == "maps"); } else { $maps_tab = ''; diff --git a/pandora_console/operation/servers/recon_view.php b/pandora_console/operation/servers/recon_view.php index ec9a3ea703..5a22d0e51f 100644 --- a/pandora_console/operation/servers/recon_view.php +++ b/pandora_console/operation/servers/recon_view.php @@ -23,7 +23,7 @@ require_once ($config["homedir"] . '/include/functions_graph.php'); require_once ($config["homedir"] . '/include/functions_servers.php'); require_once ($config['homedir'] . "/include/functions_network_profiles.php"); -$options[]['text'] = "" . html_print_image("images/header_refresh.png", true) . ""; +$options[]['text'] = "" . html_print_image("images/refresh_mc.png", true) . ""; ui_print_page_header (__('Recon View'), "images/op_recon.png", false, "", false, $options);
" . __("Group") . "" . __("Agents") . "" . __("Force") . "" . __("Status") . "" . __("Group") . "" . __("Agents") . "" . __("Agent unknown") . "" . __("Unknown") . "" . __("Unknown") . "" . __("Not Init") . "" . __("Normal") . "" . __("Normal") . "" . __("Warning") . "" . __("Critical") . "" . __("Alert fired") . "" . __("Critical") . "" . __("Alert fired") . "