From aafdb46bf6adcd1254a0206c72ac7b509a2a04e0 Mon Sep 17 00:00:00 2001 From: Sancho Lerena Date: Mon, 22 Sep 2014 16:08:29 +0200 Subject: [PATCH 01/10] Modified help files to include a few real examples of postprocess values. --- pandora_console/include/help/en/help_postprocess.php | 7 ++++++- pandora_console/include/help/es/help_postprocess.php | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/help/en/help_postprocess.php b/pandora_console/include/help/en/help_postprocess.php index 3b5f3b5bcd..985904e475 100644 --- a/pandora_console/include/help/en/help_postprocess.php +++ b/pandora_console/include/help/en/help_postprocess.php @@ -5,6 +5,11 @@ ?>

Post process

-Post process is a numeric value used after get data to numerical post process in a multiplier operation. For example a data with a value of 1000 with a Post Process value of 1024 will result in a definitive data of 1024000 value. This is useful to normalize data, convert between units, etc. This also can be used to divide, using a multiplier below 1 value, like, for example, 0.001 that will divide current value by 1000. +Post process is a numeric value used after get data to numerical post process in a multiplier operation. For example a data with a value of 1000 with a Post Process value of 1024 will result in a definitive data of 1024000 value. This is useful to normalize data, convert between units, etc. This also can be used to divide, using a multiplier below 1 value, like, for example, 0.001 that will divide current value by 1000. Some other interesting examples are: +
  • Convert timeticks (SNMP) to Days: 0.000000115740741 +
  • Convert bytes into MegaBytes: 0,00000095367432 +
  • Convert bytes into GigaBytes: 0,00000000093132 +
  • Convert megabits in megabytes: 0,125 +


  • An empty value, or 0, will disable the usage of post process (default). diff --git a/pandora_console/include/help/es/help_postprocess.php b/pandora_console/include/help/es/help_postprocess.php index cd3991156c..1e3b87ec9a 100644 --- a/pandora_console/include/help/es/help_postprocess.php +++ b/pandora_console/include/help/es/help_postprocess.php @@ -6,5 +6,13 @@

    Posprocesado

    El posprocesado es un valor numérico usado después de obtener el dato para posprocesar dicho dato de forma numérica en una multiplicación. Por ejemplo, datos con un valor de 1000 con un valor de Posprocesado de 1024 darán como resultado un valor final de 1024000. Esto es útil para normalizar los datos, convertir entre unidades, etc. Esto también se puede usar para dividir, usando un valor de multiplicador inferior a 1, como, por ejemplo, 0.001 que dividirá el valor actual por 1000. + +Algunos ejemplos interesantes, son por ejemplo:
    +
  • Convertir timeticks (SNMP) a Dias: 0.000000115740741 +
  • Convertir bytes en MegaBytes: 0,00000095367432 +
  • Convertir bytes en GigaBytes: 0,00000000093132 +
  • Convertir megabits en megabytes: 0,125 + +

    Un valor vacío o «0» desactivará el uso del posprocesado (predeterminado). From 5306e8dfcfb58774a150edce151454eaaf948a83 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Mon, 22 Sep 2014 16:53:35 +0200 Subject: [PATCH 02/10] Remove the (R) character from the Windows version string. --- pandora_agents/win32/windows/pandora_wmi.cc | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pandora_agents/win32/windows/pandora_wmi.cc b/pandora_agents/win32/windows/pandora_wmi.cc index adfb77cc02..c541d44745 100644 --- a/pandora_agents/win32/windows/pandora_wmi.cc +++ b/pandora_agents/win32/windows/pandora_wmi.cc @@ -372,8 +372,16 @@ Pandora_Wmi::getOSName () { dhGetValue (L"%s", &name, quickfix, L".Caption"); - ret = name; - dhFreeString (name); + if (name != NULL) { + // Remove the (R) character. + for (int i = 0; i < strlen(name); i++) { + if ((unsigned char)name[i] == 0xAE) { + name[i] = ' '; + } + } + ret = name; + dhFreeString (name); + } } NEXT_THROW (quickfix); } catch (string errstr) { @@ -406,6 +414,12 @@ Pandora_Wmi::getOSVersion () { L".CSDVersion"); if (version != NULL) { + // Remove the (R) character. + for (int i = 0; i < strlen(version); i++) { + if ((unsigned char)version[i] == 0xAE) { + version[i] = ' '; + } + } ret = version; dhFreeString (version); } From 64b9b7fcf9dbefeb394414223af5eb87b39482f9 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Mon, 22 Sep 2014 17:06:52 +0200 Subject: [PATCH 03/10] Fixed a typo. --- pandora_server/bin/pandora_server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server index a46d1e806a..5c296b35f8 100755 --- a/pandora_server/bin/pandora_server +++ b/pandora_server/bin/pandora_server @@ -516,7 +516,7 @@ sub main() { pandora_startup (); # Start thread to execute server tasks on the master server - threads->create('pandora_server_tasks', (\%Config))->detach() if ($Config{"master"} == 1); + threads->create('pandora_server_tasks', (\%Config))->detach() if ($Config{"pandora_master"} == 1); # Generate 'going up' events foreach my $server (@Servers) { From 998d75e2cceb40e04f74188030383acb62c1faab Mon Sep 17 00:00:00 2001 From: Vanessa Gil Date: Mon, 22 Sep 2014 17:12:36 +0200 Subject: [PATCH 04/10] Fixed bug: bad precision in post_process parameter. Ticket #1326. --- .../extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql | 9 +++++++-- .../godmode/modules/manage_network_components.php | 8 +++++++- pandora_console/pandoradb.sql | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql b/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql index 3793bbbe3d..8608e47282 100644 --- a/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql @@ -259,6 +259,11 @@ UPDATE FROM `network_component` SET `post_process`= 0.000000115740741 WHERE `id_ UPDATE FROM `network_component` SET `unit`= 'day' WHERE `id_nc`=53; -- --------------------------------------------------------------------- --- Table `network_component` +-- Table `tnetwork_component` -- --------------------------------------------------------------------- -ALTER TABLE `tnetwork_component` MODIFY COLUMN `post_process` DOUBLE(18,15) DEFAULT 0; +ALTER TABLE `tnetwork_component` MODIFY COLUMN `post_process` DOUBLE(24,15) DEFAULT 0; + +-- --------------------------------------------------------------------- +-- Table `tagente_modulo` +-- --------------------------------------------------------------------- +ALTER TABLE `tagente_modulo` MODIFY COLUMN `post_process` DOUBLE(24,15) DEFAULT 0; diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php index 3cafe9fcdf..c75b7a5812 100644 --- a/pandora_console/godmode/modules/manage_network_components.php +++ b/pandora_console/godmode/modules/manage_network_components.php @@ -85,7 +85,13 @@ $max_critical = (float) get_parameter ('max_critical'); $str_critical = (string) get_parameter ('str_critical'); $ff_event = (int) get_parameter ('ff_event'); $history_data = (bool) get_parameter ('history_data'); -$post_process = (float) get_parameter('post_process'); + +// Don't read as (float) because it lost it's decimals when put into MySQL +// where are very big and PHP uses scientific notation, p.e: +// 1.23E-10 is 0.000000000123 + +$post_process = (string) get_parameter ('post_process', 0.0); + $unit = (string) get_parameter('unit'); $id = (int) get_parameter ('id'); $wizard_level = get_parameter ('wizard_level', 'nowizard'); diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 17d1547707..63ab1e88f2 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -203,7 +203,7 @@ CREATE TABLE IF NOT EXISTS `tagente_modulo` ( `plugin_pass` text, `plugin_parameter` text, `id_plugin` int(10) default '0', - `post_process` double(18,15) default 0, + `post_process` double(24,15) default 0, `prediction_module` bigint(14) default '0', `max_timeout` int(4) unsigned default '0', `max_retries` int(4) unsigned default '0', @@ -707,7 +707,7 @@ CREATE TABLE IF NOT EXISTS `tnetwork_component` ( `custom_string_3` text, `custom_integer_1` int(10) default 0, `custom_integer_2` int(10) default 0, - `post_process` double(18,15) default 0, + `post_process` double(24,15) default 0, `unit` text, `wizard_level` enum('basic','advanced','nowizard') default 'nowizard', `macros` text, From 87b7126a382180d170ebcf1fe6b58dd515a299f7 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Mon, 22 Sep 2014 18:41:39 +0200 Subject: [PATCH 05/10] Now is possible to show a graph of the interface traffic from the agent view * pandora_console/operation/agentes/interface_traffic_graph_win.php: Added file. Shows a combined graph of the interface traffic. * pandora_console/operation/agentes/estado_generalagente.php: Now a graph icons will appear on the interface information if the modules ifInOctects and ifOutOctets exists for this interface. * pandora_console/include/functions_custom_graphs.php: Modified the function "custom_graphs_print" to add a new parameter to set the base url of the graph images. --- .../include/functions_custom_graphs.php | 4 +- .../agentes/estado_generalagente.php | 87 ++++-- .../agentes/interface_traffic_graph_win.php | 272 ++++++++++++++++++ 3 files changed, 342 insertions(+), 21 deletions(-) create mode 100644 pandora_console/operation/agentes/interface_traffic_graph_win.php diff --git a/pandora_console/include/functions_custom_graphs.php b/pandora_console/include/functions_custom_graphs.php index 41b28bb872..4b1c12acf0 100644 --- a/pandora_console/include/functions_custom_graphs.php +++ b/pandora_console/include/functions_custom_graphs.php @@ -152,7 +152,7 @@ function custom_graphs_get_user ($id_user = 0, $only_names = false, $returnAllGr function custom_graphs_print($id_graph, $height, $width, $period, $stacked = null, $return = false, $date = 0, $only_image = false, - $background_color = 'white', $modules_param = array()) { + $background_color = 'white', $modules_param = array(), $homeurl = '') { global $config; @@ -210,7 +210,7 @@ function custom_graphs_print($id_graph, $height, $width, $period, $stacked, $date, $only_image, - '', + $homeurl, 1, false, false, diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index a148403914..5441cbdada 100644 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -379,7 +379,7 @@ $filter = array( "id_agente" => $id_agente, "id_tipo_modulo" => (int)db_get_value("id_tipo", "ttipo_modulo", "nombre", "remote_snmp_proc") ); -$modules = agents_get_modules ($id_agente, $columns, $filter); +$modules = agents_get_modules($id_agente, $columns, $filter); if (! empty($modules)) { $table_interface = new stdClass(); @@ -387,7 +387,8 @@ if (! empty($modules)) { $table_interface->class = 'databox'; $table_interface->width = '100%'; $table_interface->style = array(); - $table_interface->style[1] = 'width: 30px;'; + $table_interface->style['interface_status'] = 'width: 30px;'; + $table_interface->style['interface_graph'] = 'width: 20px;'; $table_interface->head = array(); $options = array( "class" => "closed", @@ -396,7 +397,7 @@ if (! empty($modules)) { $table_interface->head[0] = html_print_image("images/go.png", true, $options) . "  "; $table_interface->head[0] .= '' . __('Interface information') .' (SNMP)'; $table_interface->head_colspan = array(); - $table_interface->head_colspan[0] = 4; + $table_interface->head_colspan[0] = 5; $table_interface->data = array(); foreach ($modules as $key => $module) { @@ -405,7 +406,7 @@ if (! empty($modules)) { if (preg_match ("/_(.+)$/", (string)$module['nombre'], $matches)) { if ($matches[1]) { $interface_name = $matches[1]; - + $module_id = $module['id_agente_modulo']; $db_status = modules_get_agentmodule_status($module_id); $module_value = modules_get_last_value ($module_id); @@ -428,12 +429,59 @@ if (! empty($modules)) { $description = $matches[0]; } } + + // Get the ifInOctets and ifOutOctets modules of the interface + $columns = array( + "id_agente_modulo", + "nombre" + ); + $interface_traffic_modules = agents_get_modules($id_agente, $columns, "nombre LIKE 'if%Octets_$interface_name'"); + if (!empty($interface_traffic_modules) && count($interface_traffic_modules) >= 2) { + $interface_traffic_modules_aux = array('in' => '', 'out' => ''); + foreach ($interface_traffic_modules as $interface_traffic_module) { + if (preg_match ("/if(.+)Octets_$interface_name$/i", (string)$interface_traffic_module['nombre'], $matches)) { + if (strtolower($matches[1]) == 'in') { + $interface_traffic_modules_aux['in'] = $interface_traffic_module['id_agente_modulo']; + } + elseif (strtolower($matches[1]) == 'out') { + $interface_traffic_modules_aux['out'] = $interface_traffic_module['id_agente_modulo']; + } + } + } + if (!empty($interface_traffic_modules_aux['in']) && !empty($interface_traffic_modules_aux['out'])) { + $interface_traffic_modules = $interface_traffic_modules_aux; + } + else { + $interface_traffic_modules = false; + } + } + else { + $interface_traffic_modules = false; + } + + if ($interface_traffic_modules != false) { + $params = array( + 'interface_name' => $interface_name, + 'agent_id' => $id_agente, + 'traffic_module_in' => $interface_traffic_modules_aux['in'], + 'traffic_module_out' => $interface_traffic_modules_aux['out'] + ); + $params_json = json_encode($params); + $params_encoded = base64_encode($params_json); + $win_handle = dechex(crc32($module_id.$interface_name)); + $graph_link = "" . + html_print_image("images/chart_curve.png", true, array("title" => __('Interface traffic'))) . ""; + } + else { + $graph_link = ""; + } $data = array(); - $data[0] = "" . $interface_name . ""; - $data[1] = $status; - $data[2] = $ip_target; - $data[3] = $description; + $data['interface_name'] = "" . $interface_name . ""; + $data['interface_status'] = $status; + $data['interface_graph'] = $graph_link; + $data['interface_ip'] = $ip_target; + $data['interface_mac'] = $description; $table_interface->data[] = $data; } } @@ -446,17 +494,18 @@ if (! empty($modules)) { $(document).ready (function () { $("#agent_interface_info").find("tbody").hide(); $("#agent_interface_info").find("thead").click (function () { - var arrow = $("#agent_interface_info").find("thead").find("img"); - if (arrow.hasClass("closed")) { - arrow.removeClass("closed"); - arrow.prop("src", "images/down.png"); - $("#agent_interface_info").find("tbody").show(); - } else { - arrow.addClass("closed"); - arrow.prop("src", "images/go.png"); - $("#agent_interface_info").find("tbody").hide(); - } - }); + var arrow = $("#agent_interface_info").find("thead").find("img"); + if (arrow.hasClass("closed")) { + arrow.removeClass("closed"); + arrow.prop("src", "images/down.png"); + $("#agent_interface_info").find("tbody").show(); + } else { + arrow.addClass("closed"); + arrow.prop("src", "images/go.png"); + $("#agent_interface_info").find("tbody").hide(); + } + }) + .css('cursor', 'pointer'); }); load_tables(); +} + +echo ''; + +$params_json = base64_decode((string) get_parameter('params')); +$params = json_decode($params_json, true); + +$interface_name = (string) $params['interface_name']; +$agent_id = (int) $params['agent_id']; +$interface_traffic_modules = array( + 'in' => (int) $params['traffic_module_in'], + 'out' => (int) $params['traffic_module_out'] + ); +?> + + + + 0) { + $query = ui_get_url_refresh(false); + + echo ''; + } +?> + + Pandora FMS Graph (<?php echo agents_get_name($agent_id) . ' - ' . $interface_name; ?>) + + + + + + + + + 1) { + $height = $height * ($zoom / 2.1); + $width = $width * ($zoom / 1.4); + + echo ""; + } + + $current = date("Y-m-d"); + + if ($start_date != $current) + $date = strtotime($start_date); + else + $date = $utime; + + $urlImage = ui_get_full_url(false); + + if ($config['flash_charts'] == 1) + echo '
    '; + 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']); + + echo '
    '; + + /////////////////////////// + // SIDE MENU + /////////////////////////// + $side_layer_params = array(); + // TOP TEXT + $side_layer_params['top_text'] = "
    " . html_print_image('images/config_mc.png', true, array('width' => '16px')) . ' ' . __('Pandora FMS Graph configuration menu') . "
    "; + $side_layer_params['body_text'] = "
    "; + $side_layer_params['body_text'] .=__('Please, make your changes and apply with the Reload button'); + + // MENU + $side_layer_params['body_text'] .= '
    '; + $side_layer_params['body_text'] .= html_print_input_hidden("params", base64_encode($params_json), true); + + if (isset($hash_connection_data)) { + $side_layer_params['body_text'] .= html_print_input_hidden("loginhash", "auto", true); + $side_layer_params['body_text'] .= html_print_input_hidden("loginhash_data", $loginhash_data, true); + $side_layer_params['body_text'] .= html_print_input_hidden("loginhash_user", $loginhash_user, true); + } + + // FORM TABLE + + $table = html_get_predefined_table('transparent', 2); + $table->width = '98%'; + $table->id = 'stat_win_form_div'; + $table->style[0] = 'text-align:left; padding: 7px;'; + $table->style[1] = 'text-align:left;'; + $table->styleTable = 'border-spacing: 4px;'; + $table->class = 'alternate'; + + $data = array(); + $data[0] = __('Refresh time'); + $data[1] = html_print_extended_select_for_time("refresh", $refresh, '', '', 0, 7, true); + $table->data[] = $data; + $table->rowclass[] = ''; + + $data = array(); + $data[0] = __('Begin date'); + $data[1] = html_print_input_text ("start_date", substr ($start_date, 0, 10),'', 15, 255, true); + $data[1] .= html_print_image ("images/calendar_view_day.png", true, array ("onclick" => "scwShow(scwID('text-start_date'),this);", "style" => 'vertical-align: bottom;')); + $table->data[] = $data; + $table->rowclass[] = ''; + + $data = array(); + $data[0] = __('Time range'); + $data[1] = html_print_extended_select_for_time('period', $period, '', '', 0, 7, true); + $table->data[] = $data; + $table->rowclass[] = ''; + + $data = array(); + $data[0] = __('Zoom factor'); + $options = array(); + $options[$zoom] = 'x'.$zoom; + $options[1] = 'x1'; + $options[2] = 'x2'; + $options[3] = 'x3'; + $options[4] = 'x4'; + $data[1] = html_print_select($options, "zoom", $zoom, '', '', 0, true); + $table->data[] = $data; + $table->rowclass[] = ''; + + $form_table = html_print_table($table, true); + + unset($table); + + $table->id = 'stat_win_form'; + $table->width = '100%'; + $table->cellspacing = 2; + $table->cellpadding = 2; + $table->class = 'databox'; + + $data = array(); + $data[0] = html_print_div(array('content' => $form_table, 'style' => 'overflow: auto; height: 220px'), true); + $table->data[] = $data; + $table->rowclass[] = ''; + + $data = array(); + $data[0] = '
    ' . html_print_submit_button (__('Reload'), "submit", false, 'class="sub upd"', true) . "
    "; + $table->data[] = $data; + $table->rowclass[] = ''; + + $side_layer_params['body_text'] .= html_print_table($table, true); + $side_layer_params['body_text'] .= '
    '; + $side_layer_params['body_text'] .= '
    '; // outer + + // ICONS + $side_layer_params['icon_closed'] = '/images/graphmenu_arrow_hide.png'; + $side_layer_params['icon_open'] = '/images/graphmenu_arrow.png'; + + // SIZE + $side_layer_params['width'] = 500; + + // POSITION + $side_layer_params['position'] = 'left'; + + html_print_side_layer($side_layer_params); + + // Hidden div to forced title + html_print_div(array('id' => 'forced_title_layer', 'class' => 'forced_title_layer', 'hidden' => true)); +?> + + + + From 595c24d01311cb41bde090b2fd6738e0ec2450f4 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 23 Sep 2014 00:01:08 +0200 Subject: [PATCH 06/10] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_console/pandoradb_data.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 328d6e795e..1fc12dbbeb 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 5.1-140922 +Version: 5.1-140923 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 0b6a1e1999..64a50ba914 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-140922" +pandora_version="5.1-140923" 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 eb5e5c33e3..531c28dd69 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 => '140922'; +use constant AGENT_BUILD => '140923'; # 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 aacd919016..3e3d7f70f3 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 140922 +%define release 140923 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 da35985134..d0f95de33e 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 140922 +%define release 140923 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 030c5eccc2..0eaf9ad0d0 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{140922} +{140923} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index f3b5b7c787..68885f4e44 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 140922)") +#define PANDORA_VERSION ("5.1(Build 140923)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index ce37158537..1bac33f9e0 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 140922))" + VALUE "ProductVersion", "(5.1(Build 140923))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 8d900f779c..f0f1531a97 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 5.1-140922 +Version: 5.1-140923 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 b9e1c6c025..d48b1cdaf6 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-140922" +pandora_version="5.1-140923" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 09240b8d4f..c45b61696e 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 = 'PC140922'; +$build_version = 'PC140923'; $pandora_version = 'v5.1'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 39c1951703..2d454e5eaf 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -63,7 +63,7 @@
    Date: Tue, 23 Sep 2014 09:28:10 +0200 Subject: [PATCH 07/10] Validate post_process parameter. Ticket #1318 --- .../agentes/module_manager_editor_common.php | 14 ++++++++++++++ .../manage_network_components_form_network.php | 16 ++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index d8a7da7fcc..fc3bf64b2f 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -739,6 +739,14 @@ $(document).ready (function () { event.preventDefault(); } }); + + //validate post_process. Change ',' by '.' + $("#submit-updbutton").click (function () { + validate_post_process(); + }); + $("#submit-crtbutton").click (function () { + validate_post_process(); + }); }); @@ -961,6 +969,12 @@ function delete_relation (num_row, id_relation) { } } +function validate_post_process() { + var post_process = $("#text-post_process").val(); + var new_post_process = post_process.replace(',','.'); + $("#text-post_process").val(new_post_process); +} + /* End of relationship javascript */ /* ]]> */ 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 84c0869ed6..6104fa9462 100644 --- a/pandora_console/godmode/modules/manage_network_components_form_network.php +++ b/pandora_console/godmode/modules/manage_network_components_form_network.php @@ -100,3 +100,19 @@ $table->colspan['tcp_receive'][1] = 3; push_table_row ($data, 'tcp_receive'); ?> + From 9c54550f097b4e9ec00213dadba225fabdc91c8e Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Tue, 23 Sep 2014 11:15:08 +0200 Subject: [PATCH 08/10] Fixed the IDs of SNMP browser password inputs for SNMPv3. --- pandora_console/include/javascript/pandora_snmp_browser.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/javascript/pandora_snmp_browser.js b/pandora_console/include/javascript/pandora_snmp_browser.js index bfada5f5e6..76661740bb 100644 --- a/pandora_console/include/javascript/pandora_snmp_browser.js +++ b/pandora_console/include/javascript/pandora_snmp_browser.js @@ -22,9 +22,9 @@ function snmpBrowse () { var snmp3_auth_user = $('#text-snmp3_browser_auth_user').val(); var snmp3_security_level = $('#snmp3_browser_security_level').val(); var snmp3_auth_method = $('#snmp3_browser_auth_method').val(); - var snmp3_auth_pass = $('#text-snmp3_browser_auth_pass').val(); + var snmp3_auth_pass = $('#password-snmp3_browser_auth_pass').val(); var snmp3_privacy_method = $('#snmp3_browser_privacy_method').val(); - var snmp3_privacy_pass = $('#text-snmp3_browser_privacy_pass').val(); + var snmp3_privacy_pass = $('#password-snmp3_browser_privacy_pass').val(); var ajax_url = $('#hidden-ajax_url').val(); // Prepare the AJAX call From fd68cf6ab0e94d8f4d0d244c1ce23d2d00249bcb Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Tue, 23 Sep 2014 11:42:26 +0200 Subject: [PATCH 09/10] Added the Encode::Locale dependency. --- pandora_server/DEBIAN/control | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control index 8ddcbd6cd8..d4b832c690 100644 --- a/pandora_server/DEBIAN/control +++ b/pandora_server/DEBIAN/control @@ -6,5 +6,5 @@ Section: admin Installed-Size: 640 Maintainer: Miguel de Dios Homepage: http://pandorafms.org/ -Depends: perl (>= 5.8), libdbi-perl, libdbd-mysql-perl, libtime-format-perl, libnetaddr-ip-perl, libtime-format-perl, libxml-simple-perl, libxml-twig-perl, libhtml-parser-perl, snmp, snmpd, traceroute, xprobe2, nmap, sudo, libwww-perl, libsocket6-perl, libio-socket-inet6-perl, snmp-mibs-downloader, libjson-perl, libnet-telnet-perl +Depends: perl (>= 5.8), libdbi-perl, libdbd-mysql-perl, libtime-format-perl, libnetaddr-ip-perl, libtime-format-perl, libxml-simple-perl, libxml-twig-perl, libhtml-parser-perl, snmp, snmpd, traceroute, xprobe2, nmap, sudo, libwww-perl, libsocket6-perl, libio-socket-inet6-perl, snmp-mibs-downloader, libjson-perl, libnet-telnet-perl, libencode-locale-perl Description: Pandora FMS is a monitoring system for big IT environments. It uses remote tests, or local agents to grab information. Pandora supports all standard OS (Linux, AIX, HP-UX, Solaris and Windows XP,2000/2003), and support multiple setups in HA enviroments. This is the server package. Server makes the remote checks and process information transfer by Pandora FMS agents to the server. diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index ca0abc011a..f29c772217 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -28,7 +28,7 @@ Requires: perl-XML-Simple perl-XML-Twig net-snmp-utils Requires: perl-NetAddr-IP net-snmp net-tools Requires: perl-IO-Socket-INET6 perl-Socket6 perl-Net-Telnet Requires: nmap wmic sudo perl-JSON -Requires: perl-Time-HiRes +Requires: perl-Time-HiRes perl-Encode-Locale %description Pandora FMS is a monitoring system for big IT environments. It uses remote tests, or local agents to grab information. Pandora supports all standard OS (Linux, AIX, HP-UX, Solaris and Windows XP,2000/2003), and support multiple setups in HA enviroments. diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 76cdd745f1..db4e65fdcb 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -26,6 +26,7 @@ Requires: perl-DBI perl-DBD-mysql perl-libwww-perl Requires: perl-NetAddr-IP net-snmp net-tools perl-XML-Twig Requires: nmap wmic sudo perl-HTML-Tree perl-XML-Simple perl-Net-Telnet Requires: perl-IO-Socket-INET6 perl-Socket6 snmp-mibs perl-JSON +Requires: perl-Encode-Locale %description From 8764ba2de43b39d345f600b304e2be05499f30b7 Mon Sep 17 00:00:00 2001 From: Vanessa Gil Date: Tue, 23 Sep 2014 12:16:15 +0200 Subject: [PATCH 10/10] Fixed home screen when the resolution is low. Ticket #1307. --- pandora_console/general/logon_ok.php | 6 ++++-- pandora_console/include/styles/pandora.css | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index a1d040a5a3..d94633f46e 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -39,7 +39,8 @@ if (tags_has_user_acl_tags()) { // Site news ! // --------------------------------------------------------------------- -echo '
    '; +//echo '
    '; +echo '
    '; //////////////////NEWS BOARD///////////////////////////// echo '
    '; @@ -164,7 +165,8 @@ echo '
    '; // --------------------------------------------------------------------------- // Site stats (global!) // --------------------------------------------------------------------------- -echo '
    '; +//echo '
    '; +echo '
    '; $data = reporting_get_group_stats (); /////////////// diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 00baa4c3c6..3411c6a6bb 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -2724,7 +2724,7 @@ table#policy_modules td * { } #news_board { - width: 750px; + width: 530px; } #right_column_logon_ok {