From 815adff2a470e2ee6dec385a54c8d4a565c9947b Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 17 Sep 2010 10:56:17 +0000 Subject: [PATCH] 2010-09-17 Miguel de Dios * include/fgraph.php: added function "grafico_modulo_sparse_mobile" for to paint a mobile graph. * include/functions_db.php: erased deprecate function "dame_grupo_icono". * include/functions_module.php: moved the functions "format_delete", "format_time", "format_data", "format_verbatim", "format_timestamp", "format_delete", "format_delete_string", "format_delete_log4x" from the file "operation/agentes/datos_agente.php" for to use in other source code places. * operation/agentes/datos_agente.php: extracted the functions "format_delete", "format_time", "format_data", "format_verbatim", "format_timestamp", "format_delete", "format_delete_string", "format_delete_log4x" to "include/functions_module.php" for to use in other source code. * operation/agentes/tactical.php: cleaned source code style. * operation/agentes/group_view.php: cleaned source code style. * mobile/operation/agents/view_agents.php: added class "viewGraph" to show graph and data of any module. * mobile/operation/agents/tactical.php: added first version of page to show tactical mobile page. * mobile/operation/agents/view_alerts.php: added first version of page to show alerts mobile page. * mobile/operation/agents/group_view.php: added first version of page to show group view mobile page. * mobile/operation/servers/view_servers.php: added first version of page to show servers mobile page. * mobile/include/style/main.css: added many new styles. * mobile/include/functions_web.php: added links into menu for new pages. * mobile/include/system.class.php: fixed scope of method "getConfig". * mobile/index.php: added hooks for new pages. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3250 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 46 ++++ pandora_console/include/fgraph.php | 238 ++++++++++++++++++ pandora_console/include/functions_db.php | 8 - pandora_console/include/functions_modules.php | 72 ++++++ .../mobile/include/functions_web.php | 5 +- pandora_console/mobile/include/style/main.css | 26 +- .../mobile/include/system.class.php | 2 +- pandora_console/mobile/index.php | 80 +++++- .../mobile/operation/agents/group_view.php | 81 ++++++ .../mobile/operation/agents/tactical.php | 113 +++++++++ .../mobile/operation/agents/view_agents.php | 163 +++++++++++- .../mobile/operation/agents/view_alerts.php | 89 +++++++ .../mobile/operation/servers/view_servers.php | 4 +- .../operation/agentes/datos_agente.php | 77 +----- .../operation/agentes/group_view.php | 40 +-- .../operation/agentes/tactical.php | 12 +- 16 files changed, 945 insertions(+), 111 deletions(-) create mode 100644 pandora_console/mobile/operation/agents/group_view.php create mode 100644 pandora_console/mobile/operation/agents/tactical.php create mode 100644 pandora_console/mobile/operation/agents/view_alerts.php diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 49cc1d5b12..66450bed8c 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,49 @@ +2010-09-17 Miguel de Dios + + * include/fgraph.php: added function "grafico_modulo_sparse_mobile" for + to paint a mobile graph. + + * include/functions_db.php: erased deprecate function "dame_grupo_icono". + + * include/functions_module.php: moved the functions "format_delete", + "format_time", "format_data", "format_verbatim", "format_timestamp", + "format_delete", "format_delete_string", "format_delete_log4x" from the + file "operation/agentes/datos_agente.php" for to use in other source code + places. + + * operation/agentes/datos_agente.php: extracted the functions + "format_delete", "format_time", "format_data", "format_verbatim", + "format_timestamp", "format_delete", "format_delete_string", + "format_delete_log4x" to "include/functions_module.php" for to use in other + source code. + + * operation/agentes/tactical.php: cleaned source code style. + + * operation/agentes/group_view.php: cleaned source code style. + + * mobile/operation/agents/view_agents.php: added class "viewGraph" to show + graph and data of any module. + + * mobile/operation/agents/tactical.php: added first version of page to show + tactical mobile page. + + * mobile/operation/agents/view_alerts.php: added first version of page to + show alerts mobile page. + + * mobile/operation/agents/group_view.php: added first version of page to + show group view mobile page. + + * mobile/operation/servers/view_servers.php: added first version of page to + show servers mobile page. + + * mobile/include/style/main.css: added many new styles. + + * mobile/include/functions_web.php: added links into menu for new pages. + + * mobile/include/system.class.php: fixed scope of method "getConfig". + + * mobile/index.php: added hooks for new pages. + 2010-09-17 Junichi Satoh * extras/pandoradb_migrate_v3.1_to_v3.2.sql: Added missing ';'. diff --git a/pandora_console/include/fgraph.php b/pandora_console/include/fgraph.php index 3e3abb0776..6cdafd343d 100644 --- a/pandora_console/include/fgraph.php +++ b/pandora_console/include/fgraph.php @@ -1500,6 +1500,240 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events, $engine->sparse_graph ($period, $avg_only, $min_value, $max_value, $unit_name); } +function grafico_modulo_sparse_mobile ($agent_module_id, $period, $show_events, + $width, $height , $title, $unit_name, + $show_alerts, $avg_only = 0, $pure = false, + $date = 0) { + global $config; + global $graphic_type; + + // Set variables + if ($date == 0) $date = get_system_time(); + $datelimit = $date - $period; + $resolution = $config['graph_res'] * 50; //Number of points of the graph + $interval = (int) ($period / $resolution); + $agent_name = get_agentmodule_agent_name ($agent_module_id); + $agent_id = get_agent_id ($agent_name); + $module_name = get_agentmodule_name ($agent_module_id); + $id_module_type = get_agentmodule_type ($agent_module_id); + $module_type = get_moduletype_name ($id_module_type); + $uncompressed_module = is_module_uncompressed ($module_type); + if ($uncompressed_module) { + $avg_only = 1; + } + + // Get event data (contains alert data too) + if ($show_events == 1 || $show_alerts == 1) { + $events = get_db_all_rows_filter ('tevento', + array ('id_agentmodule' => $agent_module_id, + "utimestamp > $datelimit", + "utimestamp < $date", + 'order' => 'utimestamp ASC'), + array ('evento', 'utimestamp')); + if ($events === false) { + $events = array (); + } + } + + // Get module data + $data = get_db_all_rows_filter ('tagente_datos', + array ('id_agente_modulo' => $agent_module_id, + "utimestamp > $datelimit", + "utimestamp < $date", + 'order' => 'utimestamp ASC'), + array ('datos', 'utimestamp')); + if ($data === false) { + $data = array (); + } + + // Uncompressed module data + if ($uncompressed_module) { + $min_necessary = 1; + + // Compressed module data + } else { + // Get previous data + $previous_data = get_previous_data ($agent_module_id, $datelimit); + if ($previous_data !== false) { + $previous_data['utimestamp'] = $datelimit; + array_unshift ($data, $previous_data); + } + + // Get next data + $nextData = get_next_data ($agent_module_id, $date); + if ($nextData !== false) { + array_push ($data, $nextData); + } else if (count ($data) > 0) { + // Propagate the last known data to the end of the interval + $nextData = array_pop ($data); + array_push ($data, $nextData); + $nextData['utimestamp'] = $date; + array_push ($data, $nextData); + } + + $min_necessary = 2; + } + + // Check available data + if (count ($data) < $min_necessary) { + if (!$graphic_type) { + return fs_error_image (); + } + graphic_error (); + } + + // Data iterator + $j = 0; + + // Event iterator + $k = 0; + + // Set initial conditions + $chart = array(); + if ($data[0]['utimestamp'] == $datelimit) { + $previous_data = $data[0]['datos']; + $j++; + } else { + $previous_data = 0; + } + + // Calculate chart data + for ($i = 0; $i < $resolution; $i++) { + $timestamp = $datelimit + ($interval * $i); + + $total = 0; + $count = 0; + + // Read data that falls in the current interval + $interval_min = false; + $interval_max = false; + while (isset ($data[$j]) && $data[$j]['utimestamp'] >= $timestamp && $data[$j]['utimestamp'] < ($timestamp + $interval)) { + if ($interval_min === false) { + $interval_min = $data[$j]['datos']; + } + if ($interval_max === false) { + $interval_max = $data[$j]['datos']; + } + + if ($data[$j]['datos'] > $interval_max) { + $interval_max = $data[$j]['datos']; + } else if ($data[$j]['datos'] < $interval_max) { + $interval_min = $data[$j]['datos']; + } + $total += $data[$j]['datos']; + $count++; + $j++; + } + + // Data in the interval + if ($count > 0) { + $total /= $count; + } + + // Read events and alerts that fall in the current interval + $event_value = 0; + $alert_value = 0; + while (isset ($events[$k]) && $events[$k]['utimestamp'] >= $timestamp && $events[$k]['utimestamp'] <= ($timestamp + $interval)) { + if ($show_events == 1) { + $event_value++; + } + if ($show_alerts == 1 && substr ($events[$k]['event_type'], 0, 5) == 'alert') { + $alert_value++; + } + $k++; + } + + // Data + if ($count > 0) { + $chart[$timestamp]['sum'] = $total; + $chart[$timestamp]['min'] = $interval_min; + $chart[$timestamp]['max'] = $interval_max; + $previous_data = $total; + // Compressed data + } else { + if ($uncompressed_module) { + $chart[$timestamp]['sum'] = 0; + $chart[$timestamp]['min'] = 0; + $chart[$timestamp]['max'] = 0; + } else { + $chart[$timestamp]['sum'] = $previous_data; + $chart[$timestamp]['min'] = $previous_data; + $chart[$timestamp]['max'] = $previous_data; + } + } + + $chart[$timestamp]['count'] = 0; + $chart[$timestamp]['timestamp_bottom'] = $timestamp; + $chart[$timestamp]['timestamp_top'] = $timestamp + $interval; + $chart[$timestamp]['event'] = $event_value; + $chart[$timestamp]['alert'] = $alert_value; + } + + // Get min, max and avg (less efficient but centralized for all modules and reports) + $min_value = round(get_agentmodule_data_min ($agent_module_id, $period, $date), 2); + $max_value = round(get_agentmodule_data_max ($agent_module_id, $period, $date), 2); + $avg_value = round(get_agentmodule_data_average ($agent_module_id, $period, $date), 2); + + // Fix event and alert scale + $event_max = $max_value * 1.25; + foreach ($chart as $timestamp => $chart_data) { + if ($chart_data['event'] > 0) { + $chart[$timestamp]['event'] = $event_max; + } + if ($chart_data['alert'] > 0) { + $chart[$timestamp]['alert'] = $event_max; + } + } + + // Set the title and time format + if ($period <= 3600) { + $title_period = __('Last hour'); + $time_format = 'G:i:s'; + } + elseif ($period <= 86400) { + $title_period = __('Last day'); + $time_format = 'G:i'; + } + elseif ($period <= 604800) { + $title_period = __('Last week'); + $time_format = 'M j'; + } + elseif ($period <= 2419200) { + $title_period = __('Last month'); + $time_format = 'M j'; + } + else { + $title_period = __('Last %s days', format_numeric (($period / (3600 * 24)), 2)); + $time_format = 'M j'; + } + + // Flash chart + $caption = __('Max. Value') . ': ' . $max_value . ' ' . __('Avg. Value') . ': ' . $avg_value . ' ' . __('Min. Value') . ': ' . $min_value; + if (! $graphic_type) { + return fs_module_chart ($chart, $width, $height, $avg_only, $resolution / 10, $time_format, $show_events, $show_alerts, $caption); + } + + $engine = get_graph_engine ($period); + $engine->width = $width; + $engine->height = $height; + $engine->data = &$chart; + $engine->xaxis_interval = $resolution * 1.8; + $engine->title = ""; + $engine->subtitle = $caption; + $engine->show_title = false; //true; + $engine->max_value = $max_value; + $engine->min_value = $min_value; + $engine->events = (bool) $show_event; + $engine->alert_top = false; + $engine->alert_bottom = false;; + if (! $pure) { + $engine->legend = &$legend; + } + $engine->fontpath = $config['fontpath']; + + $engine->sparse_graph ($period, $avg_only, $min_value, $max_value, $unit_name); +} + function grafico_modulo_boolean ($agent_module_id, $period, $show_events, $width, $height , $title, $unit_name, $show_alerts, $avg_only = 0, $pure=0, $date = 0 ) { @@ -2418,6 +2652,10 @@ if ($graphic_type) { grafico_modulo_sparse ($id, $period, $draw_events, $width, $height, $label, $unit_name, $draw_alerts, $avg_only, $pure, $date); break; + case 'sparse_mobile': + grafico_modulo_sparse_mobile ($id, $period, $draw_events, $width, $height, + $label, $unit_name, $draw_alerts, $avg_only, $pure, $date); + break; case "boolean": grafico_modulo_boolean ($id, $period, $draw_events, $width, $height , $label, $unit_name, $draw_alerts, 1, $pure, $date); diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index 986b140c1a..da210c2260 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -704,14 +704,6 @@ function get_group_icon ($id_group) { } } - -/** - * DEPRECATED in favor of get_group_icon - */ -function dame_grupo_icono ($id_group) { - return get_group_icon ($id_group); -} - /** * Get agent id from a module id that it has. * diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index 28680f5f50..6917d200ed 100644 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -229,4 +229,76 @@ function get_agents_with_module_name ($module_name, $id_group, $filter = false, return get_db_all_rows_filter ('tagente, tagente_modulo', $filter, $fields); } + +// +// This are functions to format the data +// + +function format_time($ts) +{ + return print_timestamp ($ts, true, array("prominent" => "comparation")); +} + +function format_data($data) +{ + if (is_numeric ($data)) { + $data = format_numeric($data, 2); + } else { + $data = safe_input ($data); + } + return $data; +} + +function format_verbatim($data){ + // We need to replace \n by
to create a "similar" output to + // information recolected in logs. + $data2 = preg_replace ("/\\n/", "
", $data); + return "" . $data2 . ""; +} + +function format_timestamp($ts) +{ + global $config; + + // This returns data with absolute user-defined timestamp format + // and numeric by data managed with 2 decimals, and not using Graph format + // (replacing 1000 by K and 1000000 by G, like version 2.x + return date ($config["date_format"], $ts); +} + +function format_delete($id) +{ + global $period, $module_id, $config, $group; + + $txt = ""; + + if (give_acl ($config['id_user'], $group, "AW") ==1) { + $txt = ''; + } + return $txt; +} + +function format_delete_string($id) +{ + global $period, $module_id, $config, $group; + + $txt = ""; + + if (give_acl ($config['id_user'], $group, "AW") ==1) { + $txt = ''; + } + return $txt; +} + +function format_delete_log4x($id) +{ + global $period, $module_id, $config, $group; + + $txt = ""; + + if (give_acl ($config['id_user'], $group, "AW") ==1) { + $txt = ''; + } + return $txt; +} ?> diff --git a/pandora_console/mobile/include/functions_web.php b/pandora_console/mobile/include/functions_web.php index c2226351d3..48f0b131cd 100644 --- a/pandora_console/mobile/include/functions_web.php +++ b/pandora_console/mobile/include/functions_web.php @@ -16,10 +16,11 @@ function menu() { ?>