From d3a3a74cebf334508c8c1e4c7a4f31d7c4c560bb Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Thu, 3 Dec 2020 10:31:25 +0100 Subject: [PATCH 01/62] Fix item sql query remove fields --- .../godmode/reporting/reporting_builder.item_editor.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 1a3249a306..85728d9031 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -5403,11 +5403,9 @@ function chooseType() { case 'sql': $("#row_description").show(); $("#row_query").show(); - $("#row_max_items").show(); $("#row_header").show(); $("#row_custom").show(); $("#row_custom_example").show(); - $("#row_dyn_height").show(); $("#row_servers").show(); $("#row_historical_db_check").show(); break; From 244c4d56d6f0b51926483094a3b17a7990373b02 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Fri, 4 Dec 2020 12:32:38 +0100 Subject: [PATCH 02/62] Fixed unit --- .../godmode/agentes/configurar_agente.php | 4 ++++ .../agentes/module_manager_editor_common.php | 22 +++++++++---------- pandora_console/include/functions_html.php | 1 - pandora_console/include/javascript/pandora.js | 6 +++-- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 422d4d0f13..81dfa9ffa6 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -1404,6 +1404,10 @@ if ($update_module || $create_module) { $each_ff = (int) get_parameter('each_ff', $module['each_ff']); $ff_timeout = (int) get_parameter('ff_timeout'); $unit = (string) get_parameter('unit'); + if ($unit === '0') { + $unit = ''; + } + $id_tag = (array) get_parameter('id_tag_selected'); $serialize_ops = (string) get_parameter('serialize_ops'); $critical_instructions = (string) get_parameter('critical_instructions'); diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 64bb89a565..5fbe4343cb 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -548,17 +548,17 @@ $table_advanced->data[0][4] = html_print_input_text( $classdisabledBecauseInPolicy ); // $table_advanced->colspan[1][4] = 3; -// $table_advanced->data[0][4] = html_print_extended_select_for_unit( -// 'unit', -// $unit, -// '', -// '', -// '0', -// false, -// true, -// false, -// false -// ); +$table_advanced->data[0][4] = html_print_extended_select_for_unit( + 'unit', + $unit, + '', + 'none', + '0', + false, + true, + false, + false +); $table_advanced->colspan[0][4] = 3; $module_id_policy_module = 0; diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 3edbea17d3..fadc9c4cc7 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -1481,7 +1481,6 @@ function html_print_extended_select_for_unit( // $fields = post_process_get_custom_values(); $fields['_timeticks_'] = 'Timeticks'; - $fields['none'] = __('none'); $default_module_custom_units = get_custom_module_units(); diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index 04a8f5336e..52cf12992d 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -724,12 +724,14 @@ function post_process_select_init_unit(name, selected) { ); $("#text-" + name + "_text").val(""); } else { - $("#" + name + "_select option[value=none]").attr("selected", true); + $("#" + name + "_select option[value=0]").attr("selected", true); $("#" + name + "_default").hide(); $("#" + name + "_manual").show(); } } else { - $("#" + name + "_select option[value=none]").attr("selected", true); + $("#" + name + "_select option[value=0]").attr("selected", true); + $("#" + name + "_default").hide(); + $("#" + name + "_manual").show(); } $("#" + name + "_select").change(function() { From 7ec1978f4191c419abd205812d87c00f97a44d90 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 9 Dec 2020 11:48:32 +0100 Subject: [PATCH 03/62] Fixed update_user --- pandora_console/include/functions.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index f79c56b764..4a7ca04ca7 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -424,16 +424,6 @@ function get_user_language($id_user=null) if ($quick_language) { $language = get_parameter('language', 0); - if (defined('METACONSOLE')) { - if ($id_user == null) { - $id_user = $config['id_user']; - } - - if ($language !== 0) { - update_user($id_user, ['language' => $language]); - } - } - if ($language === 'default') { return $config['language']; } From aa52ab01df9dd091ba56ea368516d4879392c638 Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Wed, 9 Dec 2020 14:05:40 +0100 Subject: [PATCH 04/62] Fix loading charts modules and interfaces --- pandora_console/images/spinner_charts.gif | Bin 0 -> 55605 bytes pandora_console/include/ajax/module.php | 238 +++++++++++++++--- .../include/graphs/flot/pandora.flot.js | 13 - .../include/graphs/functions_flot.php | 19 +- .../lib/Dashboard/Widgets/custom_graph.php | 6 +- .../lib/Dashboard/Widgets/single_graph.php | 1 + pandora_console/include/styles/pandora.css | 14 ++ .../agentes/interface_traffic_graph_win.php | 67 +++-- .../operation/agentes/stat_win.php | 108 ++++---- 9 files changed, 341 insertions(+), 125 deletions(-) create mode 100644 pandora_console/images/spinner_charts.gif diff --git a/pandora_console/images/spinner_charts.gif b/pandora_console/images/spinner_charts.gif new file mode 100644 index 0000000000000000000000000000000000000000..e092d812896908cc485f7631a7578080a0361ad3 GIT binary patch literal 55605 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[0][1] = html_print_select($periods, 'period', $period, '', '', 0, true, false, false); + $formtable->data[0][1] = html_print_select( + $periods, + 'period', + $period, + '', + '', + 0, + true, + false, + false + ); $formtable->data[0][2] = ''; $formtable->data[0][3] = "".html_print_image('images/refresh.png', true, ['style' => 'vertical-align: middle;', 'border' => '0' ]).''; $formtable->rowspan[0][3] = 2; @@ -248,8 +290,20 @@ if (check_login()) { $freesearch_object = ''; if (preg_match('/_string/', $moduletype_name)) { $formtable->data[2][0] = __('Free search').' '; - $formtable->data[2][1] = html_print_input_text('freesearch', $freesearch, '', 20, null, true); - $formtable->data[2][2] = html_print_checkbox('free_checkbox', 1, $free_checkbox, true); + $formtable->data[2][1] = html_print_input_text( + 'freesearch', + $freesearch, + '', + 20, + null, + true + ); + $formtable->data[2][2] = html_print_checkbox( + 'free_checkbox', + 1, + $free_checkbox, + true + ); $formtable->data[2][2] .= ' '.__('Exact phrase'); $freesearch_object = json_encode( [ @@ -359,8 +413,16 @@ if (check_login()) { 'web_content_string' ); - $post_process = db_get_value_filter('post_process', 'tagente_modulo', ['id_agente_modulo' => $module_id]); - $unit = db_get_value_filter('unit', 'tagente_modulo', ['id_agente_modulo' => $module_id]); + $post_process = db_get_value_filter( + 'post_process', + 'tagente_modulo', + ['id_agente_modulo' => $module_id] + ); + $unit = db_get_value_filter( + 'unit', + 'tagente_modulo', + ['id_agente_modulo' => $module_id] + ); foreach ($result as $row) { $data = []; @@ -400,32 +462,65 @@ if (check_login()) { // Fixed the data from Selenium Plugin. if ($row[$attr[0]] != strip_tags($row[$attr[0]])) { $data[] = html_print_result_div($row[$attr[0]]); - } else if (is_numeric($row[$attr[0]]) && !modules_is_string_type($row['module_type'])) { + } else if (is_numeric($row[$attr[0]]) + && !modules_is_string_type($row['module_type']) + ) { switch ($row['module_type']) { case 15: - $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module_id); + $value = db_get_value( + 'snmp_oid', + 'tagente_modulo', + 'id_agente_modulo', + $module_id + ); // System Uptime: - // In case of System Uptime module, shows data in format "Days hours minutes seconds" if and only if + // In case of System Uptime module, + // shows data in format + // "Days hours minutes seconds" if and only if // selected module unit is "_timeticks_" - // Take notice that selected unit may not be postrocess unit - if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') { - $data_macro = modules_get_unit_macro($row[$attr[0]], $unit); + // Take notice that selected unit + // may not be postrocess unit. + if ($value == '.1.3.6.1.2.1.1.3.0' + || $value == '.1.3.6.1.2.1.25.1.1.0' + ) { + $data_macro = modules_get_unit_macro( + $row[$attr[0]], + $unit + ); if ($data_macro) { $data[] = $data_macro; } else { - $data[] = remove_right_zeros(number_format($row[$attr[0]], $config['graph_precision'])); + $data[] = remove_right_zeros( + number_format( + $row[$attr[0]], + $config['graph_precision'] + ) + ); } } else { - $data[] = remove_right_zeros(number_format($row[$attr[0]], $config['graph_precision'])); + $data[] = remove_right_zeros( + number_format( + $row[$attr[0]], + $config['graph_precision'] + ) + ); } break; default: - $data_macro = modules_get_unit_macro($row[$attr[0]], $unit); + $data_macro = modules_get_unit_macro( + $row[$attr[0]], + $unit + ); if ($data_macro) { $data[] = $data_macro; } else { - $data[] = remove_right_zeros(number_format($row[$attr[0]], $config['graph_precision'])); + $data[] = remove_right_zeros( + number_format( + $row[$attr[0]], + $config['graph_precision'] + ) + ); } break; } @@ -433,11 +528,16 @@ if (check_login()) { if ($row[$attr[0]] == '') { $data[] = 'No data'; } else { - $data_macro = modules_get_unit_macro($row[$attr[0]], $unit); + $data_macro = modules_get_unit_macro( + $row[$attr[0]], + $unit + ); if ($data_macro) { $data[] = $data_macro; } else { - $data[] = html_print_result_div($row[$attr[0]]); + $data[] = html_print_result_div( + $row[$attr[0]] + ); } } } @@ -453,7 +553,16 @@ if (check_login()) { if (empty($table->data)) { ui_print_error_message(__('No available data to show')); } else { - ui_pagination(count($count), false, $offset, 0, false, 'offset', true, 'binary_dialog'); + ui_pagination( + count($count), + false, + $offset, + 0, + false, + 'offset', + true, + 'binary_dialog' + ); html_print_table($table); } @@ -727,11 +836,17 @@ if (check_login()) { } } - $status_filter_monitor = (int) get_parameter('status_filter_monitor', -1); + $status_filter_monitor = (int) get_parameter( + 'status_filter_monitor', + -1 + ); $status_text_monitor = get_parameter('status_text_monitor', ''); $filter_monitors = (bool) get_parameter('filter_monitors', false); $status_module_group = get_parameter('status_module_group', -1); - $monitors_change_filter = (bool) get_parameter('monitors_change_filter', false); + $monitors_change_filter = (bool) get_parameter( + 'monitors_change_filter', + false + ); $status_filter_sql = '1 = 1'; if ($status_filter_monitor == AGENT_MODULE_STATUS_NOT_NORMAL) { @@ -787,7 +902,9 @@ if (check_login()) { AND tagente_estado.estado != $monitor_filter "; - $count_modules = db_get_all_rows_sql('SELECT COUNT(DISTINCT tagente_modulo.id_agente_modulo)'.$sql_condition); + $count_modules = db_get_all_rows_sql( + 'SELECT COUNT(DISTINCT tagente_modulo.id_agente_modulo)'.$sql_condition + ); if (isset($count_modules[0])) { $count_modules = reset($count_modules[0]); @@ -796,7 +913,7 @@ if (check_login()) { } // Get monitors/modules - // Get all module from agent + // Get all module from agent. $sql_modules_info = "SELECT tagente_estado.*, tagente_modulo.*, tmodule_group.* $sql_condition GROUP BY tagente_modulo.id_agente_modulo ORDER BY $order_sql"; @@ -1195,4 +1312,55 @@ if (check_login()) { echo $graph_type; return; } + + if ($get_graph_module === true) { + global $config; + $output = ''; + $graph_data = get_parameter('graph_data', ''); + $params = json_decode(base64_decode($graph_data), true); + $server_id = (int) get_parameter('server_id', 0); + include_once $config['homedir'].'/include/functions_graph.php'; + + // Metaconsole connection to the node. + if (is_metaconsole() === true && empty($server_id) === false) { + $server = metaconsole_get_connection_by_id($server_id); + metaconsole_connect($server); + } + + $output .= grafico_modulo_sparse($params); + echo $output; + + if (is_metaconsole() === true && empty($server_id) === false) { + metaconsole_restore_db(); + } + + return; + } + + if ($get_graph_module_interfaces === true) { + global $config; + include_once $config['homedir'].'/include/functions_graph.php'; + + $output = ''; + $graph_data = get_parameter('graph_data', ''); + $params = json_decode(base64_decode($graph_data), true); + + $modules = get_parameter('modules', ''); + $modules = json_decode(base64_decode($modules), true); + + $graph_data_combined = get_parameter('graph_data_combined', ''); + $params_combined = json_decode( + base64_decode($graph_data_combined), + true + ); + + $output .= graphic_combined_module( + $modules, + $params, + $params_combined + ); + echo $output; + + return; + } } diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index a35b5dd71b..b351637650 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -955,7 +955,6 @@ function pandoraFlotArea( legend, series_type, color, - water_mark, date_array, data_module_graph, params, @@ -972,7 +971,6 @@ function pandoraFlotArea( .shift(); var width = params.width; var vconsole = params.vconsole; - var dashboard = params.dashboard; var menu = params.menu; var min_x = date_array["start_date"] * 1000; var max_x = date_array["final_date"] * 1000; @@ -2794,17 +2792,6 @@ function pandoraFlotArea( ); adjust_menu(graph_id, plot, parent_height, width, show_legend); } - - if (!dashboard) { - if (water_mark) { - set_watermark( - graph_id, - plot, - $("#watermark_image_" + graph_id).attr("src") - ); - } - //adjust_menu(graph_id, plot, parent_height, width, show_legend); - } } function format_unit_yaxes(y) { diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php index 81c9cc79cf..b682db2885 100644 --- a/pandora_console/include/graphs/functions_flot.php +++ b/pandora_console/include/graphs/functions_flot.php @@ -262,15 +262,17 @@ function flot_area_graph( $params['height'] = 1; } - if (!$vconsole) { - $return .= "
"; + if ((bool) $params['vconsole'] === false) { + $return .= '
'; + $legend_top = 10; + if (empty($params['show_legend']) === false) { + $legend_top = (20 + (count($legend) * 18)); + } - if ($water_mark != '') { - $return .= ""; - $watermark = 'true'; - } else { - $watermark = 'false'; + if ($water_mark != '' && (bool) $params['dashboard'] === false) { + $return .= '
'; + $return .= ''; + $return .= '
'; } } @@ -314,7 +316,6 @@ function flot_area_graph( $return .= $legend.", \n"; $return .= $series_type.", \n"; $return .= $color.", \n"; - $return .= $watermark.", \n"; $return .= $date_array.", \n"; $return .= $data_module_graph.", \n"; $return .= $params.", \n"; diff --git a/pandora_console/include/lib/Dashboard/Widgets/custom_graph.php b/pandora_console/include/lib/Dashboard/Widgets/custom_graph.php index b35ce233a1..3194e7b5da 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/custom_graph.php +++ b/pandora_console/include/lib/Dashboard/Widgets/custom_graph.php @@ -351,11 +351,10 @@ class CustomGraphWidget extends Widget ); $hackLegendHight = (30 * count($sources)); - if ($hackLegendHight < ($size['height'] - 10 - $hackLegendHight)) { - $height = ($size['height'] - 10 - $hackLegendHight); + if ($hackLegendHight > ($size['height'] - 10 - $hackLegendHight)) { + $height = ($size['height'] - $hackLegendHight); } else { $height = ($size['height'] - 10); - $this->values['showLegend'] = 0; } } else { $height = ($size['height'] - 10); @@ -392,6 +391,7 @@ class CustomGraphWidget extends Widget 'menu' => false, 'show_legend' => $this->values['showLegend'], 'vconsole' => true, + 'dashboard' => true, ]; $params_combined = [ diff --git a/pandora_console/include/lib/Dashboard/Widgets/single_graph.php b/pandora_console/include/lib/Dashboard/Widgets/single_graph.php index e4e3462024..431cc8fb87 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/single_graph.php +++ b/pandora_console/include/lib/Dashboard/Widgets/single_graph.php @@ -373,6 +373,7 @@ class SingleGraphWidget extends Widget 'show_legend' => $this->values['showLegend'], 'show_title' => $module_name, 'menu' => false, + 'dashboard' => true, ]; $output = '
'; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 5e321b1a2e..00030c65d4 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -6087,3 +6087,17 @@ div.graph div.legend table { writing-mode: lr-tb; white-space: nowrap; } + +div.stat-win-spinner { + width: 100%; + height: 300px; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +div.stat-win-spinner img { + width: 100px; + height: 100px; +} diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php index fdd53c0bc3..a4912f63d6 100644 --- a/pandora_console/operation/agentes/interface_traffic_graph_win.php +++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php @@ -31,8 +31,6 @@ require_once $config['homedir'].'/include/auth/mysql.php'; require_once $config['homedir'].'/include/functions.php'; require_once $config['homedir'].'/include/functions_db.php'; require_once $config['homedir'].'/include/functions_reporting.php'; -require_once $config['homedir'].'/include/functions_graph.php'; -require_once $config['homedir'].'/include/functions_custom_graphs.php'; require_once $config['homedir'].'/include/functions_modules.php'; require_once $config['homedir'].'/include/functions_agents.php'; require_once $config['homedir'].'/include/functions_tags.php'; @@ -45,7 +43,7 @@ $params = json_decode($params_json, true); // Metaconsole connection to the node. $server_id = (int) (isset($params['server']) ? $params['server'] : 0); -if ($config['metaconsole'] && empty($server_id) === false) { +if (is_metaconsole() === true && empty($server_id) === false) { $server = metaconsole_get_connection_by_id($server_id); // Error connecting. @@ -268,13 +266,15 @@ $table->data[] = $data; $table->rowclass[] = ''; $form_table = html_print_table($table, true); -$form_table .= '
'.html_print_submit_button( +$form_table .= '
'; +$form_table .= html_print_submit_button( __('Reload'), 'submit', false, 'class="sub upd"', true -).'
'; +); +$form_table .= '
'; // Menu. @@ -303,7 +303,7 @@ html_print_div( ); // Graph. -echo '
'; +$output = '
'; $height = 280; $width = '90%'; @@ -320,8 +320,8 @@ $params = [ 'zoom' => $zoom, ]; -if (is_metaconsole()) { - $params['id_server'] = $server_id; +if (is_metaconsole() === true) { + $params['server_id'] = $server_id; } if ($config['type_interface_charts'] == 'line') { @@ -340,13 +340,13 @@ $params_combined = [ 'stacked' => $stacked, ]; -graphic_combined_module( - array_values($interface_traffic_modules), - $params, - $params_combined -); +$modules = array_values($interface_traffic_modules); +$output .= ''; -echo '
'; +$output .= '
'; +echo $output; ?> @@ -362,6 +362,10 @@ ui_require_jquery_file( true ); ui_include_time_picker(true); + +if (is_metaconsole() === true && empty($server_id) === false) { + metaconsole_restore_db(); +} ?> diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index fce948feb1..783b283fea 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -31,7 +31,6 @@ require_once $config['homedir'].'/include/auth/mysql.php'; require_once $config['homedir'].'/include/functions.php'; require_once $config['homedir'].'/include/functions_db.php'; require_once $config['homedir'].'/include/functions_reporting.php'; -require_once $config['homedir'].'/include/functions_graph.php'; require_once $config['homedir'].'/include/functions_modules.php'; require_once $config['homedir'].'/include/functions_agents.php'; require_once $config['homedir'].'/include/functions_tags.php'; @@ -41,7 +40,7 @@ enterprise_include_once('include/functions_agents.php'); check_login(); // Metaconsole connection to the node. -$server_id = (int) get_parameter('server'); +$server_id = (int) get_parameter('server', 0); if (is_metaconsole() === true && empty($server_id) === false) { $server = metaconsole_get_connection_by_id($server_id); // Error connecting. @@ -445,59 +444,39 @@ ui_print_message_dialog( ] ); + $params = [ + 'agent_module_id' => $id, + 'period' => $period, + 'show_events' => $draw_events, + 'title' => $label, + 'unit_name' => $unit, + 'show_alerts' => $draw_alerts, + 'date' => $date, + 'unit' => $unit, + 'baseline' => $baseline, + 'homeurl' => $urlImage, + 'adapt_key' => 'adapter_'.$graph_type, + 'compare' => $time_compare, + 'show_unknown' => $unknown_graph, + 'percentil' => (($show_percentil) ? $config['percentil'] : null), + 'type_graph' => $config['type_module_charts'], + 'fullscale' => $fullscale, + 'zoom' => $zoom, + 'height' => 300, + 'type_mode_graph' => $type_mode_graph, + ]; + // Graph. $output = '
'; - switch ($graph_type) { - case 'boolean': - case 'sparse': - case 'string': - $params = [ - 'agent_module_id' => $id, - 'period' => $period, - 'show_events' => $draw_events, - 'title' => $label, - 'unit_name' => $unit, - 'show_alerts' => $draw_alerts, - 'date' => $date, - 'unit' => $unit, - 'baseline' => $baseline, - 'homeurl' => $urlImage, - 'adapt_key' => 'adapter_'.$graph_type, - 'compare' => $time_compare, - 'show_unknown' => $unknown_graph, - 'percentil' => (($show_percentil) ? $config['percentil'] : null), - 'type_graph' => $config['type_module_charts'], - 'fullscale' => $fullscale, - 'zoom' => $zoom, - 'height' => 300, - 'type_mode_graph' => $type_mode_graph, - ]; - $output .= grafico_modulo_sparse($params); - $output .= '
'; - if ($show_events_graph) { - $width = '500'; - $height = '450'; - $output .= graphic_module_events( - $id, - $width, - $height, - $period, - $config['homeurl'], - $zoom, - 'adapted_'.$graph_type, - $date, - true - ); - } - break; - - default: - $output .= fs_error_image('../images'); - break; - } - + $output .= ''; $output .= '
'; echo $output; + + if (is_metaconsole() === true && empty($server_id) === false) { + metaconsole_restore_db(); + } ?> @@ -580,5 +559,32 @@ ui_include_time_picker(true); arrow.attr('src',arrow.attr('src').replace(arrow_up, arrow_down)); } }); + + var graph_data = ""; + var url = ""; + var serverId = ""; + get_ajax_module(url, graph_data, serverId); }); + + + function get_ajax_module(url, graph_data, serverId) { + $.ajax({ + type: "POST", + url: url, + dataType: "html", + data: { + page: "include/ajax/module", + get_graph_module: true, + graph_data: graph_data, + server_id: serverId + }, + success: function (data) { + $("#stat-win-spinner").hide(); + $("#stat-win-module-graph").append(data); + }, + error: function (error) { + console.error(error); + } + }); + } From 631ebcbc2f4b3d991c3a3eb1c12ad814317aef34 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 9 Dec 2020 15:23:16 +0100 Subject: [PATCH 05/62] Added space in User ID --- pandora_console/godmode/users/configure_user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 2e0cdd8d7d..cfca6aa076 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -785,7 +785,7 @@ if (defined('METACONSOLE')) { } if (!$new_user) { - $user_id = '

'.__('User ID').'

'; + $user_id = '

'.__('User ID').':

'; $user_id .= ''.$id.''; $user_id .= html_print_input_hidden('id_user', $id, true); $user_id .= '
'; From 8fd46b390fb5515786fc97fb7b6b25df8e709893 Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Wed, 9 Dec 2020 16:39:00 +0100 Subject: [PATCH 06/62] Removed metaconsole empty help links --- .../godmode/modules/manage_network_components_form_common.php | 4 +++- pandora_console/godmode/users/configure_user.php | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/modules/manage_network_components_form_common.php b/pandora_console/godmode/modules/manage_network_components_form_common.php index d42e93c949..51e544a96d 100644 --- a/pandora_console/godmode/modules/manage_network_components_form_common.php +++ b/pandora_console/godmode/modules/manage_network_components_form_common.php @@ -48,7 +48,9 @@ if (enterprise_installed()) { 'basic' => __('Basic'), 'advanced' => __('Advanced'), ]; - $table->data[0][3] = html_print_select($wizard_levels, 'wizard_level', $wizard_level, '', '', -1, true, false, false).' '.ui_print_help_icon('meta_access', true); + // TODO review help tips on meta. + $table->data[0][3] = html_print_select($wizard_levels, 'wizard_level', $wizard_level, '', '', -1, true, false, false).' '; + // .ui_print_help_icon('meta_access', true) } else { $table->data[0][2] = ''; $table->data[0][3] = html_print_input_hidden('wizard_level', $wizard_level, true); diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 2e0cdd8d7d..4a9707deb7 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -1065,7 +1065,8 @@ if (enterprise_installed() && defined('METACONSOLE')) { $user_info_metaconsole_access = $user_info['metaconsole_access']; } - $meta_access = '

'.__('Metaconsole access').' '.ui_print_help_icon('meta_access', true).'

'; + // TODO review help tips on meta. + $meta_access = '

'.__('Metaconsole access').' './* ui_print_help_icon('meta_access', true). */'

'; $metaconsole_accesses = [ 'basic' => __('Basic'), 'advanced' => __('Advanced'), From 888d702f6edd70901d5615c4a240b5df5d574d95 Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Thu, 10 Dec 2020 09:32:20 +0100 Subject: [PATCH 07/62] Fixed api call set stop_downtime --- pandora_console/include/functions_api.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index 96b3bc8cfa..490e96576e 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -6360,6 +6360,14 @@ function api_set_stop_downtime($id, $thrash1, $other, $thrash3) $date_time_stop = get_system_time(); + $sql = sprintf('SELECT date_to, type_execution, executed FROM tplanned_downtime WHERE id=%d', $id); + $data = db_get_row_sql($sql); + + if ($data['type_execution'] == 'periodically' && $data['executed'] == 1) { + returnError('error_stop_downtime', __('Error stopping downtime. Periodical and running planned downtime cannot be stopped.')); + return; + } + $values = []; $values['date_to'] = $date_time_stop; From dcbd310c8106167d402a4bf254fe070517255ae2 Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Thu, 10 Dec 2020 10:36:55 +0100 Subject: [PATCH 08/62] SNMP trap filter colocado --- pandora_console/operation/snmpconsole/snmp_view.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php index e1a501ea1a..d345bd626b 100755 --- a/pandora_console/operation/snmpconsole/snmp_view.php +++ b/pandora_console/operation/snmpconsole/snmp_view.php @@ -616,7 +616,7 @@ $table->data[4][1] = html_print_input( ); // Type filter (ColdStart, WarmStart, LinkDown, LinkUp, authenticationFailure, Other). -$table->data[6][1] = ''.__('Trap type').''.ui_print_help_tip(__('Search by trap type'), true); +$table->data[4][3] = ''.__('Trap type').''.ui_print_help_tip(__('Search by trap type'), true); $trap_types = [ -1 => __('None'), 0 => __('Cold start (0)'), @@ -626,7 +626,7 @@ $trap_types = [ 4 => __('Authentication failure (4)'), 5 => __('Other'), ]; -$table->data[6][2] = html_print_select( +$table->data[4][4] = html_print_select( $trap_types, 'trap_type', $trap_type, From fcf4b6c239da63c7e5d6229ae45ab2eb046e5a2a Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Thu, 10 Dec 2020 12:06:56 +0100 Subject: [PATCH 09/62] Fixed Agent and module text size --- pandora_console/godmode/agentes/modificar_agente.php | 4 ++-- pandora_console/operation/agentes/estado_agente.php | 2 +- pandora_console/operation/agentes/estado_generalagente.php | 2 +- pandora_console/operation/agentes/status_monitor.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index 77d8f06b46..5c5658ac32 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -567,12 +567,12 @@ if ($agents !== false) { $url = ui_get_full_url( $url.'&op=update&id='.$cluster->id() ); - echo ''.$agent['alias'].''; + echo ''.ui_print_truncate_text($agent['alias'], 'agent_medium').''; } } else { echo '".''.$agent['alias'].''.''; + id_agente=".$agent['id_agente']."'>".''.ui_print_truncate_text($agent['alias'], 'agent_medium').''.''; } echo ''; diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index 9e01425198..00b306e158 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -784,7 +784,7 @@ foreach ($agents as $agent) { $data[0] = '
'; - $data[0] .= ''.$agent['alias'].''; + $data[0] .= ''.ui_print_truncate_text($agent['alias'], 'agent_medium', false, true, true).''; if ($agent['quiet']) { $data[0] .= ' '; diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index df788514a1..bae404dc2d 100755 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -92,7 +92,7 @@ $alive_animation = agents_get_status_animation( $agent_name = ui_print_agent_name( $agent['id_agente'], true, - 500, + 'agent_medium', 'font-size: medium;font-weight:bold', true ); diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index db1e052ab9..c3e160bdda 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -1419,7 +1419,7 @@ if (!empty($result)) { } if (in_array('module_name', $show_fields) || is_metaconsole()) { - $data[3] = ui_print_truncate_text($row['module_name'], 'agent_small', false, true, true); + $data[3] = ui_print_truncate_text($row['module_name'], 'module_small', false, true, true); if ($row['extended_info'] != '') { $data[3] .= ui_print_help_tip($row['extended_info'], true, '/images/default_list.png'); } From 092011916be54b1ee8d51857844a039b95f85453 Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Thu, 10 Dec 2020 16:07:40 +0100 Subject: [PATCH 10/62] fix recursivity check --- .../include/javascript/jquery.pandora.controls.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/javascript/jquery.pandora.controls.js b/pandora_console/include/javascript/jquery.pandora.controls.js index aabc2b4cde..0158879c6b 100644 --- a/pandora_console/include/javascript/jquery.pandora.controls.js +++ b/pandora_console/include/javascript/jquery.pandora.controls.js @@ -35,11 +35,23 @@ $("option[value!=0]", $select).remove (); if (! config.callbackBefore (this)) return; + + if (typeof config.recursion === "function") { + // Perform this for those cases where recursion parameter is obtained through a function that returns a variable that is set in the lexical environment where this constructor is called. + var recursion_value = config.recursion(); + + if (typeof recursion_value === "boolean") { + recursion_value = recursion_value ? 1 : 0; + } + } else { + var recursion_value = config.recursion; + } + var opts = { "page" : "godmode/groups/group_list", "get_group_agents" : 1, "id_group" : this.value, - "recursion" : config.recursion, + "recursion" : recursion_value, "filter_agents_json" : config.filter_agents_json, "disabled" : (typeof config.disabled === "function") ? (config.disabled()) From 0e20c3d5476125988a5a99b6d47f652d48a9a33f Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Fri, 11 Dec 2020 09:38:37 +0100 Subject: [PATCH 11/62] Fixed --- pandora_console/operation/agentes/ver_agente.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index df5146711c..b22ff8ace5 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -1389,6 +1389,7 @@ if (isset($ehorus_tab) && !empty($ehorus_tab)) { $onheader['ehorus'] = $ehorus_tab; } +$id_extension = get_parameter('id_extension', ''); // Tabs for extensions. $tab_name_extensions = ''; foreach ($config['extensions'] as $extension) { @@ -1431,13 +1432,11 @@ foreach ($config['extensions'] as $extension) { } $image = $extension['extension_ope_tab']['icon']; - $name = $extension['extension_ope_tab']['name']; - $id = $extension['extension_ope_tab']['id']; - $tab_name_extensions = $name; + $name = $extension['extension_ope_tab']['name']; + $id = $extension['extension_ope_tab']['id']; - $id_extension = get_parameter('id_extension', ''); - - if ($id_extension == $id) { + if ($id_extension === $id) { + $tab_name_extensions = $name; $active = true; } else { $active = false; From 734efbf89284aa8ae1833b504a65145a61d897d8 Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Fri, 11 Dec 2020 10:10:22 +0100 Subject: [PATCH 12/62] Added ACL check to custom view CSV donwload --- pandora_console/include/ajax/custom_fields.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pandora_console/include/ajax/custom_fields.php b/pandora_console/include/ajax/custom_fields.php index 85066675a1..d8982da1d4 100644 --- a/pandora_console/include/ajax/custom_fields.php +++ b/pandora_console/include/ajax/custom_fields.php @@ -54,6 +54,16 @@ if (check_login()) { $update_filter_cf = (bool) get_parameter('update_filter_cf', 0); $delete_filter_cf = (bool) get_parameter('delete_filter_cf', 0); $change_name_filter = (bool) get_parameter('change_name_filter', 0); + $check_csv_button = (bool) get_parameter('check_csv_button', 0); + + if ($check_csv_button) { + if (check_acl($config['id_user'], 0, 'PM')) { + echo json_encode($permission); + return; + } else { + exit; + } + } if ($get_custom_fields_data) { $name_custom_fields = get_parameter('name_custom_fields', 0); From 4d8a686ae7743ce6874c8994537d667a6f2aff90 Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Fri, 11 Dec 2020 11:40:01 +0100 Subject: [PATCH 13/62] fixed triggered alerts count --- pandora_console/include/functions_tactical.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_tactical.php b/pandora_console/include/functions_tactical.php index 4e29dda423..26611e5b41 100644 --- a/pandora_console/include/functions_tactical.php +++ b/pandora_console/include/functions_tactical.php @@ -62,6 +62,7 @@ function tactical_get_data($id_user=false, $user_strict=false, $acltags, $return $list['_monitors_unknown_'] = 0; $list['_monitors_not_init_'] = 0; $list['_monitors_ok_'] = 0; + $list['_monitors_alerts_fired_'] = 0; if (empty($list_groups)) { $list_groups = []; @@ -142,7 +143,7 @@ function tactical_get_data($id_user=false, $user_strict=false, $acltags, $return $list['_monitors_warning_'] += (int) $value['monitors_warning']; $list['_monitors_unknown_'] += (int) $value['monitors_unknown']; $list['_monitors_not_init_'] += (int) $value['monitors_not_init']; - $list['_monitor_alerts_fire_count_'] += (int) $value['alerts_fired']; + $list['_monitors_alerts_fired_'] += (int) $value['alerts_fired']; } if (!empty($data_stats_unknown)) { From 125a5bffc603dc1f1fa0032217f05f620c95b774 Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Fri, 11 Dec 2020 15:21:28 +0100 Subject: [PATCH 14/62] Fixed mobile events modal opening twice --- pandora_console/mobile/operation/events.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/mobile/operation/events.php b/pandora_console/mobile/operation/events.php index 41d078e1eb..676fed11fa 100644 --- a/pandora_console/mobile/operation/events.php +++ b/pandora_console/mobile/operation/events.php @@ -121,7 +121,7 @@ class Events $status_icon = html_print_image($img_st, true, false, false, false, false, true); $row = []; - $row[] = ''.__('Event Name').'
'.io_safe_output(str_replace([' ', ''], ' ', $event['evento'])).'
'; + $row[] = ''.__('Event Name').'
'.io_safe_output(str_replace([' ', ''], ' ', $event['evento'])).'
'; if ($event['id_agente'] == 0) { $agent_name = __('System'); From dc5a0eb5b9bba3ad519152c8430b42169092a93f Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Mon, 14 Dec 2020 17:33:58 +0100 Subject: [PATCH 15/62] Fix issue with adding agents and modules --- .../agentes/planned_downtime.editor.php | 41 ++++------------ pandora_console/include/functions_agents.php | 48 +++++++++++++++++++ 2 files changed, 58 insertions(+), 31 deletions(-) diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php index 40d3f3b1e3..08b114d28d 100644 --- a/pandora_console/godmode/agentes/planned_downtime.editor.php +++ b/pandora_console/godmode/agentes/planned_downtime.editor.php @@ -15,7 +15,7 @@ * |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______| * * ============================================================================ - * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas + * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas * Please see http://pandorafms.org for full contribution list * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -70,7 +70,6 @@ ui_print_page_header( // Recursion group filter. $recursion = get_parameter('recursion', $_POST['recursion']); - // Initialize data. $id_group = (int) get_parameter('id_group'); $name = (string) get_parameter('name'); @@ -181,9 +180,15 @@ if ($insert_downtime_agent === 1) { __('This elements cannot be modified while the downtime is being executed') ); } else { + // If is selected 'Any', get all the agents. + if (count($agents) === 1 && (int) $agents[0] === -2) { + $all_agents = get_parameter('all_agents'); + $agents = explode(',', $all_agents); + } + foreach ($agents as $agent_id) { // Check module belongs to the agent. - if ($modules_selection_mode == 'all') { + if ($modules_selection_mode == 'all' && $all_modules === false) { $check = false; foreach ($module_names as $module_name) { $check_module = modules_get_agentmodule_id( @@ -896,33 +901,7 @@ if ($id_downtime > 0) { } } - $sql = sprintf( - 'SELECT tagente.id_agente, tagente.alias - FROM tagente - WHERE tagente.id_agente NOT IN ( - SELECT tagente.id_agente - FROM tagente, tplanned_downtime_agents - WHERE tplanned_downtime_agents.id_agent = tagente.id_agente - AND tplanned_downtime_agents.id_downtime = %d - ) AND disabled = 0 %s - AND tagente.id_grupo IN (%s) - ORDER BY tagente.nombre', - $id_downtime, - $filter_cond, - $id_groups_str - ); - $agents = db_get_all_rows_sql($sql); - if (empty($agents)) { - $agents = []; - } - - $agent_ids = extract_column($agents, 'id_agente'); - $agent_names = extract_column($agents, 'alias'); - - $agents = array_combine($agent_ids, $agent_names); - if ($agents === false) { - $agents = []; - } + $agents = get_planned_downtime_agents_list($id_downtime, $filter_cond, $id_groups_str); $disabled_add_button = false; if (empty($agents) || $disabled_in_execution) { @@ -940,7 +919,7 @@ if ($id_downtime > 0) { // Show available agents to include into downtime echo '

'.__('Available agents').':

'; echo "
"; - + html_print_input_hidden('all_agents', implode(',', array_keys($agents))); echo html_print_select($agents, 'id_agents[]', -1, '', _('Any'), -2, false, true, true, '', false, 'width: 180px;'); if ($type_downtime != 'quiet') { diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index c9d93b6e36..dc67ccf998 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -3800,3 +3800,51 @@ function agents_get_last_status_change($id_agent) return $row['last_status_change']; } + + +/** + * Return the list of agents for a planned downtime + * + * @param integer $id_downtime Id of planned downtime. + * @param string $filter_cond String-based filters. + * @param string $id_groups_str String-based list of id group, separated with commas. + * + * @return array + */ +function get_planned_downtime_agents_list($id_downtime, $filter_cond, $id_groups_str) +{ + $agents = []; + + $sql = sprintf( + 'SELECT tagente.id_agente, tagente.alias + FROM tagente + WHERE tagente.id_agente NOT IN ( + SELECT tagente.id_agente + FROM tagente, tplanned_downtime_agents + WHERE tplanned_downtime_agents.id_agent = tagente.id_agente + AND tplanned_downtime_agents.id_downtime = %d + ) AND disabled = 0 %s + AND tagente.id_grupo IN (%s) + ORDER BY tagente.nombre', + $id_downtime, + $filter_cond, + $id_groups_str + ); + + $agents = db_get_all_rows_sql($sql); + + if (empty($agents)) { + $agents = []; + } + + $agent_ids = extract_column($agents, 'id_agente'); + $agent_names = extract_column($agents, 'alias'); + + $agents = array_combine($agent_ids, $agent_names); + + if ($agents === false) { + $agents = []; + } + + return $agents; +} From bb01a076b80507cc974fa4e214d1e8ca89da00d0 Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Wed, 16 Dec 2020 17:19:06 +0100 Subject: [PATCH 16/62] fixed omnishell errors --- pandora_console/include/functions_agents.php | 26 +++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index c9d93b6e36..ebdf494104 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -21,6 +21,8 @@ require_once $config['homedir'].'/include/functions.php'; require_once $config['homedir'].'/include/functions_modules.php'; require_once $config['homedir'].'/include/functions_users.php'; +use PandoraFMS\Enterprise\RCMDFile as RCMDFile; + /** * Return the agent if exists in the DB. @@ -2410,10 +2412,32 @@ function agents_delete_agent($id_agents, $disableACL=false) enterprise_include_once('include/functions_policies.php'); enterprise_hook('policies_delete_agent', [$id_agent]); - // Delete agent in networkmap enterprise if (enterprise_installed()) { + // Delete agent in networkmap. enterprise_include_once('include/functions_networkmap.php'); networkmap_delete_nodes_by_agent([$id_agent]); + + // Delete command targets with agent. + enterprise_include_once('include/lib/RCMDFile.class.php'); + + $target_filter = ['id_agent' => $id_agent]; + + // Retrieve all commands that have targets with specific agent id. + $commands = RCMDFile::getAll( + ['rct.rcmd_id'], + $target_filter + ); + + foreach ($commands as $command) { + hd($command, true); + $rcmd_id = $command['rcmd_id']; + $rcmd = new RCMDFile($rcmd_id); + + $command_targets = []; + + $command_targets = $rcmd->getTargets(false, $target_filter); + $rcmd->deleteTargets(array_keys($command_targets)); + } } // tagente_datos_inc From 6e9916a92546fe240f2f13a3dd4bc645d5a6175d Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Wed, 16 Dec 2020 17:20:25 +0100 Subject: [PATCH 17/62] fixed omnishell errors --- pandora_console/include/functions_agents.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index ebdf494104..833cf090d0 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -2429,7 +2429,6 @@ function agents_delete_agent($id_agents, $disableACL=false) ); foreach ($commands as $command) { - hd($command, true); $rcmd_id = $command['rcmd_id']; $rcmd = new RCMDFile($rcmd_id); From a8ab897d44058353a1a16097a256f32c4bc6ac77 Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Thu, 17 Dec 2020 17:42:53 +0100 Subject: [PATCH 18/62] Fixed tokens htpp_auth user,avoid repetiton --- .../godmode/agentes/configurar_agente.php | 49 +++++++++++++------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 422d4d0f13..2fa17d754f 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -1570,24 +1570,43 @@ if ($update_module) { 'module_macros' => $module_macros, ]; - if ($id_module_type == 30 || $id_module_type == 31 || $id_module_type == 32 || $id_module_type == 33) { - $plugin_parameter_split = explode(' ', $values['plugin_parameter']); + if (preg_match('/http_auth_user/m', $values['plugin_parameter'])) { + $http_user_conf = true; + } - $values['plugin_parameter'] = ''; + if (preg_match('/http_auth_pass/m', $values['plugin_parameter'])) { + $http_pass_conf = true; + } - foreach ($plugin_parameter_split as $key => $value) { - if ($key == 1) { - if ($http_user) { - $values['plugin_parameter'] .= 'http_auth_user '.$http_user.' '; + + if (!$http_user_conf || !$http_pass_conf) { + if ($id_module_type == 30 || $id_module_type == 31 || $id_module_type == 32 || $id_module_type == 33) { + $plugin_parameter_split = explode(' ', $values['plugin_parameter']); + + $values['plugin_parameter'] = ''; + + foreach ($plugin_parameter_split as $key => $value) { + if ($key == 1) { + if ($http_user) { + if ($http_user_conf) { + continue; + } + + $values['plugin_parameter'] .= 'http_auth_user '.$http_user.' '; + } + + if ($http_pass) { + if ($http_user_pass) { + continue; + } + + $values['plugin_parameter'] .= 'http_auth_pass '.$http_pass.' '; + } + + $values['plugin_parameter'] .= $value.' '; + } else { + $values['plugin_parameter'] .= $value.' '; } - - if ($http_pass) { - $values['plugin_parameter'] .= 'http_auth_pass '.$http_pass.' '; - } - - $values['plugin_parameter'] .= $value.' '; - } else { - $values['plugin_parameter'] .= $value.' '; } } } From 92f57e6176412e6720b4975b3f481da87acd7be8 Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Wed, 23 Dec 2020 13:43:54 +0100 Subject: [PATCH 19/62] Added macros to reports items list --- .../reporting_builder.list_items.php | 56 ++++++++++++++++++- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php index ff4c46abf8..722182405d 100755 --- a/pandora_console/godmode/reporting/reporting_builder.list_items.php +++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php @@ -515,18 +515,68 @@ foreach ($items as $item) { $style = json_decode(io_safe_output($item['style']), true); + + // Macros + $items_macro = []; + + if (!empty($item['id_agent'])) { + $id_agent = $item['id_agent']; + // Add macros name. + $agent_description = agents_get_description($id_agent); + $agent_group = agents_get_agent_group($id_agent); + $agent_address = agents_get_address($id_agent); + $agent_alias = agents_get_alias($id_agent); + + $items_macro_agent = [ + 'id_agent' => $id_agent, + 'agent_description' => $agent_description, + 'agent_group' => $agent_group, + 'agent_address' => $agent_address, + 'agent_alias' => $agent_alias, + ]; + + $items_macro = array_merge($items_macro, $items_macro_agent); + } + + if (!empty($item['id_agent_module'])) { + $id_agent_module = $item['id_agent_module']; + $module_name = modules_get_agentmodule_name( + $id_agent_module + ); + $module_description = modules_get_agentmodule_descripcion( + $id_agent_module + ); + + $items_macro_module = [ + 'id_agent_module' => $id_agent_module, + 'module_name' => $module_name, + 'module_description' => $module_description, + ]; + + $items_macro = array_merge($items_macro, $items_macro_module); + } + + + if ($style['name_label'] != '') { $text = empty($style['name_label']) ? $item['description'] : $style['name_label']; - $row[5] = ui_print_truncate_text($text, 'description', true, true); } else { if ($item['name'] == '' && $item['description'] == '') { - $row[5] = '-'; + $text = '-'; } else { $text = empty($item['name']) ? $item['description'] : $item['name']; - $row[5] = ui_print_truncate_text($text, 'description', true, true); } } + // Apply macros + $items_macro['type'] = $item['type']; + $text = reporting_label_macro( + $items_macro, + $text + ); + $row[5] = ui_print_truncate_text($text, 'description', true, true); + + $row[6] = ''; if (check_acl($config['id_user'], $item['id_group'], 'RM')) { From df9bc6198d6e6190de72901e7156a3e38099c246 Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Tue, 29 Dec 2020 12:04:09 +0100 Subject: [PATCH 20/62] Added string exclude filter to events reports --- .../reporting_builder.item_editor.php | 28 +++- .../godmode/reporting/reporting_builder.php | 15 ++ pandora_console/include/functions_events.php | 132 +++++++++++------- .../include/functions_reporting.php | 61 +++++--- 4 files changed, 168 insertions(+), 68 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 52d94006d7..79d30146ce 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -140,6 +140,8 @@ $visual_format = 0; // Others. $filter_search = ''; +$filter_exclude = ''; + // Added for select fields. $total_time = true; @@ -556,6 +558,8 @@ switch ($action) { $include_extended_events = $item['show_extended_events']; $filter_search = $style['event_filter_search']; + $filter_exclude = $style['event_filter_exclude']; + break; case 'event_report_group': @@ -570,6 +574,7 @@ switch ($action) { $event_graph_validated_vs_unvalidated = $style['event_graph_validated_vs_unvalidated']; $filter_search = $style['event_filter_search']; + $filter_exclude = $style['event_filter_exclude']; $filter_event_severity = json_decode($style['filter_event_severity'], true); $filter_event_status = json_decode($style['filter_event_status'], true); @@ -607,6 +612,8 @@ switch ($action) { $event_graph_validated_vs_unvalidated = $style['event_graph_validated_vs_unvalidated']; $filter_search = $style['event_filter_search']; + $filter_exclude = $style['event_filter_exclude']; + $include_extended_events = $item['show_extended_events']; break; @@ -2744,10 +2751,20 @@ $class = 'databox filters'; - + + + + + + + @@ -5141,6 +5158,7 @@ function chooseType() { $("#row_resolution").hide(); $("#row_last_value").hide(); $("#row_filter_search").hide(); + $("#row_filter_exclude").hide(); $("#row_percentil").hide(); $("#log_help_tip").css("visibility", "hidden"); $("#agents_row").hide(); @@ -5191,6 +5209,8 @@ function chooseType() { $("#row_extended_events").show(); $("#row_filter_search").show(); + $("#row_filter_exclude").show(); + $("#row_event_severity").show(); $("#row_event_status").show(); @@ -5486,6 +5506,8 @@ function chooseType() { $("#row_extended_events").show(); $("#row_filter_search").show(); + $("#row_filter_exclude").show(); + $("#row_historical_db_check").hide(); break; @@ -5509,6 +5531,8 @@ function chooseType() { $('#agent_autocomplete').hide(); $('#agent_autocomplete_events').show(); $("#row_filter_search").show(); + $("#row_filter_exclude").show(); + $("#row_historical_db_check").hide(); break; @@ -5531,6 +5555,8 @@ function chooseType() { $('#agent_autocomplete').hide(); $('#agent_autocomplete_events').show(); $("#row_filter_search").show(); + $("#row_filter_exclude").show(); + $("#row_historical_db_check").hide(); break; diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 3180fb918e..d5981e2699 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -1861,6 +1861,11 @@ switch ($action) { '' ); + $event_filter_exclude = get_parameter( + 'filter_exclude', + '' + ); + // If metaconsole is activated. if (is_metaconsole() === true) { if (($values['type'] == 'custom_graph') @@ -1998,6 +2003,8 @@ switch ($action) { $style['event_graph_by_criticity'] = $event_graph_by_criticity; $style['event_graph_validated_vs_unvalidated'] = $event_graph_validated_vs_unvalidated; $style['event_filter_search'] = $event_filter_search; + $style['event_filter_exclude'] = $event_filter_exclude; + if ($label != '') { $style['label'] = $label; @@ -2602,6 +2609,12 @@ switch ($action) { '' ); + $event_filter_exclude = get_parameter( + 'filter_exclude', + '' + ); + + // Added for events items. $style['show_summary_group'] = $show_summary_group; $style['filter_event_severity'] = json_encode( @@ -2619,6 +2632,8 @@ switch ($action) { $style['event_graph_by_criticity'] = $event_graph_by_criticity; $style['event_graph_validated_vs_unvalidated'] = $event_graph_validated_vs_unvalidated; $style['event_filter_search'] = $event_filter_search; + $style['event_filter_exclude'] = $event_filter_exclude; + if ($label != '') { $style['label'] = $label; } else { diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index cd66fc78a1..99d3dfb697 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -2878,20 +2878,21 @@ function events_get_group_events_steps( * * The returned events will be in the time interval ($date - $period, $date] * - * @param integer $id_agent Agent id to get events. - * @param integer $period Period in seconds to get events. - * @param integer $date Beginning date to get events. - * @param boolean $history History. - * @param boolean $show_summary_group Show_summary_group. - * @param boolean $filter_event_severity Filter_event_severity. - * @param boolean $filter_event_type Filter_event_type. - * @param boolean $filter_event_status Filter_event_status. - * @param boolean $filter_event_filter_search Filter_event_filter_search. - * @param boolean $id_group Id_group. - * @param boolean $events_group Events_group. - * @param boolean $id_agent_module Id_agent_module. - * @param boolean $events_module Events_module. - * @param boolean $id_server Id_server. + * @param integer $id_agent Agent id to get events. + * @param integer $period Period in seconds to get events. + * @param integer $date Beginning date to get events. + * @param boolean $history History. + * @param boolean $show_summary_group Show_summary_group. + * @param boolean $filter_event_severity Filter_event_severity. + * @param boolean $filter_event_type Filter_event_type. + * @param boolean $filter_event_status Filter_event_status. + * @param boolean $filter_event_filter_search Filter_event_filter_search. + * @param boolean $id_group Id_group. + * @param boolean $events_group Events_group. + * @param boolean $id_agent_module Id_agent_module. + * @param boolean $events_module Events_module. + * @param boolean $id_server Id_server. + * @param boolean $filter_event_filter_exclude Filter_event_filter_exclude. * * @return array An array with all the events happened. */ @@ -2909,7 +2910,8 @@ function events_get_agent( $events_group=false, $id_agent_module=false, $events_module=false, - $id_server=false + $id_server=false, + $filter_event_filter_exclude=false ) { global $config; @@ -3017,6 +3019,10 @@ function events_get_agent( $sql_where .= ' AND (evento LIKE "%'.io_safe_input($filter_event_filter_search).'%" OR id_evento LIKE "%'.io_safe_input($filter_event_filter_search).'%")'; } + if (!empty($filter_event_filter_exclude)) { + $sql_where .= ' AND (evento NOT LIKE "%'.io_safe_input($filter_event_filter_exclude).'%" AND id_evento NOT LIKE "%'.io_safe_input($filter_event_filter_exclude).'%")'; + } + if ($events_group) { $secondary_groups = sprintf( ' INNER JOIN tgrupo tg @@ -4996,14 +5002,15 @@ function events_clean_tags($tags) * * The returned events will be in the time interval ($date - $period, $date] * - * @param mixed $id_group Group id to get events for. - * @param integer $period Period in seconds to get events. - * @param integer $date Beginning date to get events. - * @param boolean $filter_event_severity Filter_event_severity. - * @param boolean $filter_event_type Filter_event_type. - * @param boolean $filter_event_status Filter_event_status. - * @param boolean $filter_event_filter_search Filter_event_filter_search. - * @param boolean $dbmeta Dbmeta. + * @param mixed $id_group Group id to get events for. + * @param integer $period Period in seconds to get events. + * @param integer $date Beginning date to get events. + * @param boolean $filter_event_severity Filter_event_severity. + * @param boolean $filter_event_type Filter_event_type. + * @param boolean $filter_event_status Filter_event_status. + * @param boolean $filter_event_filter_search Filter_event_filter_search. + * @param boolean $dbmeta Dbmeta. + * @param boolean $filter_event_filter_exclude Filter_event_filter_exclude. * * @return array An array with all the events happened. */ @@ -5015,7 +5022,8 @@ function events_get_count_events_by_agent( $filter_event_type=false, $filter_event_status=false, $filter_event_filter_search=false, - $dbmeta=false + $dbmeta=false, + $filter_event_filter_exclude=false ) { global $config; @@ -5115,6 +5123,10 @@ function events_get_count_events_by_agent( $sql_where .= ' AND (evento LIKE "%'.io_safe_input($filter_event_filter_search).'%" OR id_evento LIKE "%'.io_safe_input($filter_event_filter_search).'%")'; } + if (!empty($filter_event_filter_exclude)) { + $sql_where .= ' AND (evento NOT LIKE "%'.io_safe_input($filter_event_filter_exclude).'%" AND id_evento NOT LIKE "%'.io_safe_input($filter_event_filter_exclude).'%")'; + } + $tagente = 'tagente'; $tevento = 'tevento'; @@ -5167,14 +5179,15 @@ function events_get_count_events_by_agent( * * The returned events will be in the time interval ($date - $period, $date] * - * @param array $filter Use target filter. - * @param integer $period Period in seconds to get events. - * @param integer $date Beginning date to get events. - * @param boolean $filter_event_severity Filter_event_severity. - * @param boolean $filter_event_type Filter_event_type. - * @param boolean $filter_event_status Filter_event_status. - * @param boolean $filter_event_filter_search Filter_event_filter_search. - * @param boolean $dbmeta Dbmeta. + * @param array $filter Use target filter. + * @param integer $period Period in seconds to get events. + * @param integer $date Beginning date to get events. + * @param boolean $filter_event_severity Filter_event_severity. + * @param boolean $filter_event_type Filter_event_type. + * @param boolean $filter_event_status Filter_event_status. + * @param boolean $filter_event_filter_search Filter_event_filter_search. + * @param boolean $dbmeta Dbmeta. + * @param boolean $filter_event_filter_exclude Filter_event_filter_exclude. * * @return array An array with all the events happened. */ @@ -5186,7 +5199,8 @@ function events_get_count_events_validated_by_user( $filter_event_type=false, $filter_event_status=false, $filter_event_filter_search=false, - $dbmeta=false + $dbmeta=false, + $filter_event_filter_exclude=false ) { global $config; $tevento = 'tevento'; @@ -5308,6 +5322,10 @@ function events_get_count_events_validated_by_user( $sql_where .= ' AND (evento LIKE "%'.io_safe_input($filter_event_filter_search).'%" OR id_evento LIKE "%'.io_safe_input($filter_event_filter_search).'%")'; } + if (!empty($filter_event_filter_exclude)) { + $sql_where .= ' AND (evento NOT LIKE "%'.io_safe_input($filter_event_filter_exclude).'%" AND id_evento NOT LIKE "%'.io_safe_input($filter_event_filter_exclude).'%")'; + } + $sql = sprintf( 'SELECT te.id_usuario, @@ -5356,14 +5374,15 @@ function events_get_count_events_validated_by_user( * * The returned events will be in the time interval ($date - $period, $date] * - * @param mixed $filter Target filter. - * @param integer $period Period in seconds to get events. - * @param integer $date Beginning date to get events. - * @param boolean $filter_event_severity Filter_event_severity. - * @param boolean $filter_event_type Filter_event_type. - * @param boolean $filter_event_status Filter_event_status. - * @param boolean $filter_event_filter_search Filter_event_filter_search. - * @param boolean $dbmeta Dbmeta. + * @param mixed $filter Target filter. + * @param integer $period Period in seconds to get events. + * @param integer $date Beginning date to get events. + * @param boolean $filter_event_severity Filter_event_severity. + * @param boolean $filter_event_type Filter_event_type. + * @param boolean $filter_event_status Filter_event_status. + * @param boolean $filter_event_filter_search Filter_event_filter_search. + * @param boolean $dbmeta Dbmeta. + * @param boolean $filter_event_filter_exclude Filter_event_filter_exclude. * * @return array An array with all the events happened. */ @@ -5375,7 +5394,8 @@ function events_get_count_events_by_criticity( $filter_event_type=false, $filter_event_status=false, $filter_event_filter_search=false, - $dbmeta=false + $dbmeta=false, + $filter_event_filter_exclude=false ) { global $config; @@ -5499,6 +5519,10 @@ function events_get_count_events_by_criticity( $sql_where .= ' AND (evento LIKE "%'.io_safe_input($filter_event_filter_search).'%" OR id_evento LIKE "%'.io_safe_input($filter_event_filter_search).'%")'; } + if (!empty($filter_event_filter_exclude)) { + $sql_where .= ' AND (evento NOT LIKE "%'.io_safe_input($filter_event_filter_exclude).'%" AND id_evento NOT LIKE "%'.io_safe_input($filter_event_filter_exclude).'%")'; + } + $sql = sprintf( 'SELECT te.criticity, @@ -5538,14 +5562,15 @@ function events_get_count_events_by_criticity( * * The returned events will be in the time interval ($date - $period, $date] * - * @param mixed $filter Target filter. - * @param integer $period Period in seconds to get events. - * @param integer $date Beginning date to get events. - * @param boolean $filter_event_severity Filter_event_severity. - * @param boolean $filter_event_type Filter_event_type. - * @param boolean $filter_event_status Filter_event_status. - * @param boolean $filter_event_filter_search Filter_event_filter_search. - * @param boolean $dbmeta Dbmeta. + * @param mixed $filter Target filter. + * @param integer $period Period in seconds to get events. + * @param integer $date Beginning date to get events. + * @param boolean $filter_event_severity Filter_event_severity. + * @param boolean $filter_event_type Filter_event_type. + * @param boolean $filter_event_status Filter_event_status. + * @param boolean $filter_event_filter_search Filter_event_filter_search. + * @param boolean $dbmeta Dbmeta. + * @param boolean $filter_event_filter_exclude Filter_event_filter_exclude. * * @return array An array with all the events happened. */ @@ -5557,7 +5582,8 @@ function events_get_count_events_validated( $filter_event_type=false, $filter_event_status=false, $filter_event_filter_search=false, - $dbmeta=false + $dbmeta=false, + $filter_event_filter_exclude=false ) { global $config; $tevento = 'tevento'; @@ -5710,6 +5736,10 @@ function events_get_count_events_validated( $sql_where .= ' AND (evento LIKE "%'.io_safe_input($filter_event_filter_search).'%" OR id_evento LIKE "%'.io_safe_input($filter_event_filter_search).'%")'; } + if (!empty($filter_event_filter_exclude)) { + $sql_where .= ' AND (evento NOT LIKE "%'.io_safe_input($filter_event_filter_exclude).'%" AND id_evento NOT LIKE "%'.io_safe_input($filter_event_filter_exclude).'%")'; + } + $sql = sprintf( 'SELECT te.estado, diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index d5054d4ffd..3a14be44df 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -1868,6 +1868,10 @@ function reporting_event_report_group( $return['subtitle'] .= ' ('.$content['style']['event_filter_search'].')'; } + if (!empty($content['style']['event_filter_exclude'])) { + $return['subtitle'] .= ' ('.__('Exclude ').$content['style']['event_filter_exclude'].')'; + } + $return['description'] = $content['description']; $return['show_extended_events'] = $content['show_extended_events']; $return['date'] = reporting_get_date_text($report, $content); @@ -1880,6 +1884,7 @@ function reporting_event_report_group( $filter_event_type = json_decode($event_filter['filter_event_type'], true); $filter_event_status = json_decode($event_filter['filter_event_status'], true); $filter_event_filter_search = $event_filter['event_filter_search']; + $filter_event_filter_exclude = $event_filter['event_filter_exclude']; // Graphs. $event_graph_by_agent = $event_filter['event_graph_by_agent']; @@ -1919,7 +1924,11 @@ function reporting_event_report_group( $filter_event_status, $filter_event_filter_search, $content['id_group'], - true + true, + false, + false, + false, + $filter_event_filter_exclude ); if (empty($data)) { @@ -1965,7 +1974,8 @@ function reporting_event_report_group( $filter_event_type, $filter_event_status, $filter_event_filter_search, - $metaconsole_dbtable + $metaconsole_dbtable, + $filter_event_filter_exclude ); $return['chart']['by_agent'] = pie_graph( @@ -1990,7 +2000,8 @@ function reporting_event_report_group( $filter_event_type, $filter_event_status, $filter_event_filter_search, - $metaconsole_dbtable + $metaconsole_dbtable, + $filter_event_filter_exclude ); $return['chart']['by_user_validator'] = pie_graph( @@ -2044,7 +2055,8 @@ function reporting_event_report_group( $filter_event_type, $filter_event_status, $filter_event_filter_search, - $metaconsole_dbtable + $metaconsole_dbtable, + $filter_event_filter_exclude ); $return['chart']['validated_vs_unvalidated'] = pie_graph( @@ -2189,6 +2201,7 @@ function reporting_event_report_module( true ); $filter_event_filter_search = $event_filter['event_filter_search']; + $filter_event_filter_exclude = $event_filter['event_filter_exclude']; // Graphs. $event_graph_by_user_validator = $event_filter['event_graph_by_user_validator']; @@ -2218,7 +2231,8 @@ function reporting_event_report_module( $event_graph_validated_vs_unvalidated, $ttl, $id_server, - $metaconsole_dbtable + $metaconsole_dbtable, + $filter_event_filter_exclude ); if (empty($data)) { @@ -3259,6 +3273,7 @@ function reporting_event_report_agent( $filter_event_type = json_decode($style['filter_event_type'], true); $filter_event_status = json_decode($style['filter_event_status'], true); $filter_event_filter_search = $style['event_filter_search']; + $filter_event_filter_exclude = $style['event_filter_exclude']; // Graph. $event_graph_by_user_validator = $style['event_graph_by_user_validator']; @@ -3276,7 +3291,8 @@ function reporting_event_report_agent( $filter_event_severity, $filter_event_type, $filter_event_status, - $filter_event_filter_search + $filter_event_filter_search, + $filter_event_filter_exclude ); reporting_set_conf_charts( @@ -3316,7 +3332,8 @@ function reporting_event_report_agent( $filter_event_type, $filter_event_status, $filter_event_filter_search, - $metaconsole_dbtable + $metaconsole_dbtable, + $filter_event_filter_exclude ); $return['chart']['by_user_validator'] = pie_graph( @@ -3341,7 +3358,8 @@ function reporting_event_report_agent( $filter_event_type, $filter_event_status, $filter_event_filter_search, - $metaconsole_dbtable + $metaconsole_dbtable, + $filter_event_filter_exclude ); $colors = get_criticity_pie_colors($data_graph); @@ -3370,7 +3388,8 @@ function reporting_event_report_agent( $filter_event_type, $filter_event_status, $filter_event_filter_search, - $metaconsole_dbtable + $metaconsole_dbtable, + $filter_event_filter_exclude ); $return['chart']['validated_vs_unvalidated'] = pie_graph( @@ -9406,7 +9425,8 @@ function reporting_get_module_detailed_event( $event_graph_validated_vs_unvalidated=false, $ttl=1, $id_server=false, - $metaconsole_dbtable=false + $metaconsole_dbtable=false, + $filter_event_filter_exclude=false ) { global $config; @@ -9442,7 +9462,8 @@ function reporting_get_module_detailed_event( false, $id_module, true, - $id_server + $id_server, + $filter_event_filter_exclude ); // total_events @@ -9470,7 +9491,8 @@ function reporting_get_module_detailed_event( $filter_event_type, $filter_event_status, $filter_event_filter_search, - $metaconsole_dbtable + $metaconsole_dbtable, + $filter_event_filter_exclude ); $event['chart']['by_user_validator'] = pie_graph( @@ -9495,7 +9517,8 @@ function reporting_get_module_detailed_event( $filter_event_type, $filter_event_status, $filter_event_filter_search, - $metaconsole_dbtable + $metaconsole_dbtable, + $filter_event_filter_exclude ); $colors = get_criticity_pie_colors($data_graph); @@ -9524,7 +9547,8 @@ function reporting_get_module_detailed_event( $filter_event_type, $filter_event_status, $filter_event_filter_search, - $metaconsole_dbtable + $metaconsole_dbtable, + $filter_event_filter_exclude ); $event['chart']['validated_vs_unvalidated'] = pie_graph( @@ -9573,7 +9597,8 @@ function reporting_get_agents_detailed_event( $filter_event_severity=false, $filter_event_type=false, $filter_event_status=false, - $filter_event_filter_search=false + $filter_event_filter_search=false, + $filter_event_filter_exclude=false ) { global $config; @@ -9605,7 +9630,11 @@ function reporting_get_agents_detailed_event( $filter_event_status, $filter_event_filter_search, false, - false + false, + false, + false, + false, + $filter_event_filter_exclude ); if (empty($event)) { From 9bb6e7067b6a552b2f05e0720e6a3676f7744d75 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 18 Jan 2021 16:28:15 +0100 Subject: [PATCH 21/62] removed second head --- .../godmode/modules/manage_network_components.php | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php index 01107de845..2c6f0a7362 100644 --- a/pandora_console/godmode/modules/manage_network_components.php +++ b/pandora_console/godmode/modules/manage_network_components.php @@ -64,19 +64,6 @@ if (defined('METACONSOLE')) { $help_header = 'network_component_tab'; } - ui_print_page_header( - __('Remote components'), - '', - false, - $help_header, - true, - '', - false, - 'modulemodal', - GENERIC_SIZE_TEXT, - '', - __('Configuration').' / '.__('Templates').' / '.__('Remote components') - ); $sec = 'gmodules'; } From 642258e1a31d3bf8d29dbb697c2c5a67bc070b3c Mon Sep 17 00:00:00 2001 From: marcos Date: Thu, 21 Jan 2021 13:38:03 +0100 Subject: [PATCH 22/62] add status filter on alert list filter --- pandora_console/godmode/alerts/alert_list.list.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index 8dde93e85f..2c058eb448 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -144,6 +144,17 @@ if (!$own_info['is_admin'] && !check_acl($config['id_user'], 0, 'AR') && !check_ $form_filter .= html_print_select_groups(false, 'AR', $return_all_group, 'ag_group', $ag_group, '', '', 0, true, false, true, '', false); $form_filter .= ''; + +$alert_status_filter = []; +$alert_status_filter['all_enabled'] = __('All (Enabled)'); +$alert_status_filter['all'] = __('All'); +$alert_status_filter['fired'] = __('Fired'); +$alert_status_filter['notfired'] = __('Not fired'); +$alert_status_filter['disabled'] = __('Disabled'); + +$form_filter .= "".__('Status').''; +$form_filter .= html_print_select($alert_status_filter, 'filter', $filter, '', '', '', true); +$form_filter .= ''; if (defined('METACONSOLE')) { $form_filter .= ''; $form_filter .= ""; From 693a58ef69082a47b0d4b48051bbd97ac2268dec Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Thu, 21 Jan 2021 15:39:29 +0100 Subject: [PATCH 23/62] Fixed label size --- .../godmode/reporting/graph_builder.graph_editor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/reporting/graph_builder.graph_editor.php b/pandora_console/godmode/reporting/graph_builder.graph_editor.php index 05e9d549a6..bae0f0d504 100644 --- a/pandora_console/godmode/reporting/graph_builder.graph_editor.php +++ b/pandora_console/godmode/reporting/graph_builder.graph_editor.php @@ -235,7 +235,7 @@ if ($count_module_array > 0) { echo ''; echo ""; - html_print_input_text('label', $label_array[$a], '', 20, 30, false, false); + html_print_input_text('label', $label_array[$a], '', 30, 80, false, false); html_print_submit_button('Ok', 'btn', false, '', false); echo ''; From d9309616c4d86cda9c2767d5157c5c2aabc04add Mon Sep 17 00:00:00 2001 From: marcos Date: Thu, 21 Jan 2021 17:13:49 +0100 Subject: [PATCH 24/62] updates new filter --- pandora_console/godmode/alerts/alert_list.list.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index 2c058eb448..c9ef76edc1 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -153,7 +153,7 @@ $alert_status_filter['notfired'] = __('Not fired'); $alert_status_filter['disabled'] = __('Disabled'); $form_filter .= "'; if (defined('METACONSOLE')) { $form_filter .= ''; @@ -187,6 +187,10 @@ $total = 0; $where = ''; if ($searchFlag) { + if ($status_alert != -1 && $status_alert != '') { + $where .= ' '; + } + if ($priority != -1 && $priority != '') { $where .= ' AND id_alert_template IN (SELECT id FROM talert_templates WHERE priority = '.$priority.')'; } @@ -396,7 +400,7 @@ switch ($sortField) { break; } -$form_params = '&template_name='.$templateName.'&agent_name='.$agentName.'&module_name='.$moduleName.'&action_id='.$actionID.'&field_content='.$fieldContent.'&priority='.$priority.'&enabledisable='.$enabledisable.'&standby='.$standby.'&ag_group='.$ag_group; +$form_params = '&template_name='.$templateName.'&agent_name='.$agentName.'&module_name='.$moduleName.'&action_id='.$actionID.'&field_content='.$fieldContent.'&priority='.$priority.'&enabledisable='.$enabledisable.'&standby='.$standby.'&ag_group='.$ag_group.'&status_alert='.$status_alert; $sort_params = '&sort_field='.$sortField.'&sort='.$sort; if ($id_agente) { From dc455636d9cc7a764399a83a8a5de8cfad19040a Mon Sep 17 00:00:00 2001 From: marcos Date: Fri, 22 Jan 2021 14:15:26 +0100 Subject: [PATCH 25/62] add status filter alert list --- pandora_console/godmode/alerts/alert_list.list.php | 10 ++++++---- pandora_console/godmode/alerts/alert_list.php | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index c9ef76edc1..f70fdb5fa2 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -146,11 +146,9 @@ $form_filter .= html_print_select_groups(false, 'AR', $return_all_group, 'ag_gro $form_filter .= ''; $alert_status_filter = []; -$alert_status_filter['all_enabled'] = __('All (Enabled)'); $alert_status_filter['all'] = __('All'); $alert_status_filter['fired'] = __('Fired'); $alert_status_filter['notfired'] = __('Not fired'); -$alert_status_filter['disabled'] = __('Disabled'); $form_filter .= ""; $form_filter .= ''; $form_filter .= ''; -$form_filter .= "'; -$alert_status_filter = []; -$alert_status_filter['all'] = __('All'); -$alert_status_filter['fired'] = __('Fired'); -$alert_status_filter['notfired'] = __('Not fired'); - -$form_filter .= "'; if (defined('METACONSOLE')) { $form_filter .= ''; $form_filter .= "
".__('Status').''; -$form_filter .= html_print_select($alert_status_filter, 'filter', $filter, '', '', '', true); +$form_filter .= html_print_select($alert_status_filter, 'status_alert', $status_alert, '', '', '', true); $form_filter .= '
".__('Status').''; $form_filter .= html_print_select($alert_status_filter, 'status_alert', $status_alert, '', '', '', true); @@ -187,8 +185,12 @@ $total = 0; $where = ''; if ($searchFlag) { - if ($status_alert != -1 && $status_alert != '') { - $where .= ' '; + if ($status_alert == 'fired' && $status_alert != 'all') { + $where .= ' AND id_alert_template IN (SELECT id FROM talert_template_modules WHERE times_fired > 0)'; + } + + if ($status_alert == 'notfired' && $status_alert != 'all') { + $where .= ' AND id_alert_template IN (SELECT id FROM talert_template_modules WHERE times_fired = 0)'; } if ($priority != -1 && $priority != '') { diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php index c94c0f7025..6402fa638b 100644 --- a/pandora_console/godmode/alerts/alert_list.php +++ b/pandora_console/godmode/alerts/alert_list.php @@ -65,6 +65,7 @@ $searchType = get_parameter('search_type', ''); $priority = get_parameter('priority', ''); $searchFlag = get_parameter('search', 0); $enabledisable = get_parameter('enabledisable', ''); +$status_alert = get_parameter('status_alert', ''); $standby = get_parameter('standby', ''); $pure = get_parameter('pure', 0); $ag_group = get_parameter('ag_group', 0); From 74bdab5d002da92ae6b86664d6cd239ce530c443 Mon Sep 17 00:00:00 2001 From: marcos Date: Mon, 25 Jan 2021 11:00:24 +0100 Subject: [PATCH 26/62] add status filter on alert list --- .../godmode/alerts/alert_list.list.php | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index f70fdb5fa2..5f25b79a10 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -123,11 +123,15 @@ $form_filter .= "
".__('Enabled / Disabled').''; +$form_filter .= "".__('Status').''; $ed_list = []; -$ed_list[0] = __('Enabled'); -$ed_list[1] = __('Disabled'); -$form_filter .= html_print_select($ed_list, 'enabledisable', $enabledisable, '', __('All'), -1, true); +$alert_status_filter = []; +$alert_status_filter['all_enabled'] = __('All (Enabled)'); +$alert_status_filter['all'] = __('All'); +$alert_status_filter['fired'] = __('Fired'); +$alert_status_filter['notfired'] = __('Not fired'); +$alert_status_filter['disabled'] = __('Disabled'); +$form_filter .= html_print_select($alert_status_filter, 'status_alert', $status_alert, '', '', '', true); $form_filter .= "".__('Standby').''; $sb_list = []; $sb_list[1] = __('Standby on'); @@ -145,14 +149,6 @@ if (!$own_info['is_admin'] && !check_acl($config['id_user'], 0, 'AR') && !check_ $form_filter .= html_print_select_groups(false, 'AR', $return_all_group, 'ag_group', $ag_group, '', '', 0, true, false, true, '', false); $form_filter .= '
".__('Status').''; -$form_filter .= html_print_select($alert_status_filter, 'status_alert', $status_alert, '', '', '', true); -$form_filter .= '
"; @@ -183,14 +179,13 @@ $simple_alerts = []; $total = 0; $where = ''; - if ($searchFlag) { - if ($status_alert == 'fired' && $status_alert != 'all') { - $where .= ' AND id_alert_template IN (SELECT id FROM talert_template_modules WHERE times_fired > 0)'; + if ($status_alert === 'fired') { + $where .= ' AND talert_template_modules.times_fired > 0'; } - if ($status_alert == 'notfired' && $status_alert != 'all') { - $where .= ' AND id_alert_template IN (SELECT id FROM talert_template_modules WHERE times_fired = 0)'; + if ($status_alert === 'notfired') { + $where .= ' AND talert_template_modules.times_fired = 0'; } if ($priority != -1 && $priority != '') { @@ -223,8 +218,12 @@ if ($searchFlag) { $where .= ' AND talert_template_modules.id IN (SELECT id_alert_template_module FROM talert_template_module_actions WHERE id_alert_action = '.$actionID.') OR talert_template_modules.id IN (SELECT id FROM talert_template_modules ttm WHERE ttm.id_alert_template IN (SELECT tat.id FROM talert_templates tat WHERE tat.id_alert_action = '.$actionID.'))'; } - if ($enabledisable != -1 && $enabledisable != '') { - $where .= ' AND talert_template_modules.disabled ='.$enabledisable; + if ($status_alert === 'disabled') { + $where .= ' AND talert_template_modules.disabled = 1'; + } + + if ($status_alert === 'all_enabled') { + $where .= ' AND talert_template_modules.disabled = 0'; } if ($standby != -1 && $standby != '') { From 0469c3c9a8528bd5fcb6def927c396227f615543 Mon Sep 17 00:00:00 2001 From: Luis Date: Fri, 12 Feb 2021 15:30:44 +0100 Subject: [PATCH 27/62] Pandora sendmail control write all data in socket --- pandora_console/include/functions_api.php | 109 +++++++++++----------- pandora_server/lib/PandoraFMS/Sendmail.pm | 16 +++- 2 files changed, 70 insertions(+), 55 deletions(-) diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index d9ec0e007b..dd96a6b80d 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -5296,6 +5296,7 @@ function api_set_create_alert_template($name, $thrash1, $other, $thrash3) } else { $groups = users_get_groups($config['id_user'], 'LM', false); } + if ($groups[$id_group] === null) { returnError( 'error_create_alert_template', @@ -5311,58 +5312,58 @@ function api_set_create_alert_template($name, $thrash1, $other, $thrash3) } $values = [ - 'description' => $other['data'][1], - 'field1' => $other['data'][3], - 'field2' => $other['data'][4], - 'field3' => $other['data'][5], - 'value' => $other['data'][6], - 'matches_value' => $other['data'][7], - 'max_value' => $other['data'][8], - 'min_value' => $other['data'][9], - 'time_threshold' => $other['data'][10], - 'max_alerts' => $other['data'][11], - 'min_alerts' => $other['data'][12], - 'time_from' => $other['data'][13], - 'time_to' => $other['data'][14], - 'monday' => $other['data'][15], - 'tuesday' => $other['data'][16], - 'wednesday' => $other['data'][17], - 'thursday' => $other['data'][18], - 'friday' => $other['data'][19], - 'saturday' => $other['data'][20], - 'sunday' => $other['data'][21], - 'recovery_notify' => $other['data'][22], - 'field2_recovery' => $other['data'][23], - 'field3_recovery' => $other['data'][24], - 'priority' => $other['data'][25], - 'id_group' => $other['data'][26], - 'special_day' => $other['data'][27], + 'description' => $other['data'][1], + 'field1' => $other['data'][3], + 'field2' => $other['data'][4], + 'field3' => $other['data'][5], + 'value' => $other['data'][6], + 'matches_value' => $other['data'][7], + 'max_value' => $other['data'][8], + 'min_value' => $other['data'][9], + 'time_threshold' => $other['data'][10], + 'max_alerts' => $other['data'][11], + 'min_alerts' => $other['data'][12], + 'time_from' => $other['data'][13], + 'time_to' => $other['data'][14], + 'monday' => $other['data'][15], + 'tuesday' => $other['data'][16], + 'wednesday' => $other['data'][17], + 'thursday' => $other['data'][18], + 'friday' => $other['data'][19], + 'saturday' => $other['data'][20], + 'sunday' => $other['data'][21], + 'recovery_notify' => $other['data'][22], + 'field2_recovery' => $other['data'][23], + 'field3_recovery' => $other['data'][24], + 'priority' => $other['data'][25], + 'id_group' => $other['data'][26], + 'special_day' => $other['data'][27], 'min_alerts_reset_counter' => $other['data'][28], - 'field1_recovery' => $other['data'][29], - 'field4' => $other['data'][30], - 'field5' => $other['data'][31], - 'field6' => $other['data'][32], - 'field7' => $other['data'][33], - 'field8' => $other['data'][34], - 'field9' => $other['data'][35], - 'field10' => $other['data'][36], - 'field11' => $other['data'][37], - 'field12' => $other['data'][38], - 'field13' => $other['data'][39], - 'field14' => $other['data'][40], - 'field15' => $other['data'][41], - 'field4_recovery' => $other['data'][42], - 'field5_recovery' => $other['data'][43], - 'field6_recovery' => $other['data'][44], - 'field7_recovery' => $other['data'][45], - 'field8_recovery' => $other['data'][46], - 'field9_recovery' => $other['data'][47], - 'field10_recovery' => $other['data'][48], - 'field11_recovery' => $other['data'][49], - 'field12_recovery' => $other['data'][50], - 'field13_recovery' => $other['data'][51], - 'field14_recovery' => $other['data'][52], - 'field15_recovery' => $other['data'][53], + 'field1_recovery' => $other['data'][29], + 'field4' => $other['data'][30], + 'field5' => $other['data'][31], + 'field6' => $other['data'][32], + 'field7' => $other['data'][33], + 'field8' => $other['data'][34], + 'field9' => $other['data'][35], + 'field10' => $other['data'][36], + 'field11' => $other['data'][37], + 'field12' => $other['data'][38], + 'field13' => $other['data'][39], + 'field14' => $other['data'][40], + 'field15' => $other['data'][41], + 'field4_recovery' => $other['data'][42], + 'field5_recovery' => $other['data'][43], + 'field6_recovery' => $other['data'][44], + 'field7_recovery' => $other['data'][45], + 'field8_recovery' => $other['data'][46], + 'field9_recovery' => $other['data'][47], + 'field10_recovery' => $other['data'][48], + 'field11_recovery' => $other['data'][49], + 'field12_recovery' => $other['data'][50], + 'field13_recovery' => $other['data'][51], + 'field14_recovery' => $other['data'][52], + 'field15_recovery' => $other['data'][53], ]; if ($other['data'][2] != '') { @@ -5428,12 +5429,14 @@ function api_set_update_alert_template($id_template, $thrash1, $other, $thrash3) } else { $groups = users_get_groups($config['id_user'], 'LM', false); } + $id_group_org = $result_template['id_group']; if ($other['data'][27] === null) { $id_group_new = $id_group_org; } else { $id_group_new = $other['data'][27]; } + if ($groups[$id_group_org] === null || $groups[$id_group_new] === null) { returnError( 'error_create_alert_template', @@ -5573,6 +5576,7 @@ function api_set_delete_alert_template($id_template, $thrash1, $other, $thrash3) } else { $groups = users_get_groups($config['id_user'], 'LM', false); } + $id_group = $result_template['id_group']; if ($groups[$id_group] === null) { returnError('forbidden', 'string'); @@ -13939,7 +13943,8 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) 'image_treshold' => $graph_threshold, ]; - $graph_html = grafico_modulo_sparse($params); + // Format MIME RFC 2045 (line break 76 chars). + $graph_html = chunk_split(grafico_modulo_sparse($params)); if ($other['data'][1]) { header('Content-type: text/html'); diff --git a/pandora_server/lib/PandoraFMS/Sendmail.pm b/pandora_server/lib/PandoraFMS/Sendmail.pm index 07bb80586d..79be51e44c 100644 --- a/pandora_server/lib/PandoraFMS/Sendmail.pm +++ b/pandora_server/lib/PandoraFMS/Sendmail.pm @@ -217,9 +217,19 @@ sub sendmail { print STDERR "> [...", length($$data), " bytes sent ...]\n"; } } - my @sockets = $Sel->can_write($mailcfg{'timeout'}); - return 0 if (!@sockets); - syswrite($sockets[0], $$data) || return 0; + my @sockets = $Sel->can_write($mailcfg{'timeout'}); + return 0 if (!@sockets); + eval { + local $SIG{__DIE__}; + # Split log data in chunks if case write is + my $data_sent = 0; + while ($data_sent < length($$data)) { + $data_sent += syswrite($sockets[0], $$data, length($$data) - $data_sent, $data_sent) || die $!; + } + }; + if ($@) { + print STDERR "[sendmail] error: $!\n"; + } } 1; } From 3c29314dc7aeeb3f401f06dec9121d7c733e9b8c Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 13 Feb 2021 01:00:18 +0100 Subject: [PATCH 28/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 5732aa0195..5fd22c1496 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210212 +Version: 7.0NG.752-210213 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 4d3e820a95..dcf32dd3c4 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="7.0NG.752-210212" +pandora_version="7.0NG.752-210213" 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 e7e688a396..e2589bd821 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210212'; +use constant AGENT_BUILD => '210213'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 46617191c9..beb4d8f0bc 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 7.0NG.752 -%define release 210212 +%define release 210213 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 c0949d4c16..9fe1d4f26a 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 7.0NG.752 -%define release 210212 +%define release 210213 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index b3cc6ece02..6fb463439b 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210212" +PI_BUILD="210213" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 9fef7e3940..6dfcd9c883 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210212} +{210213} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 1fd0489056..47a00b687d 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 ("7.0NG.752(Build 210212)") +#define PANDORA_VERSION ("7.0NG.752(Build 210213)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 871799f6b4..8bb9a58d21 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", "(7.0NG.752(Build 210212))" + VALUE "ProductVersion", "(7.0NG.752(Build 210213))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 6177179c7d..2e9c302636 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210212 +Version: 7.0NG.752-210213 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 6027d30720..02eb93affa 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="7.0NG.752-210212" +pandora_version="7.0NG.752-210213" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index f08d0c2f56..3abd341cd8 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210212'; +$build_version = 'PC210213'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 51a1089f0e..6aa338c284 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 058e6ece8e..d2ef142e22 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210212 +%define release 210213 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 317f172be8..a7c638304e 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210212 +%define release 210213 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index a1cc32baa7..ee1a8765ed 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210212" +PI_BUILD="210213" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index fe8a7c7be1..26f1ba7a6b 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210212"; +my $version = "7.0NG.752 PS210213"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 446be15c7b..38e9c70728 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210212"; +my $version = "7.0NG.752 PS210213"; # save program name for logging my $progname = basename($0); From 2ef0a1b3955c24e754201954da87ddeb2913882c Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 14 Feb 2021 01:00:15 +0100 Subject: [PATCH 29/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 5fd22c1496..d46b6028fc 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210213 +Version: 7.0NG.752-210214 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 dcf32dd3c4..27319aeb79 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="7.0NG.752-210213" +pandora_version="7.0NG.752-210214" 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 e2589bd821..527c0d65f3 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210213'; +use constant AGENT_BUILD => '210214'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index beb4d8f0bc..8327e93812 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 7.0NG.752 -%define release 210213 +%define release 210214 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 9fe1d4f26a..fa0bf6a0d6 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 7.0NG.752 -%define release 210213 +%define release 210214 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 6fb463439b..b7b2b4e464 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210213" +PI_BUILD="210214" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 6dfcd9c883..f120c534d0 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210213} +{210214} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 47a00b687d..d2635f0eeb 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 ("7.0NG.752(Build 210213)") +#define PANDORA_VERSION ("7.0NG.752(Build 210214)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 8bb9a58d21..f8a7b53471 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", "(7.0NG.752(Build 210213))" + VALUE "ProductVersion", "(7.0NG.752(Build 210214))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 2e9c302636..ebc652d17a 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210213 +Version: 7.0NG.752-210214 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 02eb93affa..81a47efd35 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="7.0NG.752-210213" +pandora_version="7.0NG.752-210214" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 3abd341cd8..fbd8f246d7 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210213'; +$build_version = 'PC210214'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 6aa338c284..49f920316a 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index d2ef142e22..2bd28e3c27 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210213 +%define release 210214 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index a7c638304e..8b18c98f76 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210213 +%define release 210214 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index ee1a8765ed..acbe0ef77a 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210213" +PI_BUILD="210214" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 26f1ba7a6b..2e10970fd0 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210213"; +my $version = "7.0NG.752 PS210214"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 38e9c70728..a0f647892f 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210213"; +my $version = "7.0NG.752 PS210214"; # save program name for logging my $progname = basename($0); From 2a7ba5fbe0ce82104f9c579e5789efabb59a5e90 Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 15 Feb 2021 01:00:15 +0100 Subject: [PATCH 30/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index d46b6028fc..a66cf33faa 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210214 +Version: 7.0NG.752-210215 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 27319aeb79..1abba69670 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="7.0NG.752-210214" +pandora_version="7.0NG.752-210215" 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 527c0d65f3..4bf6768de1 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210214'; +use constant AGENT_BUILD => '210215'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 8327e93812..44a45e4c93 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 7.0NG.752 -%define release 210214 +%define release 210215 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 fa0bf6a0d6..45a03e3ff6 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 7.0NG.752 -%define release 210214 +%define release 210215 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index b7b2b4e464..d543a40e05 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210214" +PI_BUILD="210215" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index f120c534d0..abbe6f4f9b 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210214} +{210215} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index d2635f0eeb..c61a703981 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 ("7.0NG.752(Build 210214)") +#define PANDORA_VERSION ("7.0NG.752(Build 210215)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index f8a7b53471..c2f6549342 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", "(7.0NG.752(Build 210214))" + VALUE "ProductVersion", "(7.0NG.752(Build 210215))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index ebc652d17a..520e9a5cc9 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210214 +Version: 7.0NG.752-210215 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 81a47efd35..75080e045f 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="7.0NG.752-210214" +pandora_version="7.0NG.752-210215" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index fbd8f246d7..3e2d9a968e 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210214'; +$build_version = 'PC210215'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 49f920316a..cf79df3724 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 2bd28e3c27..ea4be793db 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210214 +%define release 210215 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 8b18c98f76..df6319cc2d 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210214 +%define release 210215 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index acbe0ef77a..cd6637940c 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210214" +PI_BUILD="210215" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 2e10970fd0..84bdf92a00 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210214"; +my $version = "7.0NG.752 PS210215"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index a0f647892f..102e1c074b 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210214"; +my $version = "7.0NG.752 PS210215"; # save program name for logging my $progname = basename($0); From c2ec312e72a4d72f743746068e73ea59f2744dca Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 16 Feb 2021 01:00:18 +0100 Subject: [PATCH 31/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index a66cf33faa..93c1787e4f 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210215 +Version: 7.0NG.752-210216 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 1abba69670..59fb4c9918 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="7.0NG.752-210215" +pandora_version="7.0NG.752-210216" 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 4bf6768de1..e37b076f97 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210215'; +use constant AGENT_BUILD => '210216'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 44a45e4c93..433df767cc 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 7.0NG.752 -%define release 210215 +%define release 210216 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 45a03e3ff6..98cd8b536c 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 7.0NG.752 -%define release 210215 +%define release 210216 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index d543a40e05..47588e2ce7 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210215" +PI_BUILD="210216" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index abbe6f4f9b..24683b64b1 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210215} +{210216} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index c61a703981..beca55bf39 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 ("7.0NG.752(Build 210215)") +#define PANDORA_VERSION ("7.0NG.752(Build 210216)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index c2f6549342..be16994dc6 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", "(7.0NG.752(Build 210215))" + VALUE "ProductVersion", "(7.0NG.752(Build 210216))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 520e9a5cc9..ecfe57faa0 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210215 +Version: 7.0NG.752-210216 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 75080e045f..1b8d118523 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="7.0NG.752-210215" +pandora_version="7.0NG.752-210216" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 3e2d9a968e..66f52eb6a9 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210215'; +$build_version = 'PC210216'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index cf79df3724..f2152692ac 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index ea4be793db..c235464a05 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210215 +%define release 210216 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index df6319cc2d..f49e74d425 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210215 +%define release 210216 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index cd6637940c..9c26b227d2 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210215" +PI_BUILD="210216" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 84bdf92a00..80f257b802 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210215"; +my $version = "7.0NG.752 PS210216"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 102e1c074b..06a4a88b60 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210215"; +my $version = "7.0NG.752 PS210216"; # save program name for logging my $progname = basename($0); From 45f89ccb4f22230f0f88013e08c72fd25a4dc14e Mon Sep 17 00:00:00 2001 From: marcos Date: Tue, 16 Feb 2021 11:55:51 +0100 Subject: [PATCH 32/62] fixed select style --- .../godmode/gis_maps/configure_gis_map.php | 24 ++++++++++++++++++- .../godmode/netflow/nf_edit_form.php | 12 +++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php index 1a0625d030..fa1351082c 100644 --- a/pandora_console/godmode/gis_maps/configure_gis_map.php +++ b/pandora_console/godmode/gis_maps/configure_gis_map.php @@ -469,7 +469,29 @@ if (users_can_manage_group_all('MM') === true) { } $table->data[2][0] = __('Group'); -$table->data[2][1] = html_print_select_groups(false, 'IW', $return_all_group, 'map_group_id', $map_group_id, '', '', '', true); +$table->data[2][1] = html_print_select_groups( + false, + 'IW', + $return_all_group, + 'map_group_id', + $map_group_id, + '', + '', + '', + true, + false, + true, + '', + false, + false, + false, + false, + 'id_grupo', + false, + false, + false, + '250px' +); $table->data[3][0] = __('Default zoom'); $table->data[3][1] = html_print_input_text('map_zoom_level', $map_zoom_level, '', 2, 4, true).html_print_input_hidden('map_levels_zoom', $map_levels_zoom, true); diff --git a/pandora_console/godmode/netflow/nf_edit_form.php b/pandora_console/godmode/netflow/nf_edit_form.php index f9c607c894..5fc9b9d0af 100644 --- a/pandora_console/godmode/netflow/nf_edit_form.php +++ b/pandora_console/godmode/netflow/nf_edit_form.php @@ -212,7 +212,17 @@ $table->data[1][1] = html_print_select_groups( -1, true, false, - false + false, + '', + false, + false, + false, + false, + 'id_grupo', + false, + false, + false, + '250px' ); if ($advanced_filter != '') { From ed6c6dfad5a232afe1002f9ca4c75456684ad633 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 16 Feb 2021 13:43:10 +0100 Subject: [PATCH 33/62] Hide OK button meanwhile is loading data --- pandora_console/include/class/AgentWizard.class.php | 3 +++ pandora_console/include/javascript/pandora_ui.js | 6 ++++++ pandora_console/include/styles/pandora.css | 3 +++ 3 files changed, 12 insertions(+) diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php index d9a42b7cfa..6094582691 100644 --- a/pandora_console/include/class/AgentWizard.class.php +++ b/pandora_console/include/class/AgentWizard.class.php @@ -5343,6 +5343,7 @@ class AgentWizard extends HTML function processListModules() { confirmDialog({ title: "", + hideOkButton: true, message: function() { var id = "div-" + uniqId(); var loading = ""; @@ -5381,6 +5382,8 @@ class AgentWizard extends HTML }, datatype: "html", success: function(data) { + // Show hidden OK button + $('.sub.ok.submit-next').removeClass('invisible_important'); $('#' + id).empty().append(data); }, error: function(e) { diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js index 4e8bd4b264..880fd77b99 100644 --- a/pandora_console/include/javascript/pandora_ui.js +++ b/pandora_console/include/javascript/pandora_ui.js @@ -406,6 +406,7 @@ function load_modal(settings) { // eslint-disable-next-line no-unused-vars function confirmDialog(settings) { var randomStr = uniqId(); + var hideOkButton = ""; if (settings.size == undefined) { settings.size = 350; @@ -414,6 +415,10 @@ function confirmDialog(settings) { if (settings.maxHeight == undefined) { settings.maxHeight = 1000; } + // You can hide the OK button. + if (settings.hideOkButton != undefined) { + hideOkButton = "invisible_important "; + } if (typeof settings.message == "function") { $("body").append( @@ -447,6 +452,7 @@ function confirmDialog(settings) { { text: "Ok", class: + hideOkButton + "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next", click: function() { $(this).dialog("close"); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 9a1ce23dca..31e7a60251 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -704,6 +704,9 @@ select:-internal-list-box { .invisible { display: none; } +.invisible_important { + display: none !important; +} .visible { display: block; From a33a94eb891ecded3598039c89ae76326a9d7829 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 17 Feb 2021 01:00:18 +0100 Subject: [PATCH 34/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 93c1787e4f..b67f6696b5 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210216 +Version: 7.0NG.752-210217 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 59fb4c9918..82c4af9688 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="7.0NG.752-210216" +pandora_version="7.0NG.752-210217" 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 e37b076f97..185f7aba3a 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210216'; +use constant AGENT_BUILD => '210217'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 433df767cc..9a902274a5 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 7.0NG.752 -%define release 210216 +%define release 210217 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 98cd8b536c..07daccb39d 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 7.0NG.752 -%define release 210216 +%define release 210217 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 47588e2ce7..06f735a9cc 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210216" +PI_BUILD="210217" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 24683b64b1..4942557fee 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210216} +{210217} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index beca55bf39..0370af709e 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 ("7.0NG.752(Build 210216)") +#define PANDORA_VERSION ("7.0NG.752(Build 210217)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index be16994dc6..5a87e097dc 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", "(7.0NG.752(Build 210216))" + VALUE "ProductVersion", "(7.0NG.752(Build 210217))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index ecfe57faa0..ec74781a42 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210216 +Version: 7.0NG.752-210217 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 1b8d118523..1c64cad3dc 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="7.0NG.752-210216" +pandora_version="7.0NG.752-210217" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 66f52eb6a9..648127c8e6 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210216'; +$build_version = 'PC210217'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index f2152692ac..8d86a1539d 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index c235464a05..6be4d36302 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210216 +%define release 210217 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index f49e74d425..e664b8a083 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210216 +%define release 210217 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 9c26b227d2..dbb0299bb8 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210216" +PI_BUILD="210217" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 80f257b802..7d2f167476 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210216"; +my $version = "7.0NG.752 PS210217"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 06a4a88b60..cda10b8199 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210216"; +my $version = "7.0NG.752 PS210217"; # save program name for logging my $progname = basename($0); From 234097320fb1de5a14b5edb04f704cbc7681fd62 Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Wed, 17 Feb 2021 13:04:59 +0100 Subject: [PATCH 35/62] fixed mr version and remove updates mr --- pandora_console/extras/mr/44.sql | 16 ---------------- .../pandoradb_migrate_6.0_to_7.0.mysql.sql | 4 ++-- pandora_console/pandoradb_data.sql | 4 ++-- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/pandora_console/extras/mr/44.sql b/pandora_console/extras/mr/44.sql index aaa2202e56..ad135514c8 100644 --- a/pandora_console/extras/mr/44.sql +++ b/pandora_console/extras/mr/44.sql @@ -97,22 +97,6 @@ SELECT `id_recon_script`,`type`, `name`, `description`, `script`, `macros` FROM @insert_macros as `macros` ) t limit 1; -ALTER TABLE `tipam_ip` ADD COLUMN `leased` tinyint(2) DEFAULT '0'; - -ALTER TABLE `tipam_ip` ADD COLUMN `leased_expiration` bigint(20) DEFAULT '0'; - -ALTER TABLE `tipam_ip` ADD COLUMN `mac_address` varchar(20) DEFAULT NULL; - -ALTER TABLE `tipam_ip` ADD COLUMN `leased_mode` tinyint(2) DEFAULT '0'; - -ALTER TABLE `tipam_network` ADD COLUMN `monitoring` tinyint(2) default '0'; - -ALTER TABLE `tipam_network` ADD COLUMN `id_group` mediumint(8) unsigned NULL default '0'; - -ALTER TABLE `tipam_network` ADD COLUMN `lightweight_mode` tinyint(2) default '0'; - -ALTER TABLE `tipam_network` ADD COLUMN `name_network` varchar(255) default ''; - DELETE FROM `tconfig` WHERE `token` = 'ipam_installed'; DELETE FROM `tconfig` WHERE `token` = 'ipam_recon_script_id'; diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 2131b619a4..946db364f7 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -1410,13 +1410,13 @@ ALTER TABLE `ttag` MODIFY COLUMN `name` text NOT NULL default ''; INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30'); -INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 42); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 44); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png'); UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise'; -INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', 750); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', 752); INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp'); UPDATE `tconfig` SET `value` = 'mini_severity,evento,id_agente,estado,timestamp' WHERE `token` LIKE 'event_fields'; DELETE FROM `tconfig` WHERE `token` LIKE 'integria_api_password'; diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 57f43c5085..2ab4003336 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -109,10 +109,10 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_report_front_logo', 'images/pandora_logo_white.jpg'), ('custom_report_front_header', ''), ('custom_report_front_footer', ''), -('MR', 43), +('MR', 44), ('identification_reminder', 1), ('identification_reminder_timestamp', 0), -('current_package_enterprise', 751), +('current_package_enterprise', 752), ('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.00097656250000":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}'), ('custom_docs_logo', 'default_docs.png'), ('custom_support_logo', 'default_support.png'), From 39e603e9089bd9c699ca2e31c3fd7e9b50b608e2 Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Wed, 17 Feb 2021 14:27:16 +0100 Subject: [PATCH 36/62] fixed mr version and remove updates mr --- pandora_console/extras/mr/44.sql | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pandora_console/extras/mr/44.sql b/pandora_console/extras/mr/44.sql index ad135514c8..75a39cd33f 100644 --- a/pandora_console/extras/mr/44.sql +++ b/pandora_console/extras/mr/44.sql @@ -85,17 +85,7 @@ SET @insert_name = 'IPAM Recon'; SET @insert_description = 'This script is used to automatically detect network hosts availability and name, used as Recon Custom Script in the recon task. Parameters used are:\n\n* custom_field1 = network. i.e.: 192.168.100.0/24\n* custom_field2 = associated IPAM network id. i.e.: 4. Please do not change this value, it is assigned automatically in IPAM management.\n\nSee documentation for more information.'; SET @insert_script = '/usr/share/pandora_server/util/recon_scripts/IPAMrecon.pl'; SET @insert_macros = '{"1":{"macro":"_field1_","desc":"Network","help":"i.e.: 192.168.100.0/24","value":"","hide":""}}'; -INSERT IGNORE INTO trecon_script (`id_recon_script`,`type`, `name`, `description`, `script`, `macros`) -SELECT `id_recon_script`,`type`, `name`, `description`, `script`, `macros` FROM ( - SELECT `id_recon_script`,`type`, `name`, `description`, `script`, `macros` FROM `trecon_script` WHERE `name` = @insert_name - UNION - SELECT (SELECT max(`id_recon_script`)+1 FROM `trecon_script`) AS `id_recon_script`, - @insert_type as `type`, - @insert_name as `name`, - @insert_description as `description`, - @insert_script as `script`, - @insert_macros as `macros` -) t limit 1; +INSERT IGNORE INTO trecon_script (`id_recon_script`,`type`, `name`, `description`, `script`, `macros`) SELECT `id_recon_script`,`type`, `name`, `description`, `script`, `macros` FROM (SELECT `id_recon_script`,`type`, `name`, `description`, `script`, `macros` FROM `trecon_script` WHERE `name` = @insert_name UNION SELECT (SELECT max(`id_recon_script`)+1 FROM `trecon_script`) AS `id_recon_script`, @insert_type as `type`, @insert_name as `name`, @insert_description as `description`, @insert_script as `script`, @insert_macros as `macros`) t limit 1; DELETE FROM `tconfig` WHERE `token` = 'ipam_installed'; From 4c1eaf929bb016d536707c843f1f23ab7e100256 Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 18 Feb 2021 01:00:24 +0100 Subject: [PATCH 37/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index b67f6696b5..40864e4e7d 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210217 +Version: 7.0NG.752-210218 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 82c4af9688..c7091d62c5 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="7.0NG.752-210217" +pandora_version="7.0NG.752-210218" 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 185f7aba3a..fc942dfa86 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210217'; +use constant AGENT_BUILD => '210218'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 9a902274a5..016c1b893a 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 7.0NG.752 -%define release 210217 +%define release 210218 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 07daccb39d..66a44cc3a1 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 7.0NG.752 -%define release 210217 +%define release 210218 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 06f735a9cc..d7c5108279 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210217" +PI_BUILD="210218" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 4942557fee..fa798cde71 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210217} +{210218} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 0370af709e..7811371ddf 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 ("7.0NG.752(Build 210217)") +#define PANDORA_VERSION ("7.0NG.752(Build 210218)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 5a87e097dc..66f4ec6695 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", "(7.0NG.752(Build 210217))" + VALUE "ProductVersion", "(7.0NG.752(Build 210218))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index ec74781a42..3826a0e0de 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210217 +Version: 7.0NG.752-210218 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 1c64cad3dc..462cd30346 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="7.0NG.752-210217" +pandora_version="7.0NG.752-210218" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 648127c8e6..535de7b0d3 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210217'; +$build_version = 'PC210218'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 8d86a1539d..de0494b4cb 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 6be4d36302..94592960fc 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210217 +%define release 210218 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index e664b8a083..6b6bc24d6d 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210217 +%define release 210218 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index dbb0299bb8..d6033e863c 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210217" +PI_BUILD="210218" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 7d2f167476..7e9e70583e 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210217"; +my $version = "7.0NG.752 PS210218"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index cda10b8199..6268ea9daa 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210217"; +my $version = "7.0NG.752 PS210218"; # save program name for logging my $progname = basename($0); From 6e3a3a1d386550668c0bd7e80a5f9e8a03b4aab2 Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Thu, 18 Feb 2021 14:09:23 +0100 Subject: [PATCH 38/62] Fixed error reports sla selected modules in metaconsole --- .../godmode/reporting/reporting_builder.item_editor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 52d94006d7..ea18927a0c 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -3279,7 +3279,7 @@ function print_SLA_list($width, $action, $idItem=null)
- + Date: Thu, 18 Feb 2021 17:34:42 +0100 Subject: [PATCH 39/62] Ent 7059 no existe el console log en nuevas instalaciones --- pandora_console/include/config_process.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 535de7b0d3..85f3afb094 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -40,6 +40,7 @@ if (!is_dir($config['homedir'])) { } + // Help to debug problems. Override global PHP configuration global $develop_bypass; if ((int) $develop_bypass === 1) { @@ -164,6 +165,10 @@ if (session_status() === PHP_SESSION_NONE) { config_process_config(); config_prepare_session(); +if ((bool) $config['console_log_enabled'] === true) { + error_reporting(E_ALL ^ E_NOTICE); +} + // Set a the system timezone default if ((!isset($config['timezone'])) or ($config['timezone'] == '')) { $config['timezone'] = 'Europe/Berlin'; From 0f4f9cd461998022a613a3472376f094af475fce Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 19 Feb 2021 01:00:21 +0100 Subject: [PATCH 40/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 40864e4e7d..24733f7f34 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210218 +Version: 7.0NG.752-210219 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 c7091d62c5..aeaa4a82f9 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="7.0NG.752-210218" +pandora_version="7.0NG.752-210219" 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 fc942dfa86..bf7104f901 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210218'; +use constant AGENT_BUILD => '210219'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 016c1b893a..ee75ed2adc 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 7.0NG.752 -%define release 210218 +%define release 210219 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 66a44cc3a1..5cb11cf13a 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 7.0NG.752 -%define release 210218 +%define release 210219 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index d7c5108279..e93ed65725 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210218" +PI_BUILD="210219" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index fa798cde71..b547ddf4c2 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210218} +{210219} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 7811371ddf..e16ac3e4bd 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 ("7.0NG.752(Build 210218)") +#define PANDORA_VERSION ("7.0NG.752(Build 210219)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 66f4ec6695..d7af86296d 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", "(7.0NG.752(Build 210218))" + VALUE "ProductVersion", "(7.0NG.752(Build 210219))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 3826a0e0de..c786a460f7 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210218 +Version: 7.0NG.752-210219 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 462cd30346..7a3b422a9c 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="7.0NG.752-210218" +pandora_version="7.0NG.752-210219" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 85f3afb094..93d1106a31 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210218'; +$build_version = 'PC210219'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index de0494b4cb..886dae5b8c 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 94592960fc..ffd6140fe1 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210218 +%define release 210219 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 6b6bc24d6d..dbb530241f 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210218 +%define release 210219 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index d6033e863c..1005f4f432 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210218" +PI_BUILD="210219" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 7e9e70583e..6ecf77f652 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210218"; +my $version = "7.0NG.752 PS210219"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 6268ea9daa..b5a06c5edb 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210218"; +my $version = "7.0NG.752 PS210219"; # save program name for logging my $progname = basename($0); From 0fb3ba92326a196cd4347b3d1d5d92cf31043c7f Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 19 Feb 2021 13:36:29 +0100 Subject: [PATCH 41/62] System status notifications filtered by subtype --- .../pandoradb_migrate_6.0_to_7.0.mysql.sql | 1 + .../godmode/setup/setup_notifications.php | 36 ++++- .../include/class/ConsoleSupervisor.php | 34 ++--- .../include/functions_notifications.php | 130 +++++++++++++++++- pandora_console/include/functions_ui.php | 23 +++- pandora_console/include/styles/pandora.css | 14 ++ .../users/user_edit_notifications.php | 5 +- pandora_console/pandoradb.sql | 1 + 8 files changed, 216 insertions(+), 28 deletions(-) diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 946db364f7..64683c2096 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -2392,6 +2392,7 @@ CREATE TABLE `tnotification_source` ( `enabled` int(1) DEFAULT NULL, `user_editable` int(1) DEFAULT NULL, `also_mail` int(1) DEFAULT NULL, + `subtype_blacklist` TEXT, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/pandora_console/godmode/setup/setup_notifications.php b/pandora_console/godmode/setup/setup_notifications.php index 102f47b634..a03812ddc4 100644 --- a/pandora_console/godmode/setup/setup_notifications.php +++ b/pandora_console/godmode/setup/setup_notifications.php @@ -65,6 +65,7 @@ if (get_parameter('remove_source_on_database', 0)) { if (get_parameter('update_config', 0)) { $element = (string) get_parameter('element', ''); $value = (int) get_parameter('value', 0); + $source = (string) get_parameter('source'); // Update the label value. ob_clean(); @@ -75,6 +76,37 @@ if (get_parameter('update_config', 0)) { $res = ($value) ? notifications_add_group_to_source($source, [0]) : notifications_remove_group_from_source($source, [0]); break; + case 'subtype': + $data = explode('.', $source, 2); + $source_id = $data[0]; + $subtype = $data[1]; + $source = notifications_get_all_sources( + [ 'id' => $source_id ] + ); + + if ($source !== false && is_array($source[0]) === true) { + $source = $source[0]; + + $blacklist = json_decode($source['subtype_blacklist'], 1); + if (json_last_error() !== JSON_ERROR_NONE) { + $blacklist = []; + } + + if ((bool) $value === true) { + unset($blacklist[$subtype]); + } else { + $blacklist[$subtype] = 1; + } + + $source['subtype_blacklist'] = json_encode($blacklist, 1); + $res = (bool) db_process_sql_update( + 'tnotification_source', + ['subtype_blacklist' => $source['subtype_blacklist']], + ['id' => $source['id']] + ); + } + break; + default: $res = (bool) db_process_sql_update( 'tnotification_source', @@ -337,7 +369,7 @@ function remove_source_elements(id, source_id) { function notifications_handle_change_element(event) { event.preventDefault(); - var match = /nt-([0-9]+)-(.*)/.exec(event.target.id); + var match = /nt-(.+)-(.*)/.exec(event.target.id); if (!match) { console.error( "Cannot handle change element. Id not valid: ", event.target.id @@ -356,6 +388,7 @@ function notifications_handle_change_element(event) { var value; switch (action.bit) { case 'enabled': + case 'subtype': case 'also_mail': case 'user_editable': case 'all_users': @@ -383,6 +416,7 @@ function notifications_handle_change_element(event) { } else { switch (action.bit) { case 'enabled': + case 'subtype': case 'also_mail': case 'user_editable': case 'all_users': diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index cc52f2062f..017d4a1a80 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -115,12 +115,6 @@ class ConsoleSupervisor } else { $this->enabled = (bool) $source['enabled']; $this->sourceId = $source['id']; - - // Assign targets. - $targets = get_notification_source_targets($this->sourceId); - $this->targetGroups = $targets['groups']; - $this->targetUsers = $targets['users']; - $this->targetUpdated = true; } return $this; @@ -620,20 +614,28 @@ class ConsoleSupervisor return; } - if ($this->targetUpdated === false) { - $targets = get_notification_source_targets($this->sourceId); - $this->targetGroups = $targets['groups']; - $this->targetUsers = $targets['users']; - $this->targetUpdated = false; - } - if ($source_id === 0) { $source_id = $this->sourceId; - // Assign targets. - $targets = get_notification_source_targets($source_id); + } + + static $_cache_targets; + $key = $source_id.'|'.$data['type']; + + if ($_cache_targets === null) { + $_cache_targets = []; + } + + if ($_cache_targets[$key] !== null) { + $targets = $_cache_targets[$key]; + } else { + $targets = get_notification_source_targets( + $source_id, + $data['type'] + ); $this->targetGroups = $targets['groups']; $this->targetUsers = $targets['users']; - $this->targetUpdated = false; + + $_cache_targets[$key] = $targets; } switch ($data['type']) { diff --git a/pandora_console/include/functions_notifications.php b/pandora_console/include/functions_notifications.php index 67e5c6e547..2765f2cee3 100644 --- a/pandora_console/include/functions_notifications.php +++ b/pandora_console/include/functions_notifications.php @@ -116,6 +116,70 @@ function get_notification_targets(int $id_message) } +/** + * Return subtypes. + * + * @param string|null $source Source filter or all. + * + * @return array + */ +function notifications_get_subtypes(?string $source=null) +{ + $subtypes = [ + 'System status' => [ + 'NOTIF.LICENSE.LIMITED', + 'NOTIF.LICENSE.EXPIRATION', + 'NOTIF.FILES.ATTACHMENT', + 'NOTIF.FILES.DATAIN', + 'NOTIF.FILES.DATAIN.BADXML', + 'NOTIF.PHP.SAFE_MODE', + 'NOTIF.PHP.INPUT_TIME', + 'NOTIF.PHP.EXECUTION_TIME', + 'NOTIF.PHP.UPLOAD_MAX_FILESIZE', + 'NOTIF.PHP.MEMORY_LIMIT', + 'NOTIF.PHP.DISABLE_FUNCTIONS', + 'NOTIF.PHP.PHANTOMJS', + 'NOTIF.PHP.VERSION', + 'NOTIF.HISTORYDB', + 'NOTIF.PANDORADB', + 'NOTIF.PANDORADB.HISTORICAL', + 'NOTIF.HISTORYDB.MR', + 'NOTIF.EXT.ELASTICSEARCH', + 'NOTIF.EXT.LOGSTASH', + 'NOTIF.METACONSOLE.DB_CONNECTION', + 'NOTIF.DOWNTIME', + 'NOTIF.UPDATEMANAGER.REGISTRATION', + 'NOTIF.MISC.EVENTSTORMPROTECTION', + 'NOTIF.MISC.DEVELOPBYPASS', + 'NOTIF.MISC.FONTPATH', + 'NOTIF.SECURITY.DEFAULT_PASSWORD', + 'NOTIF.UPDATEMANAGER.OPENSETUP', + 'NOTIF.UPDATEMANAGER.UPDATE', + 'NOTIF.UPDATEMANAGER.MINOR', + 'NOTIF.UPDATEMANAGER.MESSAGES', + 'NOTIF.CRON.CONFIGURED', + 'NOTIF.ALLOWOVERRIDE.MESSAGE', + 'NOTIF.HAMASTER.MESSAGE', + 'NOTIF.SERVER.STATUS', + 'NOTIF.SERVER.STATUS.ID_SERVER', + 'NOTIF.SERVER.QUEUE.ID_SERVER', + 'NOTIF.SERVER.MASTER', + 'NOTIF.SERVER.STATUS.ID_SERVER', + ], + ]; + + if ($source === null) { + return $subtypes; + } + + if (isset($subtypes[$source]) === true) { + return $subtypes[$source]; + } + + return []; +} + + /** * Check if current user has grants to read this notification * @@ -160,14 +224,22 @@ function check_notification_readable(int $id_message) * Returns the target users and groups assigned to be notified on * desired source. * - * @param integer $id_source Source identificator. + * @param integer $id_source Source identificator. + * @param string|null $subtype Subtype identification. * * @return array [users] and [groups] with the targets. */ -function get_notification_source_targets(int $id_source) +function get_notification_source_targets(int $id_source, ?string $subtype=null) { $ret = []; + if ($subtype !== null) { + $filter = sprintf( + ' AND ns.`subtype_blacklist` NOT LIKE "%s"', + $subtype + ); + } + $users = db_get_all_rows_sql( sprintf( 'SELECT @@ -178,8 +250,11 @@ function get_notification_source_targets(int $id_source) ON ns.id=nsu.id_source WHERE ns.id = %d AND ((ns.enabled is NULL OR ns.enabled != 0) - OR (nsu.enabled is NULL OR nsu.enabled != 0))', - $id_source + OR (nsu.enabled is NULL OR nsu.enabled != 0)) + %s + ', + $id_source, + $filter ) ); @@ -198,8 +273,10 @@ function get_notification_source_targets(int $id_source) INNER JOIN tnotification_source ns ON ns.id=nsg.id_source WHERE ns.id = %d - AND (ns.enabled is NULL OR ns.enabled != 0)', - $id_source + AND (ns.enabled is NULL OR ns.enabled != 0) + %s', + $id_source, + $filter ) ); @@ -700,8 +777,47 @@ function notifications_print_global_source_configuration($source) ); $html_selectors .= '
'; + $html_checkboxes = ''; + + $blacklist = json_decode($source['subtype_blacklist'], 1); + if (json_last_error() !== JSON_ERROR_NONE) { + $blacklist = []; + } + + if ($source['description'] === io_safe_input('System status')) { + $system_subtypes = notifications_get_subtypes('System status'); + + foreach ($system_subtypes as $type) { + $html_checkboxes .= html_print_input( + [ + 'input_class' => 'flex flex-row w290px margin-soft', + 'label' => $type, + 'name' => 'check-'.$type, + 'type' => 'switch', + 'id' => 'nt-'.$source['id'].'.'.$type.'-subtype', + 'class' => 'elem-clickable', + 'value' => (isset($blacklist[$type]) === false), + 'return' => true, + ] + ); + } + + $html_checkboxes = ui_print_toggle( + [ + 'content' => $html_checkboxes, + 'name' => __('Subtype customization'), + 'hidden_default' => false, + 'return' => true, + 'toggle_class' => '', + 'container_class' => 'flex flex-row flex-start w100p', + 'main_class' => '', + 'clean' => true, + ] + ); + } + // Return all html. - return $html_title.$html_selectors.$html_checkboxes.$html_select_pospone; + return $html_title.$html_selectors.$html_checkboxes; } diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index b9d75f69c6..27bcb1313e 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -3821,7 +3821,9 @@ function ui_toggle( $main_class = ''; } - $container_class = 'white-box-content-clean'; + if (empty($container_class) === true) { + $container_class = 'white-box-content-clean'; + } } // Link to toggle. @@ -3943,7 +3945,24 @@ function ui_toggle( /** * Simplified way of ui_toggle ussage. * - * @param array $data Arguments. + * @param array $data Arguments: + * 'content' + * 'name' + * 'title' + * 'id' + * 'hidden_default' + * 'return' + * 'toggle_class' + * 'container_class' + * 'main_class' + * 'img_a' + * 'img_b' + * 'clean' + * 'reverseImg' + * 'switch' + * 'attributes_switch' + * 'toggl_attr' + * 'switch_on'. * * @return string HTML code with toggle content. */ diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 31e7a60251..afb5b8ad5c 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -478,6 +478,10 @@ select:-internal-list-box { width: 290px; max-width: 290px; } +.w500px { + width: 500px; + max-width: 500px; +} .mw120px { min-width: 120px; } @@ -626,6 +630,13 @@ select:-internal-list-box { align-items: flex-start; } +.flex-row-reverse { + display: flex; + flex-direction: row-reverse; + flex-wrap: wrap; + align-items: flex-start; +} + .flex-space-around { justify-content: space-around; } @@ -652,6 +663,9 @@ select:-internal-list-box { .padding-right-2-imp { padding-right: 2em !important; } +.margin-soft { + margin: 0.3em 1em; +} .margin-right-1 { margin-right: 1em; } diff --git a/pandora_console/operation/users/user_edit_notifications.php b/pandora_console/operation/users/user_edit_notifications.php index 611530a3b4..6e227024fa 100644 --- a/pandora_console/operation/users/user_edit_notifications.php +++ b/pandora_console/operation/users/user_edit_notifications.php @@ -89,8 +89,9 @@ foreach ($sources as $source) { echo ''; } -if ($disabled_flag) { - echo 'Disabled controls have been set by the system administrator'; +if ((bool) $disabled_flag === true) { + $s = __('Controls have been disabled by the system administrator'); + echo ''.$s.''; } echo ''; diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 090e87fd2e..32d025b128 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -1317,6 +1317,7 @@ CREATE TABLE `tnotification_source` ( `enabled` int(1) DEFAULT NULL, `user_editable` int(1) DEFAULT NULL, `also_mail` int(1) DEFAULT NULL, + `subtype_blacklist` TEXT, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; From 925f456ef77339eaf69532396bc9216291ec5ffc Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 19 Feb 2021 13:57:39 +0100 Subject: [PATCH 42/62] minor fixes --- .../include/functions_notifications.php | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pandora_console/include/functions_notifications.php b/pandora_console/include/functions_notifications.php index 2765f2cee3..05371f6b3c 100644 --- a/pandora_console/include/functions_notifications.php +++ b/pandora_console/include/functions_notifications.php @@ -161,10 +161,8 @@ function notifications_get_subtypes(?string $source=null) 'NOTIF.ALLOWOVERRIDE.MESSAGE', 'NOTIF.HAMASTER.MESSAGE', 'NOTIF.SERVER.STATUS', - 'NOTIF.SERVER.STATUS.ID_SERVER', - 'NOTIF.SERVER.QUEUE.ID_SERVER', + 'NOTIF.SERVER.QUEUE', 'NOTIF.SERVER.MASTER', - 'NOTIF.SERVER.STATUS.ID_SERVER', ], ]; @@ -233,9 +231,15 @@ function get_notification_source_targets(int $id_source, ?string $subtype=null) { $ret = []; + $filter = ''; if ($subtype !== null) { + $matches = []; + if (preg_match('/(.*)\.\d+$/', $subtype, $matches) > 0) { + $subtype = $matches[1]; + } + $filter = sprintf( - ' AND ns.`subtype_blacklist` NOT LIKE "%s"', + ' AND ns.`subtype_blacklist` NOT LIKE "%%%s%%"', $subtype ); } @@ -248,13 +252,12 @@ function get_notification_source_targets(int $id_source, ?string $subtype=null) FROM tnotification_source_user nsu INNER JOIN tnotification_source ns ON ns.id=nsu.id_source + %s WHERE ns.id = %d AND ((ns.enabled is NULL OR ns.enabled != 0) - OR (nsu.enabled is NULL OR nsu.enabled != 0)) - %s - ', - $id_source, - $filter + OR (nsu.enabled is NULL OR nsu.enabled != 0))', + $filter, + $id_source ) ); @@ -272,11 +275,11 @@ function get_notification_source_targets(int $id_source, ?string $subtype=null) FROM tnotification_source_group nsg INNER JOIN tnotification_source ns ON ns.id=nsg.id_source + %s WHERE ns.id = %d - AND (ns.enabled is NULL OR ns.enabled != 0) - %s', - $id_source, - $filter + AND (ns.enabled is NULL OR ns.enabled != 0)', + $filter, + $id_source ) ); From 396f67d57b3f7f2ab23585e627ac6d409c16205b Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 20 Feb 2021 01:00:21 +0100 Subject: [PATCH 43/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 24733f7f34..85f5a2f5ce 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210219 +Version: 7.0NG.752-210220 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 aeaa4a82f9..a64a917ce2 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="7.0NG.752-210219" +pandora_version="7.0NG.752-210220" 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 bf7104f901..76dbd4f27e 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210219'; +use constant AGENT_BUILD => '210220'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index ee75ed2adc..b5e37c4209 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 7.0NG.752 -%define release 210219 +%define release 210220 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 5cb11cf13a..5b1ad940b2 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 7.0NG.752 -%define release 210219 +%define release 210220 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index e93ed65725..45fb676f4e 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210219" +PI_BUILD="210220" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index b547ddf4c2..23a1b31bf1 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210219} +{210220} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index e16ac3e4bd..e69818a2d1 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 ("7.0NG.752(Build 210219)") +#define PANDORA_VERSION ("7.0NG.752(Build 210220)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index d7af86296d..6a74d3ddd9 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", "(7.0NG.752(Build 210219))" + VALUE "ProductVersion", "(7.0NG.752(Build 210220))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index c786a460f7..9462aebec0 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210219 +Version: 7.0NG.752-210220 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 7a3b422a9c..5ee036fe74 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="7.0NG.752-210219" +pandora_version="7.0NG.752-210220" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 93d1106a31..8a92622360 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210219'; +$build_version = 'PC210220'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 886dae5b8c..a53c377e55 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index ffd6140fe1..d2f2662bd0 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210219 +%define release 210220 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index dbb530241f..f6bcc37b66 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210219 +%define release 210220 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 1005f4f432..ab9701810e 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210219" +PI_BUILD="210220" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 6ecf77f652..3bc9fa417d 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210219"; +my $version = "7.0NG.752 PS210220"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index b5a06c5edb..0e3c604d6d 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210219"; +my $version = "7.0NG.752 PS210220"; # save program name for logging my $progname = basename($0); From c70643203fe27478b0626392861ebe7556474427 Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 21 Feb 2021 01:00:14 +0100 Subject: [PATCH 44/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 85f5a2f5ce..f14bee6ef8 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210220 +Version: 7.0NG.752-210221 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 a64a917ce2..07058a75bd 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="7.0NG.752-210220" +pandora_version="7.0NG.752-210221" 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 76dbd4f27e..a3a757e37c 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210220'; +use constant AGENT_BUILD => '210221'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index b5e37c4209..ed208307ed 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 7.0NG.752 -%define release 210220 +%define release 210221 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 5b1ad940b2..e147b4689e 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 7.0NG.752 -%define release 210220 +%define release 210221 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 45fb676f4e..191c925b72 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210220" +PI_BUILD="210221" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 23a1b31bf1..c430d8e646 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210220} +{210221} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index e69818a2d1..6df1ab3e93 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 ("7.0NG.752(Build 210220)") +#define PANDORA_VERSION ("7.0NG.752(Build 210221)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 6a74d3ddd9..2094ee9e2d 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", "(7.0NG.752(Build 210220))" + VALUE "ProductVersion", "(7.0NG.752(Build 210221))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 9462aebec0..f56850dfa7 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210220 +Version: 7.0NG.752-210221 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 5ee036fe74..535fc7322d 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="7.0NG.752-210220" +pandora_version="7.0NG.752-210221" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 8a92622360..7c57f868e0 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210220'; +$build_version = 'PC210221'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index a53c377e55..6919c6e6e4 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index d2f2662bd0..9319c1afc7 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210220 +%define release 210221 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index f6bcc37b66..69a9ee0e27 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210220 +%define release 210221 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index ab9701810e..7c06a670de 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210220" +PI_BUILD="210221" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 3bc9fa417d..9b49fce500 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210220"; +my $version = "7.0NG.752 PS210221"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 0e3c604d6d..19eb8be391 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210220"; +my $version = "7.0NG.752 PS210221"; # save program name for logging my $progname = basename($0); From cd9694f034c1f9b98b5d029af2b1aaacf00297d6 Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 22 Feb 2021 01:00:09 +0100 Subject: [PATCH 45/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index f14bee6ef8..7a76392a62 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210221 +Version: 7.0NG.752-210222 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 07058a75bd..1ecbc72ec5 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="7.0NG.752-210221" +pandora_version="7.0NG.752-210222" 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 a3a757e37c..8f4f0ca828 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210221'; +use constant AGENT_BUILD => '210222'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index ed208307ed..b02acd170e 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 7.0NG.752 -%define release 210221 +%define release 210222 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 e147b4689e..95717d26e9 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 7.0NG.752 -%define release 210221 +%define release 210222 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 191c925b72..3525411abe 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210221" +PI_BUILD="210222" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index c430d8e646..e6aa49ccae 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210221} +{210222} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 6df1ab3e93..4aa2e9873b 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 ("7.0NG.752(Build 210221)") +#define PANDORA_VERSION ("7.0NG.752(Build 210222)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 2094ee9e2d..f67d5b421f 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", "(7.0NG.752(Build 210221))" + VALUE "ProductVersion", "(7.0NG.752(Build 210222))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index f56850dfa7..2e824fbd26 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210221 +Version: 7.0NG.752-210222 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 535fc7322d..0af0e48f4d 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="7.0NG.752-210221" +pandora_version="7.0NG.752-210222" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 7c57f868e0..0b90f357a6 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210221'; +$build_version = 'PC210222'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 6919c6e6e4..12c9b0ccc0 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 9319c1afc7..920579d8e3 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210221 +%define release 210222 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 69a9ee0e27..2cb702c5e9 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210221 +%define release 210222 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 7c06a670de..4e3e2ac08c 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210221" +PI_BUILD="210222" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 9b49fce500..7512a3f87b 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210221"; +my $version = "7.0NG.752 PS210222"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 19eb8be391..58bd4d2bcc 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210221"; +my $version = "7.0NG.752 PS210222"; # save program name for logging my $progname = basename($0); From 34a19b969c72ed57dd477286c2f86d288539722d Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Mon, 22 Feb 2021 12:04:12 +0100 Subject: [PATCH 46/62] missed mr file --- pandora_console/extras/mr/45.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 pandora_console/extras/mr/45.sql diff --git a/pandora_console/extras/mr/45.sql b/pandora_console/extras/mr/45.sql new file mode 100644 index 0000000000..e2e229eb36 --- /dev/null +++ b/pandora_console/extras/mr/45.sql @@ -0,0 +1,5 @@ +START TRANSACTION; + +ALTER TABLE `tnotification_sources` ADD COLUMN `subtype_blacklist` TEXT; + +COMMIT; \ No newline at end of file From a5b11280144b094fc4e364ade53e1bc250deffb1 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 23 Feb 2021 01:00:16 +0100 Subject: [PATCH 47/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 7a76392a62..9c8cfd644c 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210222 +Version: 7.0NG.752-210223 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 1ecbc72ec5..64542e1736 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="7.0NG.752-210222" +pandora_version="7.0NG.752-210223" 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 8f4f0ca828..4127bd7cea 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210222'; +use constant AGENT_BUILD => '210223'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index b02acd170e..1be5cdb778 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 7.0NG.752 -%define release 210222 +%define release 210223 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 95717d26e9..fb3ee1d880 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 7.0NG.752 -%define release 210222 +%define release 210223 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 3525411abe..46ed6fd2cb 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210222" +PI_BUILD="210223" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index e6aa49ccae..00f4875d92 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210222} +{210223} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 4aa2e9873b..27ba38926a 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 ("7.0NG.752(Build 210222)") +#define PANDORA_VERSION ("7.0NG.752(Build 210223)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index f67d5b421f..51b3ba2bf6 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", "(7.0NG.752(Build 210222))" + VALUE "ProductVersion", "(7.0NG.752(Build 210223))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 2e824fbd26..b5823986e3 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210222 +Version: 7.0NG.752-210223 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 0af0e48f4d..2891ef4729 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="7.0NG.752-210222" +pandora_version="7.0NG.752-210223" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 0b90f357a6..987596e071 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210222'; +$build_version = 'PC210223'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 12c9b0ccc0..c751c04642 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 920579d8e3..c24a1251d8 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210222 +%define release 210223 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 2cb702c5e9..360f660938 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210222 +%define release 210223 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 4e3e2ac08c..edf372ad33 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210222" +PI_BUILD="210223" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 7512a3f87b..455470a121 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210222"; +my $version = "7.0NG.752 PS210223"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 58bd4d2bcc..3cd9e46078 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210222"; +my $version = "7.0NG.752 PS210223"; # save program name for logging my $progname = basename($0); From 508b953496fa928e81c3409d2ae6f3735aa0ae51 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 24 Feb 2021 01:00:21 +0100 Subject: [PATCH 48/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 9c8cfd644c..764f3828ce 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210223 +Version: 7.0NG.752-210224 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 64542e1736..64cc04d8d1 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="7.0NG.752-210223" +pandora_version="7.0NG.752-210224" 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 4127bd7cea..d6e6ce7f48 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210223'; +use constant AGENT_BUILD => '210224'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 1be5cdb778..f76ab40c09 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 7.0NG.752 -%define release 210223 +%define release 210224 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 fb3ee1d880..d12f7c7475 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 7.0NG.752 -%define release 210223 +%define release 210224 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 46ed6fd2cb..b87bc9f388 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210223" +PI_BUILD="210224" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 00f4875d92..c1e4bc2629 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210223} +{210224} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 27ba38926a..c81e629d61 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 ("7.0NG.752(Build 210223)") +#define PANDORA_VERSION ("7.0NG.752(Build 210224)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 51b3ba2bf6..ae32cb4dad 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", "(7.0NG.752(Build 210223))" + VALUE "ProductVersion", "(7.0NG.752(Build 210224))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index b5823986e3..e98695d340 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210223 +Version: 7.0NG.752-210224 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 2891ef4729..54d98dad6e 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="7.0NG.752-210223" +pandora_version="7.0NG.752-210224" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 987596e071..fa35bc05b9 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210223'; +$build_version = 'PC210224'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index c751c04642..dd1391a626 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index c24a1251d8..7d28796267 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210223 +%define release 210224 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 360f660938..39b93c7e05 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210223 +%define release 210224 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index edf372ad33..d2fcafcacf 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210223" +PI_BUILD="210224" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 455470a121..723208e2e7 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210223"; +my $version = "7.0NG.752 PS210224"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 3cd9e46078..8319d4a09b 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210223"; +my $version = "7.0NG.752 PS210224"; # save program name for logging my $progname = basename($0); From 078ab1657f1ecb4a76e5cc903491c4b0bcfa3965 Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 25 Feb 2021 01:00:25 +0100 Subject: [PATCH 49/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 764f3828ce..dba64b4ca2 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210224 +Version: 7.0NG.752-210225 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 64cc04d8d1..556e6e20f4 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="7.0NG.752-210224" +pandora_version="7.0NG.752-210225" 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 d6e6ce7f48..89b0b7fe25 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210224'; +use constant AGENT_BUILD => '210225'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index f76ab40c09..7e157bcd94 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 7.0NG.752 -%define release 210224 +%define release 210225 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 d12f7c7475..bb0b7e9d89 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 7.0NG.752 -%define release 210224 +%define release 210225 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index b87bc9f388..366b5f73a9 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210224" +PI_BUILD="210225" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index c1e4bc2629..e105390f03 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210224} +{210225} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index c81e629d61..fe4a5ac3ad 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 ("7.0NG.752(Build 210224)") +#define PANDORA_VERSION ("7.0NG.752(Build 210225)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index ae32cb4dad..d5a54e2871 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", "(7.0NG.752(Build 210224))" + VALUE "ProductVersion", "(7.0NG.752(Build 210225))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index e98695d340..6b40a3b87c 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210224 +Version: 7.0NG.752-210225 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 54d98dad6e..d8e3ff24ee 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="7.0NG.752-210224" +pandora_version="7.0NG.752-210225" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index fa35bc05b9..0f7224b9d9 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210224'; +$build_version = 'PC210225'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index dd1391a626..b798204cb3 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 7d28796267..2e405c0592 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210224 +%define release 210225 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 39b93c7e05..5adcb376f0 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210224 +%define release 210225 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index d2fcafcacf..c8078b30d0 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210224" +PI_BUILD="210225" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 723208e2e7..5d5b37c6e1 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210224"; +my $version = "7.0NG.752 PS210225"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 8319d4a09b..bd5cf72c44 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210224"; +my $version = "7.0NG.752 PS210225"; # save program name for logging my $progname = basename($0); From d41b1896129547eddc57c913f68a66c7b6bf5d04 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Thu, 25 Feb 2021 13:27:00 +0100 Subject: [PATCH 50/62] Extra lines after mr file --- pandora_console/extras/mr/45.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora_console/extras/mr/45.sql b/pandora_console/extras/mr/45.sql index e2e229eb36..8fa06bedc6 100644 --- a/pandora_console/extras/mr/45.sql +++ b/pandora_console/extras/mr/45.sql @@ -2,4 +2,5 @@ START TRANSACTION; ALTER TABLE `tnotification_sources` ADD COLUMN `subtype_blacklist` TEXT; -COMMIT; \ No newline at end of file +COMMIT; + From 7cfc1d2f9aef38e835f47a6a3e84d4dbc02e8ef3 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Thu, 25 Feb 2021 16:08:02 +0100 Subject: [PATCH 51/62] Fixed issue with all modules --- .../godmode/agentes/planned_downtime.editor.php | 8 +++++++- pandora_console/include/javascript/pandora.js | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php index 08b114d28d..cc213bd0a4 100644 --- a/pandora_console/godmode/agentes/planned_downtime.editor.php +++ b/pandora_console/godmode/agentes/planned_downtime.editor.php @@ -166,7 +166,12 @@ if ($insert_downtime_agent === 1) { $agents = (array) get_parameter('id_agents'); $module_names = (array) get_parameter('module'); - $all_modules = (empty($module_names) || ($module_names[0] === '0')); + $all_modules = ($modules_selection_mode === 'all' && (empty($module_names) || (int) $modules[0] === 0)); + $all_common_modules = ($modules_selection_mode === 'common' && (empty($module_names) || (int) $modules[0] === 0)); + + if ($all_common_modules === true) { + $module_names = explode(',', get_parameter('all_common_modules')); + } // 'Is running' check. $is_running = (bool) db_get_value( @@ -928,6 +933,7 @@ if ($id_downtime > 0) { echo '
'; } + html_print_input_hidden('all_common_modules', ''); echo html_print_select( [ 'common' => __('Show common modules'), diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index 04a8f5336e..05d3266b2e 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -275,7 +275,10 @@ function agent_changed_by_multiple_agents(event, id_agent, selected) { ); } } - jQuery.each(data, function(i, val) { + + var all_common_modules = []; + + $.each(data, function(i, val) { var s = js_html_entity_decode(val); $("#module").append( @@ -285,8 +288,12 @@ function agent_changed_by_multiple_agents(event, id_agent, selected) { .attr("title", s) ); + all_common_modules.push(i); $("#module").fadeIn("normal"); }); + + $("#hidden-all_common_modules").val(all_common_modules.toString()); + if (typeof selected !== "undefined") $("#module").attr("value", selected); $("#module") From eb5e295286b233d4576f38818ece7395ee8b4627 Mon Sep 17 00:00:00 2001 From: Luis Date: Thu, 25 Feb 2021 17:56:21 +0000 Subject: [PATCH 52/62] Ent 7080 error servicios elementos modulo --- pandora_console/include/lib/Module.php | 40 +++++++++++++++++-- .../rest-api/models/VisualConsole/Item.php | 12 ++++-- .../models/VisualConsole/Items/Clock.php | 5 +++ .../models/VisualConsole/Items/Label.php | 19 +++++++++ 4 files changed, 69 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/lib/Module.php b/pandora_console/include/lib/Module.php index 982dd24f27..f63f3e0492 100644 --- a/pandora_console/include/lib/Module.php +++ b/pandora_console/include/lib/Module.php @@ -207,7 +207,7 @@ class Module extends Entity if (is_numeric($id_agent_module) === true && $id_agent_module > 0 ) { - if ($nodeId !== null) { + if ($nodeId > 0) { $this->nodeId = $nodeId; } @@ -1022,12 +1022,13 @@ class Module extends Entity /** * Calculates cascade protection service value for this service. * - * @param integer|null $id_node Meta searching node will use this field. + * @param integer|null $id_node Meta searching node will use this field. + * @param boolean $connected Connected to a node. * * @return integer CPS value. * @throws \Exception On error. */ - public function calculateCPS(?int $id_node=null) + public function calculateCPS(?int $id_node=null, bool $connected=false) { if ($this->cps() < 0) { return $this->cps(); @@ -1047,6 +1048,7 @@ class Module extends Entity // Here could happen 2 things. // 1. Metaconsole service is using this method impersonating node DB. // 2. Node service is trying to find parents into metaconsole. + // 3. Impersonated node searching metaconsole. if (empty($id_node) === true && is_metaconsole() === false && has_metaconsole() === true @@ -1119,6 +1121,38 @@ class Module extends Entity if ($r !== NOERR) { throw new \Exception(__('Cannot connect to node %d', $r)); } + } else if (is_metaconsole() === true + // True in impersonated nodes. + && has_metaconsole() === false + && empty($id_node) === true + ) { + // Impersonated node checking metaconsole. + \enterprise_hook('metaconsole_restore_db'); + + $mc_parents = db_get_all_rows_sql( + sprintf( + 'SELECT id_service, + cps, + cascade_protection, + name + FROM `tservice_element` te + INNER JOIN `tservice` t ON te.id_service = t.id + WHERE te.id_agente_modulo = %d', + $this->id_agente_modulo() + ), + false, + false + ); + + // Restore impersonation. + \enterprise_include_once('include/functions_metaconsole.php'); + $r = \enterprise_hook( + 'metaconsole_connect', + [ + null, + $id_node, + ] + ); } $cps = 0; diff --git a/pandora_console/include/rest-api/models/VisualConsole/Item.php b/pandora_console/include/rest-api/models/VisualConsole/Item.php index 95ba132d03..7af3b76817 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Item.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Item.php @@ -922,7 +922,8 @@ class Item extends CachedModel // Can't fetch an agent with an invalid Id. $agentId = static::extractAgentId($itemData); if ($agentId === null) { - throw new \InvalidArgumentException('invalid agent Id'); + $agentId = 0; + // throw new \InvalidArgumentException('invalid agent Id'); } // Staticgraph don't need to have an agent. @@ -956,7 +957,8 @@ class Item extends CachedModel $agent = \db_get_row_sql($sql); if ($agent === false) { - throw new \Exception('error fetching the data from the DB'); + return $agentData; + // throw new \Exception('error fetching the data from the DB'); } // The agent name should be a valid string or a null value. @@ -996,7 +998,8 @@ class Item extends CachedModel // Can't fetch an module with a invalid Id. $moduleId = static::extractModuleId($itemData); if ($moduleId === null) { - throw new \InvalidArgumentException('invalid module Id'); + $moduleId = 0; + // throw new \InvalidArgumentException('invalid module Id'); } // Staticgraph don't need to have a module. @@ -1037,7 +1040,8 @@ class Item extends CachedModel } if ($moduleName === false) { - throw new \Exception('error fetching the data from the DB'); + return $moduleData; + // throw new \Exception('error fetching the data from the DB'); } $moduleData['moduleName'] = $moduleName['nombre']; diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/Clock.php b/pandora_console/include/rest-api/models/VisualConsole/Items/Clock.php index 2bfd4d847b..af50e65db2 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/Clock.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/Clock.php @@ -123,6 +123,11 @@ final class Clock extends Item */ protected function decode(array $data): array { + // Default values. + if (empty($data['height']) === true) { + $data['height'] = ($data['width'] / 2); + } + $clockData = parent::decode($data); $clockData['type'] = CLOCK; $clockData['clockType'] = static::extractClockType($data); diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/Label.php b/pandora_console/include/rest-api/models/VisualConsole/Items/Label.php index af53e7489d..203117a313 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/Label.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/Label.php @@ -31,6 +31,25 @@ final class Label extends Item */ protected function decode(array $data): array { + $data['label'] = \preg_replace( + '/overflow: hidden;/', + '', + $data['label'] + ); + // Default values. + if ((empty($data['width']) === true) + && (empty($data['height']) === true) + ) { + preg_match( + '/visual_font_size_(.*)pt/', + $data['label'], + $matches + ); + + $data['width'] = (($matches[1] * 10) + 5); + $data['height'] = ($matches[1] * 2.5); + } + $return = parent::decode($data); $return['type'] = LABEL; return $return; From dc04a2b2b5aa06bd107ad45ee11b815b9c2d943e Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 26 Feb 2021 01:00:19 +0100 Subject: [PATCH 53/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index dba64b4ca2..546202b245 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210225 +Version: 7.0NG.752-210226 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 556e6e20f4..8e4839bebb 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="7.0NG.752-210225" +pandora_version="7.0NG.752-210226" 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 89b0b7fe25..7f030e0a45 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210225'; +use constant AGENT_BUILD => '210226'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 7e157bcd94..6fbc611165 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 7.0NG.752 -%define release 210225 +%define release 210226 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 bb0b7e9d89..d37e441a95 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 7.0NG.752 -%define release 210225 +%define release 210226 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 366b5f73a9..8ee11a38ec 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210225" +PI_BUILD="210226" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index e105390f03..918faba363 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210225} +{210226} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index fe4a5ac3ad..b9179bed39 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 ("7.0NG.752(Build 210225)") +#define PANDORA_VERSION ("7.0NG.752(Build 210226)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index d5a54e2871..65179c44d6 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", "(7.0NG.752(Build 210225))" + VALUE "ProductVersion", "(7.0NG.752(Build 210226))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 6b40a3b87c..84f2d6de41 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210225 +Version: 7.0NG.752-210226 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 d8e3ff24ee..245af69250 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="7.0NG.752-210225" +pandora_version="7.0NG.752-210226" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 0f7224b9d9..4c24383131 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210225'; +$build_version = 'PC210226'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index b798204cb3..fe127c84af 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 2e405c0592..9498728439 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210225 +%define release 210226 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 5adcb376f0..c78e99ac26 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210225 +%define release 210226 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index c8078b30d0..cf89cc1172 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210225" +PI_BUILD="210226" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 5d5b37c6e1..078c672d0e 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210225"; +my $version = "7.0NG.752 PS210226"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index bd5cf72c44..7751873888 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210225"; +my $version = "7.0NG.752 PS210226"; # save program name for logging my $progname = basename($0); From 86cd01418f95259ee8a47bde26dab06ce241d5b8 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Fri, 26 Feb 2021 09:41:53 +0100 Subject: [PATCH 54/62] fixed string --- pandora_console/godmode/setup/setup_general.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php index c90a97a60e..9c9e5baad2 100644 --- a/pandora_console/godmode/setup/setup_general.php +++ b/pandora_console/godmode/setup/setup_general.php @@ -759,7 +759,7 @@ echo ''.__('Mail configuration').''; '', 'class="sub next"', true - ).'  '; + ).'  '; echo ''; } From ad347dc953053fce6712ccd83980f252b9cc1bf1 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 26 Feb 2021 12:48:23 +0100 Subject: [PATCH 55/62] errata fix --- pandora_console/extras/mr/45.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/extras/mr/45.sql b/pandora_console/extras/mr/45.sql index 8fa06bedc6..584908f813 100644 --- a/pandora_console/extras/mr/45.sql +++ b/pandora_console/extras/mr/45.sql @@ -1,6 +1,6 @@ START TRANSACTION; -ALTER TABLE `tnotification_sources` ADD COLUMN `subtype_blacklist` TEXT; +ALTER TABLE `tnotification_source` ADD COLUMN `subtype_blacklist` TEXT; COMMIT; From 814a39235e0a5ef73c15c8797d600a4af375519b Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 27 Feb 2021 01:00:19 +0100 Subject: [PATCH 56/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 546202b245..f1a3473ce5 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210226 +Version: 7.0NG.752-210227 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 8e4839bebb..5bd0e2688e 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="7.0NG.752-210226" +pandora_version="7.0NG.752-210227" 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 7f030e0a45..8dfc70e56b 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210226'; +use constant AGENT_BUILD => '210227'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 6fbc611165..006048d739 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 7.0NG.752 -%define release 210226 +%define release 210227 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 d37e441a95..d66657652d 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 7.0NG.752 -%define release 210226 +%define release 210227 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 8ee11a38ec..2e7c2b41e4 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210226" +PI_BUILD="210227" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 918faba363..25c598aea7 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210226} +{210227} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index b9179bed39..e1595ca767 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 ("7.0NG.752(Build 210226)") +#define PANDORA_VERSION ("7.0NG.752(Build 210227)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 65179c44d6..eeba72d9ea 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", "(7.0NG.752(Build 210226))" + VALUE "ProductVersion", "(7.0NG.752(Build 210227))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 84f2d6de41..d546af3708 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210226 +Version: 7.0NG.752-210227 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 245af69250..58b3ba7528 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="7.0NG.752-210226" +pandora_version="7.0NG.752-210227" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 4c24383131..d828cec606 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210226'; +$build_version = 'PC210227'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index fe127c84af..1b9cf11e9d 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 9498728439..edaaf7221f 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210226 +%define release 210227 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index c78e99ac26..3a80a91910 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210226 +%define release 210227 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index cf89cc1172..ce041c2193 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210226" +PI_BUILD="210227" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 078c672d0e..2c8fb13b34 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210226"; +my $version = "7.0NG.752 PS210227"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 7751873888..f7293ae025 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210226"; +my $version = "7.0NG.752 PS210227"; # save program name for logging my $progname = basename($0); From 0cf47e4b0032b174a3ed46a14d43d918f739a4ef Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 28 Feb 2021 01:00:06 +0100 Subject: [PATCH 57/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index f1a3473ce5..dae2b2e224 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210227 +Version: 7.0NG.752-210228 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 5bd0e2688e..cb9b6c9c8d 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="7.0NG.752-210227" +pandora_version="7.0NG.752-210228" 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 8dfc70e56b..af991d582a 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210227'; +use constant AGENT_BUILD => '210228'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 006048d739..11ee03db7d 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 7.0NG.752 -%define release 210227 +%define release 210228 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 d66657652d..c2bfc99a55 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 7.0NG.752 -%define release 210227 +%define release 210228 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 2e7c2b41e4..3ef9536e98 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210227" +PI_BUILD="210228" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 25c598aea7..1a22011eeb 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210227} +{210228} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index e1595ca767..76dbf87f35 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 ("7.0NG.752(Build 210227)") +#define PANDORA_VERSION ("7.0NG.752(Build 210228)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index eeba72d9ea..7d31de51a1 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", "(7.0NG.752(Build 210227))" + VALUE "ProductVersion", "(7.0NG.752(Build 210228))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index d546af3708..ccfc1e7695 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210227 +Version: 7.0NG.752-210228 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 58b3ba7528..5664da858e 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="7.0NG.752-210227" +pandora_version="7.0NG.752-210228" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index d828cec606..86f52c0625 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210227'; +$build_version = 'PC210228'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 1b9cf11e9d..0f0df1195a 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index edaaf7221f..c3bf9d247f 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210227 +%define release 210228 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 3a80a91910..556dd967ff 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210227 +%define release 210228 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index ce041c2193..8f9f9b6b2a 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210227" +PI_BUILD="210228" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 2c8fb13b34..3af922602a 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210227"; +my $version = "7.0NG.752 PS210228"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index f7293ae025..5ca4cdaf2b 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210227"; +my $version = "7.0NG.752 PS210228"; # save program name for logging my $progname = basename($0); From 058750007449f86a0c57b18b571f0f27bfb91fc3 Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 1 Mar 2021 01:00:09 +0100 Subject: [PATCH 58/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index dae2b2e224..c609da8a77 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210228 +Version: 7.0NG.752-210301 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 cb9b6c9c8d..4e40ddf39f 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="7.0NG.752-210228" +pandora_version="7.0NG.752-210301" 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 af991d582a..f3dd0952d2 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210228'; +use constant AGENT_BUILD => '210301'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 11ee03db7d..0a85887f6e 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 7.0NG.752 -%define release 210228 +%define release 210301 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 c2bfc99a55..7aa5e8d8ae 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 7.0NG.752 -%define release 210228 +%define release 210301 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 3ef9536e98..2258d29360 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210228" +PI_BUILD="210301" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 1a22011eeb..698088fab9 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210228} +{210301} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 76dbf87f35..7de0878f00 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 ("7.0NG.752(Build 210228)") +#define PANDORA_VERSION ("7.0NG.752(Build 210301)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 7d31de51a1..3a47ee39e7 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", "(7.0NG.752(Build 210228))" + VALUE "ProductVersion", "(7.0NG.752(Build 210301))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index ccfc1e7695..51c26bd5f2 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210228 +Version: 7.0NG.752-210301 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 5664da858e..93ae9416f5 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="7.0NG.752-210228" +pandora_version="7.0NG.752-210301" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 86f52c0625..df95cc81d8 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210228'; +$build_version = 'PC210301'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 0f0df1195a..66586ab046 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index c3bf9d247f..239e530aee 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210228 +%define release 210301 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 556dd967ff..7c44502569 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210228 +%define release 210301 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 8f9f9b6b2a..f288868fa4 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210228" +PI_BUILD="210301" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 3af922602a..1d42609763 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210228"; +my $version = "7.0NG.752 PS210301"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 5ca4cdaf2b..00a17b15f5 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210228"; +my $version = "7.0NG.752 PS210301"; # save program name for logging my $progname = basename($0); From 6175d91298dc5c92e208542c1f372773056c61bd Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 1 Mar 2021 10:00:22 +0000 Subject: [PATCH 59/62] Ent 5537 cambio en botones de select all de ventanas de seleccion de agentes --- .../include/functions_snmp_browser.php | 4 +- .../operation/snmpconsole/snmp_browser.php | 47 +++++++++++++++---- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php index 0055f5bf82..6d4890acc6 100644 --- a/pandora_console/include/functions_snmp_browser.php +++ b/pandora_console/include/functions_snmp_browser.php @@ -1492,9 +1492,9 @@ function snmp_browser_print_create_module_massive($target='agent', $snmp_conf, $ true ); - $table->data[2][0] = __($target_item.' available').html_print_input_image('select_all_left', 'images/tick.png', 1, '', true, ['title' => __('Select all')]); + $table->data[2][0] = ''.__($target_item.' available').'
'.__('Select all').html_print_checkbox_switch('select_all_left', 1, false, true); $table->data[2][1] = ''; - $table->data[2][2] = __($target_item.' to apply').html_print_input_image('select_all_right', 'images/tick.png', 1, '', true, ['title' => __('Select all')]); + $table->data[2][2] = ''.__($target_item.' to apply').'
'.__('Select all').html_print_checkbox_switch('select_all_right', 1, false, true); $table->data[3][0] = html_print_select( [], diff --git a/pandora_console/operation/snmpconsole/snmp_browser.php b/pandora_console/operation/snmpconsole/snmp_browser.php index 7d7abd5fb6..e43257827e 100644 --- a/pandora_console/operation/snmpconsole/snmp_browser.php +++ b/pandora_console/operation/snmpconsole/snmp_browser.php @@ -321,21 +321,48 @@ function add_module_massive_controller(target = 'agent') }); // Select all Items. - $("input[name='select_all_left']").click(function () { - $('#id_item option').map(function() { - $(this).prop('selected', true); - }); - + $("#checkbox-select_all_left").change(function () { + if ($("#checkbox-select_all_left").prop('checked') == true) { + $('#id_item option').map(function() { + $(this).prop('selected', true); + }); + } else { + $('#id_item option').map(function() { + $(this).prop('selected', false); + }); + } + return false; }); - $("input[name='select_all_right']").click(function () { - $('#id_item2 option').map(function() { - $(this).prop('selected', true); - }); - + + $("#checkbox-select_all_right").change(function () { + if ($("#checkbox-select_all_right").prop('checked') == true) { + $('#id_item2 option').map(function() { + $(this).prop('selected', true); + }); + } else { + $('#id_item2 option').map(function() { + $(this).prop('selected', false); + }); + } + return false; }); + $("#id_item").click(function(e) { + if ($("#checkbox-select_all_left").prop('checked') == true) { + $("#checkbox-select_all_left").prop('checked', false); + } + }); + + $("#id_item2").click(function(e) { + if ($("#checkbox-select_all_right").prop('checked') == true) { + $("#checkbox-select_all_right").prop('checked', false); + } + }); + + $(".p-switch").css('display', 'table'); + // Select items. $("#right").click (function () { jQuery.each($("select[name='id_item[]'] option:selected"), function (key, value) { From 0d4761b63d9403fa380822c343f0d757970e80af Mon Sep 17 00:00:00 2001 From: Marcos Alconada Date: Mon, 1 Mar 2021 10:02:18 +0000 Subject: [PATCH 60/62] add new style --- pandora_console/include/styles/alert.css | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/styles/alert.css b/pandora_console/include/styles/alert.css index b466bca463..9a068cba34 100644 --- a/pandora_console/include/styles/alert.css +++ b/pandora_console/include/styles/alert.css @@ -136,8 +136,20 @@ div.target.flex { .blocks { cursor: move; } +#drop_mssg { + position: relative; + top: 25%; + display: block; + left: 37%; + font-size: 3em; + color: #aaa; + overflow: hidden; + width: 6em; + background: #fff; + text-align: center; + z-index: 2; +} div#rules.show::after { - content: "Drop here"; position: relative; top: 25%; display: block; From 208c0d10e82ee2ad2458738adf8e398fd5a891f9 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 1 Mar 2021 10:35:28 +0000 Subject: [PATCH 61/62] Ent 6879 separar en alertas de inventario el selector de grupos de acl del selector de grupos sobre el que se aplican las alertas --- pandora_console/extras/mr/45.sql | 4 +++- .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 1 + pandora_console/pandoradb.sql | 1 + visual_console_client/src/Item.ts | 2 +- visual_console_client/src/items/Line.ts | 12 ++++++++---- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pandora_console/extras/mr/45.sql b/pandora_console/extras/mr/45.sql index 584908f813..a1259e4a77 100644 --- a/pandora_console/extras/mr/45.sql +++ b/pandora_console/extras/mr/45.sql @@ -1,6 +1,8 @@ START TRANSACTION; +ALTER TABLE `tinventory_alert` ADD COLUMN `alert_groups` TEXT NOT NULL; +UPDATE `tinventory_alert` t1 INNER JOIN `tinventory_alert` t2 ON t1.id = t2.id SET t1.alert_groups = t2.id_group; + ALTER TABLE `tnotification_source` ADD COLUMN `subtype_blacklist` TEXT; COMMIT; - diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 64683c2096..8f4cbf6209 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -363,6 +363,7 @@ CREATE TABLE IF NOT EXISTS `tinventory_alert`( `last_fired` text NOT NULL default '', `disable_event` tinyint(1) UNSIGNED default 0, `enabled` tinyint(1) UNSIGNED default 1, + `alert_groups` text NOT NULL default '', PRIMARY KEY (`id`), FOREIGN KEY (`id_module_inventory`) REFERENCES tmodule_inventory(`id_module_inventory`) ON DELETE CASCADE ON UPDATE CASCADE diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 32d025b128..ce3b347df2 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -2653,6 +2653,7 @@ CREATE TABLE IF NOT EXISTS `tinventory_alert`( `last_fired` text NOT NULL default '', `disable_event` tinyint(1) UNSIGNED default 0, `enabled` tinyint(1) UNSIGNED default 1, + `alert_groups` text NOT NULL default '', PRIMARY KEY (`id`), FOREIGN KEY (`id_module_inventory`) REFERENCES tmodule_inventory(`id_module_inventory`) ON DELETE CASCADE ON UPDATE CASCADE diff --git a/visual_console_client/src/Item.ts b/visual_console_client/src/Item.ts index 0b8de44ef4..4aeb5f5c88 100644 --- a/visual_console_client/src/Item.ts +++ b/visual_console_client/src/Item.ts @@ -844,7 +844,7 @@ abstract class VisualConsoleItem { if ( prevProps && - (this.props.isLinkEnabled && prevProps.link !== this.props.link) + this.props.isLinkEnabled && prevProps.link !== this.props.link ) { if (this.props.link !== null) { this.elementRef.setAttribute("href", this.props.link); diff --git a/visual_console_client/src/items/Line.ts b/visual_console_client/src/items/Line.ts index d4c79aff70..2c39a3cb8b 100644 --- a/visual_console_client/src/items/Line.ts +++ b/visual_console_client/src/items/Line.ts @@ -446,10 +446,14 @@ export default class Line extends Item { } // Init the movement listeners. - this.initStartPositionMovementListener(startCircle, this.elementRef - .parentElement as HTMLElement); - this.initEndPositionMovementListener(endCircle, this.elementRef - .parentElement as HTMLElement); + this.initStartPositionMovementListener( + startCircle, + this.elementRef.parentElement as HTMLElement + ); + this.initEndPositionMovementListener( + endCircle, + this.elementRef.parentElement as HTMLElement + ); } else if (!this.moveMode) { this.stopStartPositionMovementListener(); // Remove circles. From 19ab53cfb81272f4a1cef7ff9b646e884f25483e Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 2 Mar 2021 01:00:21 +0100 Subject: [PATCH 62/62] 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/unix/pandora_agent_installer | 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.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index c609da8a77..4dc8dad1e5 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.752-210301 +Version: 7.0NG.752-210302 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 4e40ddf39f..249df9263e 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="7.0NG.752-210301" +pandora_version="7.0NG.752-210302" 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 f3dd0952d2..98e279ccf7 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1016,7 +1016,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.752'; -use constant AGENT_BUILD => '210301'; +use constant AGENT_BUILD => '210302'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 0a85887f6e..7d8692835f 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 7.0NG.752 -%define release 210301 +%define release 210302 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 7aa5e8d8ae..08fdf4c9db 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 7.0NG.752 -%define release 210301 +%define release 210302 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 2258d29360..d50fc39144 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210301" +PI_BUILD="210302" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 698088fab9..b1c95d80f0 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210301} +{210302} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 7de0878f00..58e799a8c6 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 ("7.0NG.752(Build 210301)") +#define PANDORA_VERSION ("7.0NG.752(Build 210302)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 3a47ee39e7..aefb20d901 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", "(7.0NG.752(Build 210301))" + VALUE "ProductVersion", "(7.0NG.752(Build 210302))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 51c26bd5f2..dfa34dc0bf 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.752-210301 +Version: 7.0NG.752-210302 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 93ae9416f5..48410ff59c 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="7.0NG.752-210301" +pandora_version="7.0NG.752-210302" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index df95cc81d8..11587b6321 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210301'; +$build_version = 'PC210302'; $pandora_version = 'v7.0NG.752'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 66586ab046..c4e24e4fe7 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 239e530aee..3a1f771d10 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210301 +%define release 210302 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 7c44502569..98be245877 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.752 -%define release 210301 +%define release 210302 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index f288868fa4..24c9a0fee9 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.752" -PI_BUILD="210301" +PI_BUILD="210302" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 1d42609763..521cc2e577 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.752 PS210301"; +my $version = "7.0NG.752 PS210302"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 00a17b15f5..97da3a5d6f 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.752 PS210301"; +my $version = "7.0NG.752 PS210302"; # save program name for logging my $progname = basename($0);