From 659408ee44043cecdd3857df503bc9fcb4308007 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Mon, 21 Feb 2022 11:44:31 +0100 Subject: [PATCH 1/6] Implement new netflow item --- .../reporting_builder.item_editor.php | 41 ++-- .../godmode/reporting/reporting_builder.php | 2 + pandora_console/include/functions_api.php | 30 ++- pandora_console/include/functions_netflow.php | 222 ++++++++++++++++++ .../include/functions_reporting.php | 95 ++++++-- .../include/functions_reporting_html.php | 1 + pandora_console/include/functions_reports.php | 4 + pandora_server/util/pandora_db.pl | 2 +- 8 files changed, 360 insertions(+), 37 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index fb93b3b30d..c0cccbdc47 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -867,6 +867,7 @@ switch ($action) { case 'netflow_area': case 'netflow_data': case 'netflow_summary': + case 'netflow_top_N': $netflow_filter = $item['text']; // Filter. $period = $item['period']; @@ -4004,23 +4005,23 @@ function print_SLA_list($width, $action, $idItem=null) ], ] ); - if (!empty($services_tmp) - && $services_tmp != ENTERPRISE_NOT_HOOK - ) { - foreach ($services_tmp as $service) { - $check_module_sla = modules_check_agentmodule_exists( - $service['sla_id_module'] - ); - $check_module_sla_value = modules_check_agentmodule_exists( - $service['sla_value_id_module'] - ); - if ($check_module_sla - && $check_module_sla_value + if (!empty($services_tmp) + && $services_tmp != ENTERPRISE_NOT_HOOK ) { - $services[$service['id']] = $service['name']; + foreach ($services_tmp as $service) { + $check_module_sla = modules_check_agentmodule_exists( + $service['sla_id_module'] + ); + $check_module_sla_value = modules_check_agentmodule_exists( + $service['sla_value_id_module'] + ); + if ($check_module_sla + && $check_module_sla_value + ) { + $services[$service['id']] = $service['name']; + } + } } - } - } echo ''; echo html_print_select( @@ -6579,6 +6580,16 @@ function chooseType() { $("#row_historical_db_check").hide(); break; + case 'netflow_top_N': + $("#row_netflow_filter").show(); + $("#row_description").show(); + $("#row_period").show(); + $("#row_max_values").show(); + $("#row_resolution").show(); + $("#row_servers").show(); + $("#row_historical_db_check").hide(); + break; + case 'IPAM_network': $("#row_network_filter").show(); $("#row_alive_ip").show(); diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 9421f120f2..dbe55efc0b 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -1773,6 +1773,7 @@ switch ($action) { case 'netflow_area': case 'netflow_data': case 'netflow_summary': + case 'netflow_top_N': $values['text'] = get_parameter( 'netflow_filter' ); @@ -2572,6 +2573,7 @@ switch ($action) { case 'netflow_area': case 'netflow_data': case 'netflow_summary': + case 'netflow_top_N': $values['text'] = get_parameter( 'netflow_filter' ); diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index b077a14654..c74fc94278 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -13762,7 +13762,7 @@ function api_get_netflow_get_stats($discard_1, $discard_2, $params) return; } - // Parse function parameters + // Parse function parameters. $start_date = $params['data'][0]; $end_date = $params['data'][1]; $filter = json_decode(base64_decode($params['data'][2]), true); @@ -13779,6 +13779,34 @@ function api_get_netflow_get_stats($discard_1, $discard_2, $params) } +/** + * + * @param $trash1 Don't use. + * @param $trash2 Don't use. + * @param array $params Call parameters. + * @return void + */ +function api_get_netflow_get_top_N($trash1, $trash2, $params) +{ + if (is_metaconsole() === true) { + return; + } + + // Parse function parameters. + $start_date = $params['data'][0]; + $end_date = $params['data'][1]; + $filter = json_decode(base64_decode($params['data'][2]), true); + $max = $params['data'][3]; + + // Get netflow data. + $data = netflow_get_top_N($start_date, $end_date, $filter, $max, ''); + + returnData('json', $data); + + return; +} + + // http://localhost/pandora_console/include/api.php?op=get&op2=netflow_get_summary&other=1348562410|1348648810|_base64_encode(json_encode($filter))&other_mode=url_encode_separator_|&apipass=pandora&user=pandora&pass=pandora' function api_get_netflow_get_summary($discard_1, $discard_2, $params) { diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php index 60229d79ae..ac25aa4153 100644 --- a/pandora_console/include/functions_netflow.php +++ b/pandora_console/include/functions_netflow.php @@ -321,6 +321,72 @@ function netflow_data_table($data, $start_date, $end_date, $aggregate) } +/** + * Show a table with netflow top N data. + * + * @param array $data Netflow data. + * @param integer $total_bytes Total bytes count to calculate percent data. + * + * @return string HTML data table. + */ +function netflow_top_n_table(array $data, int $total_bytes) +{ + global $nfdump_date_format; + + $values = []; + $table = new stdClass(); + $table->class = 'w100p'; + $table->cellspacing = 0; + $table->data = []; + + $table->head = []; + $table->head[0] = ''.__('Source IP').''; + $table->head[1] = ''.__('Destination IP').''; + $table->head[2] = ''.__('Bytes').''; + $table->head[3] = ''.__('% Traffic').''; + $table->head[4] = ''.__('Avg. Throughput').''; + $table->style[0] = 'padding: 4px'; + + $i = 0; + + foreach ($data as $value) { + $table->data[$i][0] = $value['ip_src']; + $table->data[$i][1] = $value['ip_dst']; + $table->data[$i][2] = network_format_bytes($value['bytes']); + + $traffic = '-'; + + if ($total_bytes > 0) { + $traffic = sprintf( + '%.2f', + (($value['bytes'] / $total_bytes) * 100) + ); + } + + $table->data[$i][3] = $traffic.' %'; + + $units = [ + 'bps', + 'Kbps', + 'Mbps', + 'Gbps', + 'Tbps', + ]; + + $pow = floor((($value['bps'] > 0) ? log($value['bps']) : 0) / log(1024)); + $pow = min($pow, (count($units) - 1)); + + $value['bps'] /= pow(1024, $pow); + + $table->data[$i][4] = round($value['bps'], 2).' '.$units[$pow]; + + $i++; + } + + return html_print_table($table, true); +} + + /** * Show a table with a traffic summary. * @@ -395,6 +461,73 @@ function netflow_is_net($address) } +/** + * Returns netflow data for the given period in an array. + * + * @param string $start_date Period start date. + * @param string $end_date Period end date. + * @param array $filter Netflow filter. + * @param integer $max Maximum number of aggregates. + * @param string $connection_name Node name when data is get in meta. + * + * @return array An array with netflow stats. + */ +function netflow_get_top_N( + string $start_date, + string $end_date, + array $filter, + int $max, + string $connection_name='' +) { + global $nfdump_date_format; + + // Requesting remote data. + if (is_metaconsole() === true && empty($connection_name) === false) { + $data = metaconsole_call_remote_api( + $connection_name, + 'netflow_get_top_N', + $start_date.'|'.$end_date.'|'.base64_encode(json_encode($filter)).'|'.$max + ); + + return json_decode($data, true); + } + + $options = '-o csv -q -n '.$max.' -s record/bps -t '.date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); + $options_bps = '-o csv -q -n '.$max.' -s dstip/bps -t '.date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); + + $command = netflow_get_command($options, $filter); + $command_bps = netflow_get_command($options_bps, $filter); + + // Execute nfdump. + exec($command, $lines); + exec($command_bps, $lines_bps); + + if (is_array($lines) === false || is_array($lines_bps) === false) { + return []; + } + + $values = []; + $i = 0; + + // Remove first line. + array_shift($lines_bps); + + foreach ($lines as $line) { + $parsed_line = explode(',', $line); + $parsed_line_bps = explode(',', $lines_bps[$i]); + + $values[$i]['ip_src'] = $parsed_line[3]; + $values[$i]['ip_dst'] = $parsed_line[4]; + $values[$i]['bytes'] = $parsed_line[12]; + $values[$i]['bps'] = $parsed_line_bps[12]; + + $i++; + } + + return $values; +} + + /** * Returns netflow data for the given period in an array. * @@ -1051,6 +1184,7 @@ function netflow_get_chart_types() 'netflow_area' => __('Area graph'), 'netflow_summary' => __('Summary'), 'netflow_data' => __('Data table'), + 'netflow_top_N' => __('Top-N connections'), 'netflow_mesh' => __('Circular mesh'), 'netflow_host_treemap' => __('Host detailed traffic'), ]; @@ -1218,6 +1352,54 @@ function netflow_draw_item( } break; + case 'netflow_top_N': + $data_summary = netflow_get_summary( + $start_date, + $end_date, + $filter, + $connection_name + ); + + if (empty($data_summary) === true) { + break; + } + + $data_top_n = netflow_get_top_N( + $start_date, + $end_date, + $filter, + $max_aggregates, + $connection_name + ); + + if (empty($data_top_n) === true) { + break; + } + + if ($output === 'HTML' || $output === 'PDF') { + $html = ''; + $html .= ''; + $html .= "'; + $html .= ''; + $html .= ''; + $html .= "'; + $html .= ''; + $html .= '
"; + $html .= netflow_summary_table($data_summary); + $html .= '
"; + $html .= netflow_top_n_table($data_top_n, $data_summary['totalbytes']); + $html .= '
'; + + return $html; + } else if ($output === 'XML') { + $xml = ''.$aggregate."\n"; + $xml .= ''.$interval_length."\n"; + // Same as netflow_aggregate_area_xml. + $xml .= netflow_aggregate_area_xml($data_top_n); + return $xml; + } + break; + case 'netflow_mesh': $data = netflow_get_relationships_raw_data( $start_date, @@ -1304,6 +1486,46 @@ function netflow_draw_item( } +/** + * Get data of a netflow report item. + * + * @param string $start_date Period start date. + * @param string $end_date Period end date. + * @param array $filter Netflow filter. + * @param integer $max_aggregates Maximum number of aggregates. + * @param string $connection_name Node name when data is get in meta. + * + * @return array Netflow item data (summary and top N data). + */ +function netflow_get_item_data( + string $start_date, + string $end_date, + array $filter, + int $max_aggregates, + string $connection_name +) { + $data_summary = netflow_get_summary( + $start_date, + $end_date, + $filter, + $connection_name + ); + + $data_top_n = netflow_get_top_N( + $start_date, + $end_date, + $filter, + $max_aggregates, + $connection_name + ); + + return [ + 'summary' => $data_summary, + 'top_n' => $data_top_n, + ]; +} + + /** * Render an aggregated area chart as an XML. * diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 83fefb93aa..8d4c6af862 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -612,6 +612,18 @@ function reporting_make_reporting_data( ); break; + case 'netflow_top_N': + $report['contents'][] = reporting_netflow( + $report, + $content, + $type, + $force_width_chart, + $force_height_chart, + 'netflow_top_N', + $pdf + ); + break; + case 'monitor_report': $report['contents'][] = reporting_monitor_report( $report, @@ -1483,7 +1495,7 @@ function reporting_event_top_n( $return['type'] = 'top_n'; if (empty($content['name'])) { - $content['name'] = __('Top N'); + $content['name'] = __('Top-N connections'); } $return['title'] = $content['name']; @@ -5401,6 +5413,10 @@ function reporting_netflow( $return['type'] = 'netflow_summary'; break; + case 'netflow_top_N': + $return['type'] = 'netflow_top_N'; + break; + default: $return['type'] = 'unknown'; break; @@ -5420,6 +5436,10 @@ function reporting_netflow( $content['name'] = __('Netflow Data'); break; + case 'netflow_top_N': + $content['name'] = __('Netflow Top N'); + break; + default: $content['name'] = __('Unknown report'); break; @@ -5459,26 +5479,61 @@ function reporting_netflow( true ); - switch ($type) { - case 'dinamic': - case 'static': - case 'data': - $return['chart'] = netflow_draw_item( - ($report['datetime'] - $content['period']), - $report['datetime'], - $content['top_n'], - $type_netflow, - $filter, - $content['top_n_value'], - $content['server_name'], - $pdf ? 'PDF' : 'HTML' - ); - break; + if ($type_netflow === 'netflow_top_N') { + // Always aggregate by destination port. + $filter['aggregate'] = 'dstport'; - case 'data': - default: - // Nothing to do. - break; + switch ($type) { + case 'dinamic': + case 'static': + $return['chart'] = netflow_draw_item( + ($report['datetime'] - $content['period']), + $report['datetime'], + $content['top_n'], + $type_netflow, + $filter, + $content['top_n_value'], + $content['server_name'], + (($pdf === true) ? 'PDF' : 'HTML') + ); + break; + + case 'data': + $return['data'] = netflow_get_item_data( + ($report['datetime'] - $content['period']), + $report['datetime'], + $filter, + $content['top_n_value'], + $content['server_name'] + ); + break; + + default: + // Nothing to do. + break; + } + } else { + switch ($type) { + case 'dinamic': + case 'static': + case 'data': + $return['chart'] = netflow_draw_item( + ($report['datetime'] - $content['period']), + $report['datetime'], + $content['top_n'], + $type_netflow, + $filter, + $content['top_n_value'], + $content['server_name'], + $pdf ? 'PDF' : 'HTML' + ); + break; + + case 'data': + default: + // Nothing to do. + break; + } } $return['subtitle'] = netflow_generate_subtitle_report( diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 92e20da72e..1ec575def9 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -326,6 +326,7 @@ function reporting_html_print_report($report, $mini=false, $report_info=1) case 'netflow_area': case 'netflow_data': case 'netflow_summary': + case 'netflow_top_N': reporting_html_graph($table, $item); break; diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php index f310856ad2..b1c03ff75d 100755 --- a/pandora_console/include/functions_reports.php +++ b/pandora_console/include/functions_reports.php @@ -901,6 +901,10 @@ function reports_get_report_types($template=false, $not_editor=false) 'optgroup' => __('Netflow'), 'name' => __('Netflow summary table'), ]; + $types['netflow_top_N'] = [ + 'optgroup' => __('Netflow'), + 'name' => __('Netflow top-N connections'), + ]; } if ($config['enterprise_installed'] && $template === false && !is_metaconsole()) { diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index dd94f1cf88..acbbb82629 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -318,7 +318,7 @@ sub pandora_purgedb ($$) { } else { my @blacklist_types = ("'SLA_services'", "'custom_graph'", "'sql_graph_vbar'", "'sql_graph_hbar'", "'sql_graph_pie'", "'database_serialized'", "'sql'", "'inventory'", "'inventory_changes'", - "'netflow_area'", "'netflow_data'", "'netflow_summary'"); + "'netflow_area'", "'netflow_data'", "'netflow_summary'", "'netflow_top_N'"); my $blacklist_types_str = join(',', @blacklist_types); # Deleted modules From 362898681ed44b9c4f7de31105b20f06e2e65057 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Mon, 21 Feb 2022 11:51:52 +0100 Subject: [PATCH 2/6] Implement new netflow item --- pandora_console/include/functions_reporting.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 8d4c6af862..3549bcca4e 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -1495,7 +1495,7 @@ function reporting_event_top_n( $return['type'] = 'top_n'; if (empty($content['name'])) { - $content['name'] = __('Top-N connections'); + $content['name'] = __('Top N'); } $return['title'] = $content['name']; @@ -5437,7 +5437,7 @@ function reporting_netflow( break; case 'netflow_top_N': - $content['name'] = __('Netflow Top N'); + $content['name'] = __('Netflow top-N connections'); break; default: From 931477fcd57edf717d8f825cead17de8226fb1fd Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Mon, 21 Feb 2022 12:26:48 +0100 Subject: [PATCH 3/6] implement new netflow item --- pandora_console/include/functions_api.php | 2 +- pandora_console/include/functions_netflow.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index c74fc94278..e03036ce01 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -13810,7 +13810,7 @@ function api_get_netflow_get_top_N($trash1, $trash2, $params) // http://localhost/pandora_console/include/api.php?op=get&op2=netflow_get_summary&other=1348562410|1348648810|_base64_encode(json_encode($filter))&other_mode=url_encode_separator_|&apipass=pandora&user=pandora&pass=pandora' function api_get_netflow_get_summary($discard_1, $discard_2, $params) { - if (defined('METACONSOLE')) { + if (is_metaconsole() === true) { return; } diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php index ac25aa4153..2698d94aeb 100644 --- a/pandora_console/include/functions_netflow.php +++ b/pandora_console/include/functions_netflow.php @@ -840,7 +840,7 @@ function netflow_get_summary($start_date, $end_date, $filter, $connection_name=' global $config; // Requesting remote data. - if (defined('METACONSOLE') && $connection_name != '') { + if (is_metaconsole() === true && $connection_name != '') { $data = metaconsole_call_remote_api($connection_name, 'netflow_get_summary', "$start_date|$end_date|".base64_encode(json_encode($filter))); return json_decode($data, true); } From abae27e361ec9dc0c0517728c6ac543eab0388c9 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Mon, 21 Feb 2022 15:27:41 +0100 Subject: [PATCH 4/6] implement new netflow item --- pandora_console/include/functions_netflow.php | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php index 2698d94aeb..f88f6b751d 100644 --- a/pandora_console/include/functions_netflow.php +++ b/pandora_console/include/functions_netflow.php @@ -462,7 +462,7 @@ function netflow_is_net($address) /** - * Returns netflow data for the given period in an array. + * Returns netflow top N connections for the given period in an array (based on total traffic). * * @param string $start_date Period start date. * @param string $end_date Period end date. @@ -492,34 +492,28 @@ function netflow_get_top_N( return json_decode($data, true); } - $options = '-o csv -q -n '.$max.' -s record/bps -t '.date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); - $options_bps = '-o csv -q -n '.$max.' -s dstip/bps -t '.date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); + $options = '-o "fmt:%sap,%dap,%ibyt,%bps" -q -n '.$max.' -s record/bytes -t '.date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); $command = netflow_get_command($options, $filter); - $command_bps = netflow_get_command($options_bps, $filter); // Execute nfdump. exec($command, $lines); - exec($command_bps, $lines_bps); - if (is_array($lines) === false || is_array($lines_bps) === false) { + if (is_array($lines) === false) { return []; } $values = []; $i = 0; - // Remove first line. - array_shift($lines_bps); - foreach ($lines as $line) { $parsed_line = explode(',', $line); - $parsed_line_bps = explode(',', $lines_bps[$i]); + $parsed_line = array_map('trim', $parsed_line); - $values[$i]['ip_src'] = $parsed_line[3]; - $values[$i]['ip_dst'] = $parsed_line[4]; - $values[$i]['bytes'] = $parsed_line[12]; - $values[$i]['bps'] = $parsed_line_bps[12]; + $values[$i]['ip_src'] = $parsed_line[0]; + $values[$i]['ip_dst'] = $parsed_line[1]; + $values[$i]['bytes'] = $parsed_line[2]; + $values[$i]['bps'] = $parsed_line[3]; $i++; } From 6067f356e91d9240c12c11cd1e271a398c4eda16 Mon Sep 17 00:00:00 2001 From: Calvo Date: Tue, 15 Mar 2022 09:21:34 +0100 Subject: [PATCH 5/6] Command snapshot monospaced font --- pandora_console/include/styles/pandora_black.css | 4 ++++ pandora_console/operation/agentes/snapshot_view.php | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 42af9e36c6..8057c926f3 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -1214,3 +1214,7 @@ input[type="image"] { .databox_color { background-color: transparent !important; } + +.mono { + font-family: source-code, mono, monospace; +} diff --git a/pandora_console/operation/agentes/snapshot_view.php b/pandora_console/operation/agentes/snapshot_view.php index 7f0972e813..401985c9c7 100644 --- a/pandora_console/operation/agentes/snapshot_view.php +++ b/pandora_console/operation/agentes/snapshot_view.php @@ -81,6 +81,8 @@ if (!check_acl_one_of_groups($config['id_user'], $all_groups, 'AR')) { echo ''; if ($config['style'] === 'pandora_black' && !is_metaconsole()) { echo ''; + } else { + echo ''; } } ?> @@ -100,7 +102,7 @@ if (!check_acl_one_of_groups($config['id_user'], $all_groups, 'AR')) { $last_data = preg_replace('/>/', '>', $last_data); $last_data = preg_replace('/\n/i', '
', $last_data); $last_data = preg_replace('/\s/i', ' ', $last_data); - echo "
"; + echo "
"; echo $last_data; echo '
'; ?> From e088c0e5641498e40f3d6472299a450468bb09f6 Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 18 Mar 2022 01:00:41 +0100 Subject: [PATCH 6/6] 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 71d39485ed..c104f867eb 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.760-220317 +Version: 7.0NG.760-220318 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 f627389151..51a877b552 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.760-220317" +pandora_version="7.0NG.760-220318" 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 548782e68a..0a3c69e139 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1015,7 +1015,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.760'; -use constant AGENT_BUILD => '220317'; +use constant AGENT_BUILD => '220318'; # 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 df24b57257..f88da41fcf 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.760 -%define release 220317 +%define release 220318 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 3d1a313bf9..a25b2becc9 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.760 -%define release 220317 +%define release 220318 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 a5fbc23732..f0f48a4f04 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.760" -PI_BUILD="220317" +PI_BUILD="220318" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 7cec88850a..136f60476b 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{220317} +{220318} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index f07ea9b4da..9409b970c1 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.760 Build 220317") +#define PANDORA_VERSION ("7.0NG.760 Build 220318") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index e9d0760a44..9a4f535899 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.760(Build 220317))" + VALUE "ProductVersion", "(7.0NG.760(Build 220318))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 4728c03770..095280db25 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.760-220317 +Version: 7.0NG.760-220318 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 42b77bfe0e..d6be5cbe87 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.760-220317" +pandora_version="7.0NG.760-220318" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 92482c4d2c..fc13615116 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 = 'PC220317'; +$build_version = 'PC220318'; $pandora_version = 'v7.0NG.760'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 72f4d639ea..22de8dd896 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 d04c1cd911..9c23f14d2f 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.760 -%define release 220317 +%define release 220318 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 6ad97b16c7..1805edc3c2 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.760 -%define release 220317 +%define release 220318 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 398bd9b847..937166bb48 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.760" -PI_BUILD="220317" +PI_BUILD="220318" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 5e16f1ebbe..ed06bed992 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.760 Build 220317"; +my $version = "7.0NG.760 Build 220318"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 9a1acbf587..b699e4ae49 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.760 Build 220317"; +my $version = "7.0NG.760 Build 220318"; # save program name for logging my $progname = basename($0);