diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index cb4bea0e7c..b070c37cab 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2013-05-14 Miguel de Dios + + * include/constants.php: added constant "ITEMS_TO_SHOW_IN_MAIN_TAB". + + * operation/search_agents.getdata.php, operation/search_agents.php, + operation/search_modules.getdata.php, operation/search_main.php, + operation/search_results.php: improved the views of global search. + + * images/visual_console.png: update Carla's work. + + * images/visual_console_green.png: added a green version. + 2013-05-13 Sergio Martin * include/styles/pandora.css diff --git a/pandora_console/images/visual_console.png b/pandora_console/images/visual_console.png index f286896790..d55197af0b 100644 Binary files a/pandora_console/images/visual_console.png and b/pandora_console/images/visual_console.png differ diff --git a/pandora_console/images/visual_console_green.png b/pandora_console/images/visual_console_green.png new file mode 100644 index 0000000000..9ebe25bdaa Binary files /dev/null and b/pandora_console/images/visual_console_green.png differ diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index 4d6b68db16..7433b1cc4f 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -280,4 +280,7 @@ define ('REPORT_EXCEPTION_CONDITION_E', 7); define ('REPORT_EXCEPTION_CONDITION_NE', 8); define ('REPORT_EXCEPTION_CONDITION_OK', 3); define ('REPORT_EXCEPTION_CONDITION_NOT_OK', 4); -?> + +/* GLOBAL SEARCH */ +define('ITEMS_TO_SHOW_IN_MAIN_TAB', 5); +?> \ No newline at end of file diff --git a/pandora_console/operation/search_agents.getdata.php b/pandora_console/operation/search_agents.getdata.php index 67b5e37106..1938aeb252 100644 --- a/pandora_console/operation/search_agents.getdata.php +++ b/pandora_console/operation/search_agents.getdata.php @@ -175,22 +175,24 @@ if ($searchAgents) { break; } - if($only_count) { - $totalAgents = db_get_value_sql('SELECT COUNT(id_agente) AS agent_count ' . $sql); + $select = + "SELECT t1.id_agente, t1.ultimo_contacto, t1.nombre, t1.id_os, t1.intervalo, t1.id_grupo, t1.disabled"; + if ($only_count) { + $limit = " ORDER BY " . $order['field'] . " " . $order['order'] . + " LIMIT " . ITEMS_TO_SHOW_IN_MAIN_TAB . " OFFSET 0"; } else { - $select = - "SELECT t1.id_agente, t1.ultimo_contacto, t1.nombre, t1.id_os, t1.intervalo, t1.id_grupo, t1.disabled"; $limit = " ORDER BY " . $order['field'] . " " . $order['order'] . " LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0); - - $query = $select . $sql . $limit; - - $agents = db_process_sql($query); - - if($agents !== false) { - $totalAgents = db_get_value_sql('SELECT COUNT(id_agente) AS agent_count ' . $sql); - } + } + + $query = $select . $sql . $limit; + + $agents = db_process_sql($query); + + if ($agents !== false) { + $totalAgents = db_get_value_sql( + 'SELECT COUNT(id_agente) AS agent_count ' . $sql); } } ?> diff --git a/pandora_console/operation/search_agents.php b/pandora_console/operation/search_agents.php index dd99d74ae2..622319d767 100755 --- a/pandora_console/operation/search_agents.php +++ b/pandora_console/operation/search_agents.php @@ -19,13 +19,19 @@ global $config; enterprise_include_once('include/functions_policies.php'); require_once ($config['homedir'].'/include/functions_users.php'); +if ($only_count) { + ob_start(); +} + // TODO: CLEAN extra_sql $extra_sql = ''; $searchAgents = check_acl($config['id_user'], 0, "AR"); if (!$agents || !$searchAgents) { - echo "
" . __("Zero results found") . "
\n"; + if (!$only_count) { + echo "
" . __("Zero results found") . "
\n"; + } } else { $table->cellpadding = 4; @@ -34,18 +40,26 @@ else { $table->class = "databox"; $table->head = array (); - $table->head[0] = __('Agent') . ' ' . - '' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '' . - '' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown)) . ''; - $table->head[1] = __('OS'). ' ' . - '' . html_print_image("images/sort_up.png", true, array("style" => $selectOsUp)) . '' . - '' . html_print_image("images/sort_down.png", true, array("style" => $selectOsDown)) . ''; - $table->head[2] = __('Interval'). ' ' . - '' . html_print_image("images/sort_up.png", true, array("style" => $selectIntervalUp)) . '' . - '' . html_print_image("images/sort_down.png", true, array("style" => $selectIntervalDown)) . ''; - $table->head[3] = __('Group'). ' ' . - '' . html_print_image("images/sort_up.png", true, array("style" => $selectGroupUp)) . '' . - '' . html_print_image("images/sort_down.png", true, array("style" => $selectGroupDown)) . ''; + if ($only_count) { + $table->head[0] = __('Agent'); + $table->head[1] = __('OS'); + $table->head[2] = __('Interval'); + $table->head[3] = __('Group'); + } + else { + $table->head[0] = __('Agent') . ' ' . + '' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '' . + '' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown)) . ''; + $table->head[1] = __('OS') . ' ' . + '' . html_print_image("images/sort_up.png", true, array("style" => $selectOsUp)) . '' . + '' . html_print_image("images/sort_down.png", true, array("style" => $selectOsDown)) . ''; + $table->head[2] = __('Interval') . ' ' . + '' . html_print_image("images/sort_up.png", true, array("style" => $selectIntervalUp)) . '' . + '' . html_print_image("images/sort_down.png", true, array("style" => $selectIntervalDown)) . ''; + $table->head[3] = __('Group') . ' ' . + '' . html_print_image("images/sort_up.png", true, array("style" => $selectGroupUp)) . '' . + '' . html_print_image("images/sort_down.png", true, array("style" => $selectGroupDown)) . ''; + } $table->head[4] = __('Modules'); $table->head[5] = __('Status'); $table->head[6] = __('Alerts'); @@ -71,12 +85,12 @@ else { $agent_info = reporting_get_agent_module_info ($agent["id_agente"]); $counts_info = array('total_count' => $agent_info["modules"], - 'normal_count' => $agent_info["monitor_normal"], - 'critical_count' => $agent_info["monitor_critical"], - 'warning_count' => $agent_info["monitor_warning"], - 'unknown_count' => $agent_info["monitor_unknown"], - 'fired_count' => $agent_info["monitor_alertsfired"]); - + 'normal_count' => $agent_info["monitor_normal"], + 'critical_count' => $agent_info["monitor_critical"], + 'warning_count' => $agent_info["monitor_warning"], + 'unknown_count' => $agent_info["monitor_unknown"], + 'fired_count' => $agent_info["monitor_alertsfired"]); + $modulesCell = reporting_tiny_stats($counts_info, true); if ($agent['disabled']) { @@ -114,9 +128,17 @@ else { } echo "
"; - ui_pagination ($totalAgents); + if (!$only_count) { + ui_pagination ($totalAgents); + } html_print_table ($table); unset($table); - ui_pagination ($totalAgents); + if (!$only_count) { + ui_pagination ($totalAgents); + } +} + +if ($only_count) { + $list_agents = ob_get_clean(); } ?> diff --git a/pandora_console/operation/search_main.php b/pandora_console/operation/search_main.php index 3df4b3fb60..93a65cecf4 100644 --- a/pandora_console/operation/search_main.php +++ b/pandora_console/operation/search_main.php @@ -28,64 +28,49 @@ echo '
' $anyfound = false; +$table->id = 'summary'; +$table->width = '98%'; + +$table->style = array (); +$table->style[0] = 'font-weight: bold; text-align: center;'; +$table->style[1] = 'font-weight: bold; text-align: center;'; +$table->style[2] = 'font-weight: bold; text-align: center;'; +$table->style[3] = 'font-weight: bold; text-align: center;'; +$table->style[4] = 'font-weight: bold; text-align: center;'; +$table->style[5] = 'font-weight: bold; text-align: center;'; +$table->style[6] = 'font-weight: bold; text-align: center;'; +$table->style[7] = 'font-weight: bold; text-align: center;'; +$table->style[8] = 'font-weight: bold; text-align: center;'; +$table->style[9] = 'font-weight: bold; text-align: center;'; +$table->style[10] = 'font-weight: bold; text-align: center;'; +$table->style[11] = 'font-weight: bold; text-align: center;'; + +$table->data[0][0] = html_print_image ("images/agent.png", true, array ("title" => __('Agents found'))); +$table->data[0][1] = "" . + sprintf(__("Found %s"), $totalAgents) . ""; +$table->data[0][2] = html_print_image ("images/module.png", true, array ("title" => __('Modules found'))); +$table->data[0][3] = "" . + sprintf(__("Found %s"), $totalModules) . ""; +$table->data[0][4] = html_print_image ("images/bell.png", true, array ("title" => __('Alerts found'))); +$table->data[0][5] = "" . + sprintf(__("Found %s"), $totalAlerts) . ""; +$table->data[0][6] = html_print_image ("images/input_user.png", true, array ("title" => __('Users found'))); +$table->data[0][7] = "" . + sprintf(__("Found %s"), $totalUsers) . ""; +$table->data[0][8] = html_print_image ("images/chart_curve.png", true, array ("title" => __('Graphs found'))); +$table->data[0][9] = "" . + sprintf(__("Found %s"), $totalGraphs) . ""; +$table->data[0][8] = html_print_image ("images/reporting.png", true, array ("title" => __('Reports found'))); +$table->data[0][9] = "" . + sprintf(__("Found %s"), $totalReports) . ""; +$table->data[0][10] = html_print_image ("images/visual_console_green.png", true, array ("title" => __('Maps found'))); +$table->data[0][11] = "" . + sprintf(__("Found %s"), $totalMaps) . ""; + +html_print_table($table); + if ($searchAgents && $totalAgents > 0) { - echo '
'; - echo '' . __('Agents') . ''; - echo sprintf(__("%d results found"), $totalAgents) . " " . html_print_image('images/zoom.png', true, array('title' => __('Show results'))) . ""; - echo '
'; - $anyfound = true; -} - -if ($searchModules && $totalModules > 0) { - echo '
'; - echo '' . __('Modules') . ''; - echo sprintf(__("%d results found"), $totalModules) . " " . html_print_image('images/zoom.png', true, array('title' => __('Show results'))) . ""; - echo '
'; - $anyfound = true; -} - -if ($searchAlerts && $totalAlerts > 0) { - echo '
'; - echo '' . __('Alerts') . ''; - echo sprintf(__("%d results found"), $totalAlerts) . " " . html_print_image('images/zoom.png', true, array('title' => __('Show results'))) . ""; - echo '
'; - $anyfound = true; -} - -if ($searchUsers && $totalUsers > 0) { - echo '
'; - echo '' . __('Users') . ''; - echo sprintf(__("%d results found"), $totalUsers) . " " . html_print_image('images/zoom.png', true, array('title' => __('Show results'))) . ""; - echo '
'; - $anyfound = true; -} - -if ($searchGraphs && $totalGraphs > 0) { - echo '
'; - echo '' . __('Graphs') . ''; - echo sprintf(__("%d results found"), $totalGraphs) . " " . html_print_image('images/zoom.png', true, array('title' => __('Show results'))) . ""; - echo '
'; - $anyfound = true; -} - -if ($searchReports && $totalReports > 0) { - echo '
'; - echo '' . __('Reports') . ''; - echo sprintf(__("%d results found"), $totalReports) . " " . html_print_image('images/zoom.png', true, array('title' => __('Show results'))) . ""; - echo '
'; - $anyfound = true; -} - -if ($searchMaps && $totalMaps > 0) { - echo '
'; - echo '' . __('Maps') . ''; - echo sprintf(__("%d results found"), $totalMaps) . " " . html_print_image('images/zoom.png', true, array('title' => __('Show results'))) . ""; - echo '
'; - $anyfound = true; -} - -if(!$anyfound) { - echo "
" . __("Zero results found") . "
\n"; + echo $list_agents; } echo '
'; diff --git a/pandora_console/operation/search_modules.getdata.php b/pandora_console/operation/search_modules.getdata.php index 80b323141a..96c81ee36a 100644 --- a/pandora_console/operation/search_modules.getdata.php +++ b/pandora_console/operation/search_modules.getdata.php @@ -137,7 +137,7 @@ if ($searchModules) { } $totalModules = db_get_value_sql("SELECT COUNT(t1.id_agente_modulo) AS count_modules " . $chunk_sql); - + if(!$only_count) { $select = "SELECT *, t1.nombre AS module_name, t2.nombre AS agent_name "; $limit = " ORDER BY " . $order['field'] . " " . $order['order'] . diff --git a/pandora_console/operation/search_results.php b/pandora_console/operation/search_results.php index c02cf56647..332cad5c76 100644 --- a/pandora_console/operation/search_results.php +++ b/pandora_console/operation/search_results.php @@ -135,6 +135,7 @@ switch ($searchTab) { case 'main': $only_count = true; require_once('search_agents.getdata.php'); + require_once('search_agents.php'); require_once('search_users.getdata.php'); require_once('search_alerts.getdata.php'); require_once('search_graphs.getdata.php');