diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 1fc12dbbeb..2d346ee065 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 5.1-140923 +Version: 5.1-140924 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 64a50ba914..8868aa37a4 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="5.1-140923" +pandora_version="5.1-140924" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 531c28dd69..689b535368 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '5.1'; -use constant AGENT_BUILD => '140923'; +use constant AGENT_BUILD => '140924'; # Commands to retrieve total memory information in kB use constant TOTALMEMORY_CMDS => { diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 3e3d7f70f3..cb41b7908f 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 5.1 -%define release 140923 +%define release 140924 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index d0f95de33e..bda25cf396 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 5.1 -%define release 140923 +%define release 140924 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 0eaf9ad0d0..5330716913 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{140923} +{140924} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 68885f4e44..053807a3e3 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("5.1(Build 140923)") +#define PANDORA_VERSION ("5.1(Build 140924)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 1bac33f9e0..dd1ead41a2 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(5.1(Build 140923))" + VALUE "ProductVersion", "(5.1(Build 140924))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index f0f1531a97..ef372dc642 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 5.1-140923 +Version: 5.1-140924 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index d48b1cdaf6..0684bdc8eb 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="5.1-140923" +pandora_version="5.1-140924" package_pear=0 package_pandora=1 diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 8419d7cc33..831417c13b 100644 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -400,12 +400,33 @@ $table->data[$row][1] = html_print_input_text ('networkmap_max_width', $config[" $row++; $table->data[$row][0] = __('Fixed header'); -$table->data[$row][1] = html_print_checkbox('fixed_header', 1, $config['fixed_header'], true); +$table->data[$row][1] = __('Yes') . ' ' . + html_print_radio_button ('fixed_header', 1, '', $config["fixed_header"], true) . + '  '; +$table->data[$row][1] .= __('No') . ' ' . + html_print_radio_button ('fixed_header', 0, '', $config["fixed_header"], true); $row++; $table->data[$row][0] = __('Fixed menu'); -$table->data[$row][1] = html_print_checkbox('fixed_menu', 1, $config['fixed_menu'], true); +$table->data[$row][1] = __('Yes') . ' ' . + html_print_radio_button ('fixed_menu', 1, '', $config["fixed_menu"], true) . + '  '; +$table->data[$row][1] .= __('No') . ' ' . + html_print_radio_button ('fixed_menu', 0, '', $config["fixed_menu"], true); + +$row++; + +if (!isset($config["short_module_graph_data"])) + $config["short_module_graph_data"] = true; + +$table->data[$row][0] = __('Shortened module graph data'); +$table->data[$row][0] .= ui_print_help_tip(__('The data number of the module graphs will be rounded and shortened'), true); +$table->data[$row][1] = __('Yes') . ' ' . + html_print_radio_button ('short_module_graph_data', 1, '', $config["short_module_graph_data"], true) . + '  '; +$table->data[$row][1] .= __('No') . ' ' . + html_print_radio_button ('short_module_graph_data', 0, '', $config["short_module_graph_data"], true); $row++; diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index c45b61696e..ef090cad67 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC140923'; +$build_version = 'PC140924'; $pandora_version = 'v5.1'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index eceb41f5ea..8cc9d1864b 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -447,6 +447,8 @@ function config_update_config () { $error_update[] = __('Custom graphviz directory'); if (!config_update_value ('networkmap_max_width', get_parameter('networkmap_max_width'))) $error_update[] = __('Networkmap max width'); + if (!config_update_value ('short_module_graph_data', get_parameter('short_module_graph_data'))) + $error_update[] = __('Shortened module graph data'); $interval_values = get_parameter ('interval_values'); diff --git a/pandora_console/include/functions_custom_graphs.php b/pandora_console/include/functions_custom_graphs.php index 4b1c12acf0..f0e03d935a 100644 --- a/pandora_console/include/functions_custom_graphs.php +++ b/pandora_console/include/functions_custom_graphs.php @@ -145,14 +145,25 @@ function custom_graphs_get_user ($id_user = 0, $only_names = false, $returnAllGr * @param $height Height of the returning image. * @param $width Width of the returning image. * @param $period Period of time to get data in seconds. - * @param $stacked Wheter the graph is stacked or not. + * @param $stacked Whether the graph is stacked or not. * @param $return Whether to return an output string or echo now (optional, echo by default). * @param $date Date to start printing the graph + * @param bool Wether to show an image instead a interactive chart or not + * @param string Background color + * @param array List of names for the items. Should have the same size as the module list. + * @param bool Show the last value of the item on the list. + * @param bool Show the max value of the item on the list. + * @param bool Show the min value of the item on the list. + * @param bool Show the average value of the item on the list. + * + * @return Mixed */ function custom_graphs_print($id_graph, $height, $width, $period, $stacked = null, $return = false, $date = 0, $only_image = false, - $background_color = 'white', $modules_param = array(), $homeurl = '') { + $background_color = 'white', $modules_param = array(), $homeurl = '', + $name_list = array(), $unit_list = array(), $show_last = true, + $show_max = true, $show_min = true, $show_avg = true) { global $config; @@ -214,7 +225,13 @@ function custom_graphs_print($id_graph, $height, $width, $period, 1, false, false, - $background_color); + $background_color, + $name_list, + $unit_list, + $show_last, + $show_max, + $show_min, + $show_avg); if ($return) return $output; diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 3813ae71f5..7d54e946cf 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -854,6 +854,12 @@ function graph_get_formatted_date($timestamp, $format1, $format2) { * @param int Date to start of getting info. * @param mixed If is a projection graph this parameter will be module data with prediction data (the projection) * or false in other case. + * @param array List of names for the items. Should have the same size as the module list. + * @param array List of units for the items. Should have the same size as the module list. + * @param bool Show the last value of the item on the list. + * @param bool Show the max value of the item on the list. + * @param bool Show the min value of the item on the list. + * @param bool Show the average value of the item on the list. * * @return Mixed */ @@ -861,7 +867,9 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $height, $title, $unit_name, $show_events = 0, $show_alerts = 0, $pure = 0, $stacked = 0, $date = 0, $only_image = false, $homeurl = '', $ttl = 1, $projection = false, - $prediction_period = false, $background_color = 'white') { + $prediction_period = false, $background_color = 'white', + $name_list = array(), $unit_list = array(), $show_last = true, $show_max = true, + $show_min = true, $show_avg = true) { global $config; global $graphic_type; @@ -928,6 +936,9 @@ function graphic_combined_module ($module_list, $weight_list, $period, else { $module_number = count ($module_list); } + + $names_number = count($name_list); + $units_number = count($unit_list); // interval - This is the number of "rows" we are divided the time to fill data. // more interval, more resolution, and slower. @@ -971,23 +982,28 @@ function graphic_combined_module ($module_list, $weight_list, $period, if ($projection != false && $i != 0) { $agent_module_id = $module_list[0]; - //Get and process agent name - $agent_name = io_safe_output( - modules_get_agentmodule_agent_name ($agent_module_id)); - $agent_name = ui_print_truncate_text($agent_name, 'agent_small', false, true, false, '...', false); + if (!empty($name_list) && $names_number == $module_number && isset($name_list[$i])) { + $module_name_list[$i] = $name_list[$i]; + } + else { + //Get and process agent name + $agent_name = io_safe_output( + modules_get_agentmodule_agent_name ($agent_module_id)); + $agent_name = ui_print_truncate_text($agent_name, 'agent_small', false, true, false, '...', false); + + + $agent_id = agents_get_agent_id ($agent_name); + + + //Get and process module name + $module_name = io_safe_output( + modules_get_agentmodule_name ($agent_module_id)); + $module_name = sprintf(__("projection for %s"), $module_name); + $module_name = ui_print_truncate_text($module_name, 'module_small', false, true, false, '...', false); + + $module_name_list[$i] = $agent_name ." / ". $module_name; + } - - $agent_id = agents_get_agent_id ($agent_name); - - - //Get and process module name - $module_name = io_safe_output( - modules_get_agentmodule_name ($agent_module_id)); - $module_name = sprintf(__("projection for %s"), $module_name); - $module_name = ui_print_truncate_text($module_name, 'module_small', false, true, false, '...', false); - - - $module_name_list[$i] = $agent_name ." / ". $module_name; $id_module_type = modules_get_agentmodule_type ($agent_module_id); $module_type = modules_get_moduletype_name ($id_module_type); $uncompressed_module = is_module_uncompressed ($module_type); @@ -995,20 +1011,26 @@ function graphic_combined_module ($module_list, $weight_list, $period, else { $agent_module_id = $module_list[$i]; - //Get and process agent name - $agent_name = io_safe_output( - modules_get_agentmodule_agent_name ($agent_module_id)); - $agent_name = ui_print_truncate_text($agent_name, 'agent_small', false, true, false, '...', false); - - - $agent_id = agents_get_agent_id ($agent_name); - - //Get and process module name - $module_name = io_safe_output( - modules_get_agentmodule_name ($agent_module_id)); - $module_name = ui_print_truncate_text($module_name, 'module_small', false, true, false, '...', false); - - $module_name_list[$i] = $agent_name . " / " . $module_name; + if (!empty($name_list) && $names_number == $module_number && isset($name_list[$i])) { + $module_name_list[$i] = $name_list[$i]; + } + else { + //Get and process agent name + $agent_name = io_safe_output( + modules_get_agentmodule_agent_name ($agent_module_id)); + $agent_name = ui_print_truncate_text($agent_name, 'agent_small', false, true, false, '...', false); + + + $agent_id = agents_get_agent_id ($agent_name); + + //Get and process module name + $module_name = io_safe_output( + modules_get_agentmodule_name ($agent_module_id)); + $module_name = ui_print_truncate_text($module_name, 'module_small', false, true, false, '...', false); + + $module_name_list[$i] = $agent_name . " / " . $module_name; + } + $id_module_type = modules_get_agentmodule_type ($agent_module_id); $module_type = modules_get_moduletype_name ($id_module_type); $uncompressed_module = is_module_uncompressed ($module_type); @@ -1198,19 +1220,61 @@ function graphic_combined_module ($module_list, $weight_list, $period, $avg = round($avg / $countAvg, 1); $graph_stats = get_graph_statistics($graph_values[$i]); + + if (!isset($config["short_module_graph_data"])) + $config["short_module_graph_data"] = true; - $min = $graph_stats['min']; - $max = $graph_stats['max']; - $avg = $graph_stats['avg']; - $last = $graph_stats['last']; - $units = modules_get_unit($agent_module_id); + if ($config["short_module_graph_data"]) { + $min = $graph_stats['min']; + $max = $graph_stats['max']; + $avg = $graph_stats['avg']; + $last = $graph_stats['last']; + + if ($min > 1000000) + $min = sprintf("%sM", number_format($min / 1000000, 2)); + else if ($min > 1000) + $min = sprintf("%sK", number_format($min / 1000, 2)); + + if ($max > 1000000) + $max = sprintf("%sM", number_format($max / 1000000, 2)); + else if ($max > 1000) + $max = sprintf("%sK", number_format($max / 1000, 2)); + + if ($avg > 1000000) + $avg = sprintf("%sM", number_format($avg / 1000000, 2)); + else if ($avg > 1000) + $avg = sprintf("%sK", number_format($avg / 1000, 2)); + + if ($last > 1000000) + $last = sprintf("%sM", number_format($last / 1000000, 2)); + else if ($last > 1000) + $last = sprintf("%sK", number_format($last / 1000, 2)); + } + else { + $min = number_format($graph_stats['min'], 2); + $max = number_format($graph_stats['max'], 2); + $avg = number_format($graph_stats['avg'], 2); + $last = number_format($graph_stats['last'], 2); + } + + + if (!empty($unit_list) && $units_number == $module_number && isset($unit_list[$i])) { + $unit = $unit_list[$i]; + } + else { + $unit = modules_get_unit($agent_module_id); + } if ($projection == false or ($projection != false and $i == 0)) { - $module_name_list[$i] .= ": " . - __('Last') . ": $last $units; " . - __("Max") . ": $max $units; " . - __("Min") . ": $min $units; " . - __("Avg") . ": $avg"; + $module_name_list[$i] .= ": "; + if ($show_last) + $module_name_list[$i] .= __('Last') . ": $last $unit; "; + if ($show_max) + $module_name_list[$i] .= __("Max") . ": $max $unit; "; + if ($show_min) + $module_name_list[$i] .= __("Min") . ": $min $unit; "; + if ($show_avg) + $module_name_list[$i] .= __("Avg") . ": $avg $unit"; } if ($weight_list[$i] != 1) { diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php index ca3e9b4e4f..78aa6df80d 100644 --- a/pandora_console/include/functions_groups.php +++ b/pandora_console/include/functions_groups.php @@ -250,7 +250,7 @@ function groups_get_childrens($parent, $groups = null, $onlyPropagate = false) { if ($group['propagate'] || $onlyPropagate) { if ($group['parent'] == $parent) { - $return = $return + array($group['id_grupo'] => $group) + groups_get_childrens($group['id_grupo'], $groups); + $return = $return + array($group['id_grupo'] => $group) + groups_get_childrens($group['id_grupo'], $groups, $onlyPropagate); } } @@ -869,8 +869,19 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) { // Get stats for this group $data = reporting_get_group_stats($id_group); - if ($data["total_agents"] == 0) - return; // Skip empty groups + if ($data["total_agents"] == 0) { + if (!empty($group['childs'])) { + $group_childrens = groups_get_childrens($id_group, null, true); + $group_childrens_agents = groups_total_agents(array_keys($group_childrens)); + + if (empty($group_childrens_agents)) { + return; // Skip empty groups + } + } + else { + return; // Skip empty groups + } + } // Calculate entire row color if ($data["monitor_alerts_fired"] > 0) { diff --git a/pandora_console/install.php b/pandora_console/install.php index 2d454e5eaf..4091bcf851 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -63,7 +63,7 @@
(int) $params['traffic_module_in'], - 'out' => (int) $params['traffic_module_out'] + __('In') => (int) $params['traffic_module_in'], + __('Out') => (int) $params['traffic_module_out'] ); ?> @@ -69,7 +69,7 @@ $interface_traffic_modules = array( 0) { $query = ui_get_url_refresh(false); @@ -135,8 +135,20 @@ $interface_traffic_modules = array( else echo '
'; - $modules = array($interface_traffic_modules['in'], $interface_traffic_modules['out']); - custom_graphs_print(0, $height, $width, $period, null, false, $date, false, 'white', $modules, $config['homeurl']); + custom_graphs_print(0, + $height, + $width, + $period, + null, + false, + $date, + false, + 'white', + array_values($interface_traffic_modules), + $config['homeurl'], + array_keys($interface_traffic_modules), + array_fill(0, count($interface_traffic_modules),"bytes/s"), + false); echo '
'; diff --git a/pandora_console/operation/snmpconsole/snmp_statistics.php b/pandora_console/operation/snmpconsole/snmp_statistics.php new file mode 100644 index 0000000000..d5d6cc8500 --- /dev/null +++ b/pandora_console/operation/snmpconsole/snmp_statistics.php @@ -0,0 +1,209 @@ +' . + html_print_image("images/normal_screen.png", true, array("title" => __('Normal screen'))) . ''; +} +else { + $fullscreen['text'] = '' . + html_print_image("images/full_screen.png", true, array("title" => __('Full screen'))) . ''; +} + +// List +$list = array(); +$list['text'] = '' . + html_print_image("images/op_snmp.png", true, array ("title" => __('List'))) .''; + +// Statistics (This file) +$statistics = array(); +$statistics['active'] = true; +$statistics['text'] = '' . + html_print_image("images/op_reporting.png", true, array ("title" => __('Statistics'))) .''; + +// Header +ui_print_page_header(__("SNMP Console"), "images/op_snmp.png", false, + "", false, array($fullscreen, $list, $statistics)); + +// Retrieving the data + +$user_groups = users_get_groups($config['id_user'], "AR", false); +$user_groups_str = '0'; +if (!empty($user_groups)) { + $user_groups_str = implode(",", array_keys($user_groups)); +} + +$last_month_timestamp = date("Y-m-d H:i:s", time() - SECONDS_1MONTH); + +$sql_traps_generated = "SELECT %s, COUNT(id_trap) AS num + FROM ttrap + WHERE timestamp >= '%s' + AND (source = '' + OR source NOT IN (SELECT direccion FROM tagente) + OR source IN (SELECT direccion + FROM tagente + WHERE id_grupo IN (%s))) + GROUP BY %s + ORDER BY num DESC, timestamp DESC + LIMIT 25"; + +$sql_traps_generated_by_source = sprintf($sql_traps_generated, "source", $last_month_timestamp, $user_groups_str, "source"); +$sql_traps_generated_by_oid = sprintf($sql_traps_generated, "oid", $last_month_timestamp, $user_groups_str, "oid"); + +$traps_generated_by_source = db_get_all_rows_sql($sql_traps_generated_by_source); +$traps_generated_by_oid = db_get_all_rows_sql($sql_traps_generated_by_oid); + +// No traps +if (empty($traps_generated_by_source) || empty($traps_generated_by_oid)) { + echo '
'.__('There are no SNMP traps in database').'
'; + return; +} + +$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", + 'url' => ui_get_full_url("/images/logo_vertical_water.png")); + +// By SOURCE +$table_source = new StdClass(); +$table_source->width = '100%'; +$table_source->head[] = __("Traps received by source") . " - " . sprintf(__('Top %d'), 25); +$table_source->head_colspan[] = 2; +$table_source->headstyle[] = "background-color: #82b92e"; +$table_source->size = array(); +$table_source->size['table'] = '50%'; +$table_source->size['graph'] = '50%'; +$table_source->data = array(); + +$table_source_row = array(); + +$table_source_data = new StdClass(); +$table_source_data->width = '100%'; +$table_source_data->head = array(); +$table_source_data->head['source'] = __('Source IP'); +$table_source_data->head['num'] = __('Number'); +$table_source_data->data = array(); + +$table_source_graph_data = array(); + +foreach ($traps_generated_by_source as $trap) { + $row = array(); + + $agent = agents_get_agent_with_ip($trap['source']); + if ($agent === false) { + $row['source'] = ''.$trap["source"].''; + } + else { + $agent_id = $agent["id_agente"]; + $agent_name = ui_print_truncate_text($agent["nombre"], "agent_medium", true, true, true, '[…]', ''); + $row['source'] = ""; + $row['source'] .= "$agent_name"; + } + $row['num'] = (int) $trap['num']; + + $table_source_data->data[] = $row; + + $table_source_graph_data[$trap["source"]] = (int) $trap["num"]; +} + +$table_source_row['table'] = html_print_table($table_source_data, true); +unset($table_source_data); + +if (empty($table_source_graph_data)) + $table_source_graph = graph_nodata_image(); +else + $table_source_graph = pie3d_graph($config['flash_charts'], $table_source_graph_data, 400, 550, __("Other"), + '', $water_mark, $config['fontpath'], $config['font_size'], 1); + +$table_source_row['graph'] = $table_source_graph; + +$table_source->data[] = $table_source_row; + +html_print_table($table_source); +unset($table_source); + +// By OID +$table_oid = new StdClass(); +$table_oid->width = '100%'; +$table_oid->head[] = __("Traps received by OID") . " - " . sprintf(__('Top %d'), 25); +$table_oid->head_colspan[] = 2; +$table_oid->headstyle[] = "background-color: #82b92e"; +$table_oid->size = array(); +$table_oid->size['table'] = '50%'; +$table_oid->size['graph'] = '50%'; +$table_oid->data = array(); + +$table_oid_row = array(); + +$table_oid_data = new StdClass(); +$table_oid_data->width = '100%'; +$table_oid_data->head = array(); +$table_oid_data->head['oid'] = __('Trap OID'); +$table_oid_data->head['num'] = __('Number'); +$table_oid_data->data = array(); + +$table_oid_graph_data = array(); + +foreach ($traps_generated_by_oid as $trap) { + $table_oid_data->data[] = array( + 'oid' => $trap['oid'], + 'num' => (int) $trap['num'] + ); + + $table_oid_graph_data[$trap["oid"]] = (int) $trap["num"]; +} + +$table_oid_row['table'] = html_print_table($table_oid_data, true); +unset($table_oid_data); + +if (empty($table_oid_graph_data)) + $table_oid_graph = graph_nodata_image(); +else + $table_oid_graph = pie3d_graph($config['flash_charts'], $table_oid_graph_data, 400, 550, __("Other"), + '', $water_mark, $config['fontpath'], $config['font_size'], 1); + +$table_oid_row['graph'] = $table_oid_graph; + +$table_oid->data[] = $table_oid_row; + +html_print_table($table_oid); +unset($table_oid); + +?> \ No newline at end of file diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php index 8e16bd4993..c2372746ce 100644 --- a/pandora_console/operation/snmpconsole/snmp_view.php +++ b/pandora_console/operation/snmpconsole/snmp_view.php @@ -40,7 +40,6 @@ $offset = (int) get_parameter ('offset',0); $trap_type = (int) get_parameter ('trap_type', -1); $group_by = (int)get_parameter('group_by', 0); $refr = (int)get_parameter("refr", 0); -$tab = (string) get_parameter("tab"); $user_groups = users_get_groups ($config['id_user'],"AR", false); $str_user_groups = ''; @@ -65,22 +64,11 @@ $url = "index.php?sec=estado&" . "trap_type=" . $trap_type . "&" . "group_by=" .$group_by; -switch ($tab) { - case 'statistics': - $statistics['active'] = true; - break; - - default: - $list['active'] = true; - break; -} -$statistics['text'] = '' . +$statistics['text'] = '' . html_print_image("images/op_reporting.png", true, array ("title" => __('Statistics'))) .''; $list['text'] = '' . html_print_image("images/op_snmp.png", true, array ("title" => __('List'))) .''; - -if ($tab) - $url .= "&tab=$tab"; +$list['active'] = true; if ($config["pure"]) { $fullscreen['text'] = '' . html_print_image("images/normal_screen.png", true, array("title" => __('Normal screen'))) . ''; @@ -354,441 +342,372 @@ ui_toggle($filter, __('Toggle filter(s)')); unset ($table); -if ($tab == '') { - - $traps = db_get_all_rows_sql($sql); - $trapcount = (int) db_get_value_sql($sql_count); - - // No traps - if (empty ($traps)) { - echo '
'.__('There are no SNMP traps in database').'
'; - return; - } - - if (($config['dbtype'] == 'oracle') && ($traps !== false)) { - for ($i=0; $i < count($traps); $i++) { - unset($traps[$i]['rnum']); - } - } - - $url_snmp = "index.php?" . - "sec=snmpconsole&" . - "sec2=operation/snmpconsole/snmp_view&" . - "filter_severity=" . $filter_severity . "&" . - "filter_fired=" . $filter_fired . "&" . - "filter_status=" . $filter_status . "&" . - "refr=" . ((int)get_parameter('refr', 0)) . "&" . - "pure=" . $config["pure"] . "&" . - "group_by=" . $group_by . "&" . - "free_search_string=" . $free_search_string; - - $urlPagination = $url_snmp . "&pagination=" . $pagination . "&offset=" . $offset; - - ui_pagination ($trapcount, $urlPagination, $offset, $pagination); - - echo '
'; - - $table->cellpadding = 4; - $table->cellspacing = 4; - $table->width = '99%'; - $table->class = "databox"; - $table->head = array (); - $table->size = array (); - $table->data = array (); - $table->align = array (); - - $table->head[0] = __('Status'); - $table->align[0] = "center"; - $table->size[0] = '5%'; - - $table->head[1] = __('SNMP Agent'); - $table->align[1] = "center"; - $table->size[1] = '15%'; - - $table->head[2] = __('OID'); - $table->align[2] = "center"; - $table->size[2] = '18%'; - - if ($group_by) { - $table->head[3] = __('Count'); - $table->align[3] = "center"; - $table->size[3] = '5%'; - } - - $table->head[4] = __('Value'); - $table->align[4] = "center"; - $table->size[4] = '10%'; - - $table->head[5] = __('User ID'); - $table->align[5] = "center"; - $table->size[5] = '10%'; - - $table->head[6] = __('Timestamp'); - $table->align[6] = "center"; - $table->size[6] = '10%'; - - $table->head[7] = __('Alert'); - $table->align[7] = "center"; - $table->size[7] = '5%'; - - $table->head[8] = __('Action'); - $table->align[8] = "center"; - $table->size[8] = '10%'; - - $table->head[9] = html_print_checkbox_extended ("allbox", 1, false, false, "javascript:CheckAll();", 'class="chk" title="'.__('All').'"', true); - $table->align[9] = "center"; - $table->size[9] = '5%'; - - $table->style[8] = "background: #F3F3F3; color: #111 !important;"; - - // Skip offset records - $idx = 0; - if ($traps !== false) { - - foreach ($traps as $trap) { - $data = array (); - if (empty($trap["description"])){ - $trap["description"]=""; - } - $severity = enterprise_hook ('get_severity', array ($trap)); - if ($severity === ENTERPRISE_NOT_HOOK) { - $severity = $trap["alerted"] == 1 ? $trap["priority"] : 1; - } - - //Status - if ($trap["status"] == 0) { - $data[0] = html_print_image("images/pixel_red.png", true, array("title" => __('Not validated'), "width" => "20", "height" => "20")); - } - else { - $data[0] = html_print_image("images/pixel_green.png", true, array("title" => __('Validated'), "width" => "20", "height" => "20")); - } - - // Agent matching source address - $table->cellclass[$idx][1] = get_priority_class ($severity); - $agent = agents_get_agent_with_ip ($trap['source']); - if ($agent === false) { - if (! check_acl ($config["id_user"], 0, "AR")) { - continue; - } - $data[1] = ''.$trap["source"].''; - } - else { - if (! check_acl ($config["id_user"], $agent["id_grupo"], "AR")) { - continue; - } - $data[1] = ''; - $data[1] .= ''.$agent["nombre"].''; - } - - //OID - $table->cellclass[$idx][2] = get_priority_class ($severity); - $data[2] = '' . (empty($trap["oid"]) ? __('N/A') : $trap["oid"]) .''; - - //Count - if ($group_by) { - $sql = "SELECT * FROM ttrap WHERE 1=1 - $where_without_group - AND oid='".$trap['oid']."' - AND source='".$trap['source']."'"; - $group_traps = db_get_all_rows_sql($sql); - $count_group_traps = count($group_traps); - $table->cellclass[$idx][3] = get_priority_class ($severity); - $data[3] = ''.$count_group_traps.''; - } - //Value - $table->cellclass[$idx][4] = get_priority_class ($severity); - if (empty ($trap["value"])) { - $data[4] = __('N/A'); - } - else { - $data[4] = ui_print_truncate_text($trap["value"], GENERIC_SIZE_TEXT, false); - } - - //User - $table->cellclass[$idx][5] = get_priority_class ($severity); - if (!empty ($trap["status"])) { - $data[5] = ''.substr ($trap["id_usuario"], 0, 8).''; - if (!empty($trap["id_usuario"])) - $data[5] .= ui_print_help_tip(get_user_fullname($trap["id_usuario"]), true); - } - else { - $data[5] = '--'; - } - - // Timestamp - $table->cellclass[$idx][6] = get_priority_class ($severity); - $data[6] = ''; - $data[6] .= ui_print_timestamp ($trap["timestamp"], true); - $data[6] .= ''; - - // Use alert severity if fired - if (!empty ($trap["alerted"])) { - $data[7] = html_print_image("images/pixel_yellow.png", true, array("width" => "20", "height" => "20", "border" => "0", "title" => __('Alert fired'))); - } - else { - $data[7] = html_print_image("images/pixel_gray.png", true, array("width" => "20", "height" => "20", "border" => "0", "title" => __('Alert not fired'))); - } - - //Actions - $data[8] = ""; - - if (empty ($trap["status"]) && check_acl ($config["id_user"], 0, "IW")) { - $data[8] .= '' . html_print_image("images/ok.png", true, array("border" => '0', "title" => __('Validate'))) . ' '; - } - if ($trap['source'] == '') { - $is_admin = db_get_value('is_admin', 'tusuario', 'id_user',$config['id_user']); - if ($is_admin) { - $data[8] .= '' . html_print_image("images/cross.png", true, array("border" => "0", "title" => __('Delete'))) . ' '; - } - } else { - $agent_trap_group = db_get_value('id_grupo', 'tagente', 'nombre', $trap['source']); - if ((check_acl ($config["id_user"], $agent_trap_group, "AW"))) { - $data[8] .= '' . html_print_image("images/cross.png", true, array("border" => "0", "title" => __('Delete'))) . ' '; - } - } - - $data[8] .= '' . html_print_image("images/eye.png", true, array("alt" => __('Show more'), "title" => __('Show more'))) .''; - $data[8] .= enterprise_hook ('editor_link', array ($trap)); - - - $data[9] = html_print_checkbox_extended ("snmptrapid[]", $trap["id_trap"], false, false, '', 'class="chk"', true); - - array_push ($table->data, $data); - - //Hiden file for description - $string = ' - - - - - - - - '; - - if ($trap["description"] != "") { - $string .= ' - - - '; - } - - if ($trap["type"] != "") { - $trap_types = array(-1 => __('None'), 0 => __('Cold start (0)'), 1 => __('Warm start (1)'), 2 => __('Link down (2)'), 3 => __('Link up (3)'), 4 => __('Authentication failure (4)'), 5 => __('Other')); - - switch ($trap["type"]) { - case -1: - $desc_trap_type = __('None'); - break; - case 0: - $desc_trap_type = __('Cold start (0)'); - break; - case 1: - $desc_trap_type = __('Warm start (1)'); - break; - case 2: - $desc_trap_type = __('Link down (2)'); - break; - case 3: - $desc_trap_type = __('Link up (3)'); - break; - case 4: - $desc_trap_type = __('Authentication failure (4)'); - break; - default: - $desc_trap_type = __('Other'); - break; - } - $string .= ''; - } - - if ($group_by) { - $sql = "SELECT * FROM ttrap WHERE 1=1 - $where_without_group - AND oid='".$trap['oid']."' - AND source='".$trap['source']."'"; - $group_traps = db_get_all_rows_sql($sql); - $count_group_traps = count($group_traps); - - $sql = "SELECT timestamp FROM ttrap WHERE 1=1 - $where_without_group - AND oid='".$trap['oid']."' - AND source='".$trap['source']."' - ORDER BY `timestamp` DESC"; - $last_trap = db_get_value_sql($sql); - - $sql = "SELECT timestamp FROM ttrap WHERE 1=1 - $where_without_group - AND oid='".$trap['oid']."' - AND source='".$trap['source']."' - ORDER BY `timestamp` ASC"; - $first_trap = db_get_value_sql($sql); - - $string .= ' - - - '; - $string .= ' - - - '; - $string .= ' - - - '; - - } - $string .= '
' . __('Custom data:') . ''; - - if ($group_by) { - $new_url = "index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&" . - "filter_severity=" . $filter_severity . "&" . - "filter_fired=" . $filter_fired . "&" . - "filter_status=" . $filter_status . "&" . - "refr=" . ((int)get_parameter('refr', 0)) . "&" . - "pure=" . $config["pure"] . "&" . - "group_by=0&" . - "free_search_string=" . $free_search_string; - - $string .= ''.__('See more details').''; - } else { - // Print binding vars separately - $binding_vars = explode ("\t", $trap['oid_custom']); - foreach ($binding_vars as $var) { - $string .= $var . "
"; - } - } - - $string .= '
' . '' . __('OID:') . ' ' . $trap['oid'] . '
' . '' . __('Description:') . '' . $trap['description'] . '
' . '' . __('Type:') . '' . $desc_trap_type . '
' . '' . __('Count:') . '' . $count_group_traps . '
' . '' . __('First trap:') . '' . $first_trap . '
' . '' . __('Last trap:') . '' . $last_trap . '
'; - - $data = array($string); //$data = array($trap['description']); - $idx++; - $table->rowclass[$idx] = 'trap_info_' . $trap['id_trap']; - $table->colspan[$idx][0] = 10; - $table->rowstyle[$idx] = 'display: none;'; - array_push ($table->data, $data); - - $idx++; - } - } - - // No matching traps - if ($idx == 0) { - echo '
' . __('No matching traps found') . '
'; - } - else { - html_print_table ($table); - } - - unset ($table); - - echo '
'; - if (check_acl ($config["id_user"], 0, "IW")) { - html_print_submit_button (__('Validate'), "updatebt", false, 'class="sub ok"'); - } - - if (check_acl ($config['id_user'], 0, "IM")) { - echo " "; - html_print_submit_button (__('Delete'), "deletebt", false, 'class="sub delete" onClick="javascript:return confirm(\''.__('Are you sure?').'\')"'); - } - echo "
"; - - - echo '
'; - echo '

' . __('Status') . '

'; - echo html_print_image("images/pixel_green.png", true, array("width" => "20", "height" => "20")) . ' - ' . __('Validated'); - echo '
'; - echo html_print_image("images/pixel_red.png", true, array("width" => "20", "height" => "20")) . ' - ' . __('Not validated'); - echo '
'; - echo '
'; - echo '

' . __('Alert') . '

'; - echo html_print_image("images/pixel_yellow.png", true, array("width" => "20", "height" => "20")) . ' - ' .__('Fired'); - echo '
'; - echo html_print_image("images/pixel_gray.png", true, array("width" => "20", "height" => "20")) . ' - ' . __('Not fired'); - echo '
'; - echo '
'; - echo '

' . __('Action') . '

'; - echo html_print_image("images/ok.png", true) . ' - ' .__('Validate'); - echo '
'; - echo html_print_image("images/cross.png", true) . ' - ' . __('Delete'); - echo '
'; - echo '
'; - echo '

'.__('Legend').'

'; - foreach (get_priorities () as $num => $name) { - echo ''.$name.''; - echo '
'; - } - echo '
'; - echo '
 
'; +$traps = db_get_all_rows_sql($sql); +$trapcount = (int) db_get_value_sql($sql_count); +// No traps +if (empty ($traps)) { + echo '
'.__('There are no SNMP traps in database').'
'; + return; } -else { - $traps = db_get_all_rows_sql($sql_all); - $trapcount = (int) db_get_value_sql($sql_count); - - // No traps - if (empty ($traps)) { - echo '
'.__('There are no SNMP traps in database').'
'; - return; +if (($config['dbtype'] == 'oracle') && ($traps !== false)) { + for ($i=0; $i < count($traps); $i++) { + unset($traps[$i]['rnum']); } +} - if (($config['dbtype'] == 'oracle') && ($traps !== false)) { - for ($i=0; $i < count($traps); $i++) { - unset($traps[$i]['rnum']); - } - } +$url_snmp = "index.php?" . + "sec=snmpconsole&" . + "sec2=operation/snmpconsole/snmp_view&" . + "filter_severity=" . $filter_severity . "&" . + "filter_fired=" . $filter_fired . "&" . + "filter_status=" . $filter_status . "&" . + "refr=" . ((int)get_parameter('refr', 0)) . "&" . + "pure=" . $config["pure"] . "&" . + "group_by=" . $group_by . "&" . + "free_search_string=" . $free_search_string; - include_once($config['homedir'] . '/include/functions_graph.php'); +$urlPagination = $url_snmp . "&pagination=" . $pagination . "&offset=" . $offset; + +ui_pagination ($trapcount, $urlPagination, $offset, $pagination); + +echo '
'; + +$table->cellpadding = 4; +$table->cellspacing = 4; +$table->width = '99%'; +$table->class = "databox"; +$table->head = array (); +$table->size = array (); +$table->data = array (); +$table->align = array (); + +$table->head[0] = __('Status'); +$table->align[0] = "center"; +$table->size[0] = '5%'; + +$table->head[1] = __('SNMP Agent'); +$table->align[1] = "center"; +$table->size[1] = '15%'; + +$table->head[2] = __('OID'); +$table->align[2] = "center"; +$table->size[2] = '18%'; + +if ($group_by) { + $table->head[3] = __('Count'); + $table->align[3] = "center"; + $table->size[3] = '5%'; +} + +$table->head[4] = __('Value'); +$table->align[4] = "center"; +$table->size[4] = '10%'; + +$table->head[5] = __('User ID'); +$table->align[5] = "center"; +$table->size[5] = '10%'; + +$table->head[6] = __('Timestamp'); +$table->align[6] = "center"; +$table->size[6] = '10%'; + +$table->head[7] = __('Alert'); +$table->align[7] = "center"; +$table->size[7] = '5%'; + +$table->head[8] = __('Action'); +$table->align[8] = "center"; +$table->size[8] = '10%'; + +$table->head[9] = html_print_checkbox_extended ("allbox", 1, false, false, "javascript:CheckAll();", 'class="chk" title="'.__('All').'"', true); +$table->align[9] = "center"; +$table->size[9] = '5%'; + +$table->style[8] = "background: #F3F3F3; color: #111 !important;"; + +// Skip offset records +$idx = 0; +if ($traps !== false) { - $data_aux = array(); foreach ($traps as $trap) { - $source = $trap['source']; - $oid = $trap['oid']; - - if (!isset($data_aux[$source])) - $data_aux[$source] = array(); - - if (!isset($data_aux[$source][$oid])) - $data_aux[$source][$oid] = array('num' => 1, 'text' => ''); - else { - $data_aux[$source][$oid]['num']++; - if (empty($data_aux[$source][$oid]['text'])) - $data_aux[$source][$oid]['text'] = $trap['text']; + $data = array (); + if (empty($trap["description"])){ + $trap["description"]=""; + } + $severity = enterprise_hook ('get_severity', array ($trap)); + if ($severity === ENTERPRISE_NOT_HOOK) { + $severity = $trap["alerted"] == 1 ? $trap["priority"] : 1; } - } - - $id = -1; - $data = array(); - - if (!empty($traps)) { - $data['name'] = __("Traps received by source"); - $data['children'] = array(); - - foreach ($data_aux as $source => $oid_data) { - $children = array(); - $children['id'] = $id++; - $children['name'] = $source; - $children['children'] = array(); - foreach ($oid_data as $oid => $values) { - $children_data = array(); - $children_data['id'] = $id++; - $children_data['name'] = $oid; - $children_data['value'] = $values['num']; - $children_data['tooltip_content'] = ''; - if (!empty($values['text'])) - $children_data['tooltip_content'] .= "" . $values['text'] . "
"; - $children_data['tooltip_content'] .= sprintf(__('%d traps received from this source with this oid'), $values['num']); - $children['children'][] = $children_data; - } - $data['children'][] = $children; + //Status + if ($trap["status"] == 0) { + $data[0] = html_print_image("images/pixel_red.png", true, array("title" => __('Not validated'), "width" => "20", "height" => "20")); } + else { + $data[0] = html_print_image("images/pixel_green.png", true, array("title" => __('Validated'), "width" => "20", "height" => "20")); + } + + // Agent matching source address + $table->cellclass[$idx][1] = get_priority_class ($severity); + $agent = agents_get_agent_with_ip ($trap['source']); + if ($agent === false) { + if (! check_acl ($config["id_user"], 0, "AR")) { + continue; + } + $data[1] = ''.$trap["source"].''; + } + else { + if (! check_acl ($config["id_user"], $agent["id_grupo"], "AR")) { + continue; + } + $data[1] = ''; + $data[1] .= ''.$agent["nombre"].''; + } + + //OID + $table->cellclass[$idx][2] = get_priority_class ($severity); + $data[2] = '' . (empty($trap["oid"]) ? __('N/A') : $trap["oid"]) .''; + + //Count + if ($group_by) { + $sql = "SELECT * FROM ttrap WHERE 1=1 + $where_without_group + AND oid='".$trap['oid']."' + AND source='".$trap['source']."'"; + $group_traps = db_get_all_rows_sql($sql); + $count_group_traps = count($group_traps); + $table->cellclass[$idx][3] = get_priority_class ($severity); + $data[3] = ''.$count_group_traps.''; + } + //Value + $table->cellclass[$idx][4] = get_priority_class ($severity); + if (empty ($trap["value"])) { + $data[4] = __('N/A'); + } + else { + $data[4] = ui_print_truncate_text($trap["value"], GENERIC_SIZE_TEXT, false); + } + + //User + $table->cellclass[$idx][5] = get_priority_class ($severity); + if (!empty ($trap["status"])) { + $data[5] = ''.substr ($trap["id_usuario"], 0, 8).''; + if (!empty($trap["id_usuario"])) + $data[5] .= ui_print_help_tip(get_user_fullname($trap["id_usuario"]), true); + } + else { + $data[5] = '--'; + } + + // Timestamp + $table->cellclass[$idx][6] = get_priority_class ($severity); + $data[6] = ''; + $data[6] .= ui_print_timestamp ($trap["timestamp"], true); + $data[6] .= ''; + + // Use alert severity if fired + if (!empty ($trap["alerted"])) { + $data[7] = html_print_image("images/pixel_yellow.png", true, array("width" => "20", "height" => "20", "border" => "0", "title" => __('Alert fired'))); + } + else { + $data[7] = html_print_image("images/pixel_gray.png", true, array("width" => "20", "height" => "20", "border" => "0", "title" => __('Alert not fired'))); + } + + //Actions + $data[8] = ""; + + if (empty ($trap["status"]) && check_acl ($config["id_user"], 0, "IW")) { + $data[8] .= '' . html_print_image("images/ok.png", true, array("border" => '0', "title" => __('Validate'))) . ' '; + } + if ($trap['source'] == '') { + $is_admin = db_get_value('is_admin', 'tusuario', 'id_user',$config['id_user']); + if ($is_admin) { + $data[8] .= '' . html_print_image("images/cross.png", true, array("border" => "0", "title" => __('Delete'))) . ' '; + } + } else { + $agent_trap_group = db_get_value('id_grupo', 'tagente', 'nombre', $trap['source']); + if ((check_acl ($config["id_user"], $agent_trap_group, "AW"))) { + $data[8] .= '' . html_print_image("images/cross.png", true, array("border" => "0", "title" => __('Delete'))) . ' '; + } + } + + $data[8] .= '' . html_print_image("images/eye.png", true, array("alt" => __('Show more'), "title" => __('Show more'))) .''; + $data[8] .= enterprise_hook ('editor_link', array ($trap)); + + + $data[9] = html_print_checkbox_extended ("snmptrapid[]", $trap["id_trap"], false, false, '', 'class="chk"', true); + + array_push ($table->data, $data); + + //Hiden file for description + $string = ' + + + + + + + + '; + + if ($trap["description"] != "") { + $string .= ' + + + '; + } + + if ($trap["type"] != "") { + $trap_types = array(-1 => __('None'), 0 => __('Cold start (0)'), 1 => __('Warm start (1)'), 2 => __('Link down (2)'), 3 => __('Link up (3)'), 4 => __('Authentication failure (4)'), 5 => __('Other')); + + switch ($trap["type"]) { + case -1: + $desc_trap_type = __('None'); + break; + case 0: + $desc_trap_type = __('Cold start (0)'); + break; + case 1: + $desc_trap_type = __('Warm start (1)'); + break; + case 2: + $desc_trap_type = __('Link down (2)'); + break; + case 3: + $desc_trap_type = __('Link up (3)'); + break; + case 4: + $desc_trap_type = __('Authentication failure (4)'); + break; + default: + $desc_trap_type = __('Other'); + break; + } + $string .= ''; + } + + if ($group_by) { + $sql = "SELECT * FROM ttrap WHERE 1=1 + $where_without_group + AND oid='".$trap['oid']."' + AND source='".$trap['source']."'"; + $group_traps = db_get_all_rows_sql($sql); + $count_group_traps = count($group_traps); + + $sql = "SELECT timestamp FROM ttrap WHERE 1=1 + $where_without_group + AND oid='".$trap['oid']."' + AND source='".$trap['source']."' + ORDER BY `timestamp` DESC"; + $last_trap = db_get_value_sql($sql); + + $sql = "SELECT timestamp FROM ttrap WHERE 1=1 + $where_without_group + AND oid='".$trap['oid']."' + AND source='".$trap['source']."' + ORDER BY `timestamp` ASC"; + $first_trap = db_get_value_sql($sql); + + $string .= ' + + + '; + $string .= ' + + + '; + $string .= ' + + + '; + + } + $string .= '
' . __('Custom data:') . ''; + + if ($group_by) { + $new_url = "index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&" . + "filter_severity=" . $filter_severity . "&" . + "filter_fired=" . $filter_fired . "&" . + "filter_status=" . $filter_status . "&" . + "refr=" . ((int)get_parameter('refr', 0)) . "&" . + "pure=" . $config["pure"] . "&" . + "group_by=0&" . + "free_search_string=" . $free_search_string; + + $string .= ''.__('See more details').''; + } else { + // Print binding vars separately + $binding_vars = explode ("\t", $trap['oid_custom']); + foreach ($binding_vars as $var) { + $string .= $var . "
"; + } + } + + $string .= '
' . '' . __('OID:') . ' ' . $trap['oid'] . '
' . '' . __('Description:') . '' . $trap['description'] . '
' . '' . __('Type:') . '' . $desc_trap_type . '
' . '' . __('Count:') . '' . $count_group_traps . '
' . '' . __('First trap:') . '' . $first_trap . '
' . '' . __('Last trap:') . '' . $last_trap . '
'; + + $data = array($string); //$data = array($trap['description']); + $idx++; + $table->rowclass[$idx] = 'trap_info_' . $trap['id_trap']; + $table->colspan[$idx][0] = 10; + $table->rowstyle[$idx] = 'display: none;'; + array_push ($table->data, $data); + + $idx++; } - - echo graph_snmp_traps_treemap($data, 'auto', 500); } +// No matching traps +if ($idx == 0) { + echo '
' . __('No matching traps found') . '
'; +} +else { + html_print_table ($table); +} + +unset ($table); + +echo '
'; +if (check_acl ($config["id_user"], 0, "IW")) { + html_print_submit_button (__('Validate'), "updatebt", false, 'class="sub ok"'); +} + +if (check_acl ($config['id_user'], 0, "IM")) { + echo " "; + html_print_submit_button (__('Delete'), "deletebt", false, 'class="sub delete" onClick="javascript:return confirm(\''.__('Are you sure?').'\')"'); +} +echo "
"; + + +echo '
'; +echo '

' . __('Status') . '

'; +echo html_print_image("images/pixel_green.png", true, array("width" => "20", "height" => "20")) . ' - ' . __('Validated'); +echo '
'; +echo html_print_image("images/pixel_red.png", true, array("width" => "20", "height" => "20")) . ' - ' . __('Not validated'); +echo '
'; +echo '
'; +echo '

' . __('Alert') . '

'; +echo html_print_image("images/pixel_yellow.png", true, array("width" => "20", "height" => "20")) . ' - ' .__('Fired'); +echo '
'; +echo html_print_image("images/pixel_gray.png", true, array("width" => "20", "height" => "20")) . ' - ' . __('Not fired'); +echo '
'; +echo '
'; +echo '

' . __('Action') . '

'; +echo html_print_image("images/ok.png", true) . ' - ' .__('Validate'); +echo '
'; +echo html_print_image("images/cross.png", true) . ' - ' . __('Delete'); +echo '
'; +echo '
'; +echo '

'.__('Legend').'

'; +foreach (get_priorities () as $num => $name) { + echo ''.$name.''; + echo '
'; +} +echo '
'; +echo '
 
'; + + ?>