diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 8a88afb440..625f4a4af5 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ +2013-03-08 Sergio Martin + + * include/ajax/events.php + include/graphs/flot/pandora.flot.js: Improve the view + of events information in flot graphs for bug 3607101 + + * godmode/agentes/module_manager_editor_network.php + godmode/modules/manage_network_components_form.php + godmode/modules/manage_network_components_form_network.php: Fix + some bugs of module templates application and snmp modules edition + 2013-03-07 Mario Pulido *images/help/historyddbb.png,images/help/plugin1.png diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php index 3c873dc2cf..8f2fd17920 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_network.php +++ b/pandora_console/godmode/agentes/module_manager_editor_network.php @@ -80,7 +80,7 @@ else { $data[2] = _('SNMP version'); if ($id_module_type >= 15 && $id_module_type <= 18) { - $data[3] = html_print_select ($snmp_versions, 'snmp_version', $snmp_version, + $data[3] = html_print_select ($snmp_versions, 'snmp_version', $tcp_send, '', '', '', true, false, false, '', $disabledBecauseInPolicy); } else { diff --git a/pandora_console/godmode/modules/manage_network_components_form.php b/pandora_console/godmode/modules/manage_network_components_form.php index 4799c70e8b..58390e0566 100644 --- a/pandora_console/godmode/modules/manage_network_components_form.php +++ b/pandora_console/godmode/modules/manage_network_components_form.php @@ -35,6 +35,7 @@ if ($create_network_from_module) { $name = $data_module["nombre"]; $description = $data_module["descripcion"]; + $type = $data_module["id_tipo_modulo"]; $max = $data_module["max"]; $min = $data_module["min"]; $module_interval = $data_module["module_interval"]; diff --git a/pandora_console/godmode/modules/manage_network_components_form_network.php b/pandora_console/godmode/modules/manage_network_components_form_network.php index 27e5096cdb..c1544e6043 100644 --- a/pandora_console/godmode/modules/manage_network_components_form_network.php +++ b/pandora_console/godmode/modules/manage_network_components_form_network.php @@ -25,12 +25,10 @@ if (! check_acl ($config['id_user'], 0, "PM")) { return; } -if (! $id) { +if (!$id && !isset($snmp_community)) { $snmp_community = "public"; } - - $snmp_versions['1'] = 'v. 1'; $snmp_versions['2'] = 'v. 2'; $snmp_versions['2c'] = 'v. 2c'; diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 6cd8a61251..0f95a58a2b 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -401,24 +401,53 @@ if ($get_events_details) { foreach($events as $event) { switch($event["estado"]) { case 0: - $img = "../../images/star.png"; + $img = ui_get_full_url("images/star.png", false, false, false); $title = __('New event'); break; case 1: - $img = "../../images/tick.png"; + $img = ui_get_full_url("images/tick.png", false, false, false); $title = __('Event validated'); break; case 2: - $img = "../../images/hourglass.png"; + $img = ui_get_full_url("images/hourglass.png", false, false, false); $title = __('Event in process'); break; } - $out .= ''; - $out .= ''.$title.''; - $out .= ''; + $out .= ''; + $out .= ''; $out .= io_safe_output($event['evento']); - $out .= ''; + $out .= ''; + + $out .= ''; + $out .= ''; + $out .= html_print_image(ui_get_full_url('images/clock.png', false, false, false), true, array('title' => __('Timestamp')), false, true); + + $out .= ''; + $out .= ''; + $out .= date($config['date_format'], $event['utimestamp']); + $out .= ''; + + $out .= ''; + $out .= ''; + $out .= html_print_image($img, true, array('title' => $title), false, true); + $out .= ''; + $out .= ''; + $out .= $title; + if($event["estado"] == 1) { + if(empty($event['id_usuario'])) { + $ack_user = '' . __('Auto') . ''; + } + else { + $ack_user = $event['id_usuario']; + } + + $out .= ' (' . $ack_user . ')'; + } + + $out .= ''; + + $out .= ''; $out .= ''; $out .= ''; } diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index 31bc7e8a32..e4ddb113b6 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -852,12 +852,20 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors, switch(item.series.label) { case legend_alerts+series_suffix_str: case legend_alerts: - extra_info = ''+legend_alerts+' - '+labels_long[item.dataIndex]+''+get_event_details(alertsz[item.dataIndex]); + extra_info = ''+legend_alerts+':
From: '+labels_long[item.dataIndex]; + if(labels_long[item.dataIndex+1] != undefined) { + extra_info += '
To: '+labels_long[item.dataIndex+1]; + } + extra_info += ''+get_event_details(alertsz[item.dataIndex]); extra_show = true; break; case legend_events+series_suffix_str: case legend_events: - extra_info = ''+legend_events+' - '+labels_long[item.dataIndex]+''+get_event_details(eventsz[item.dataIndex]); + extra_info = ''+legend_events+':
From: '+labels_long[item.dataIndex]; + if(labels_long[item.dataIndex+1] != undefined) { + extra_info += '
To: '+labels_long[item.dataIndex+1]; + } + extra_info += ''+get_event_details(eventsz[item.dataIndex]); extra_show = true; break; default: @@ -1055,6 +1063,7 @@ function get_event_details (event_ids) { async: false, success: function (data) { table = data; + //forced_title_callback(); } }); }