From 451d984dbadd3369d9096489a83932155b70c4ed Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 6 Sep 2022 09:24:44 +0200 Subject: [PATCH 01/12] #9255 Fixed max_input_time notify --- pandora_console/include/class/ConsoleSupervisor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index 801cf26a53..00ef3dcc38 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -1466,7 +1466,7 @@ class ConsoleSupervisor [ 'type' => 'NOTIF.PHP.INPUT_TIME', 'title' => sprintf( - __("'%s' value in PHP configuration is not recommended"), + __('%s value in PHP configuration is not recommended'), 'max_input_time' ), 'message' => sprintf( From 9164f1e6812b662cec97576a1c7468f4285bd0b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Mon, 12 Sep 2022 12:41:09 +0200 Subject: [PATCH 02/12] IP Allow control --- .../godmode/users/configure_user.php | 151 ++++++++++++------ pandora_console/index.php | 25 +++ pandora_console/operation/users/user_edit.php | 53 ++++-- 3 files changed, 171 insertions(+), 58 deletions(-) diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 3ed36f8737..2609c7f23c 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -1,17 +1,32 @@ $tag) { - if (empty($tag)) { + if (empty($tag) === true) { unset($tags[$k]); } } @@ -826,7 +852,7 @@ if (!users_is_admin() && $config['id_user'] != $id && !$new_user) { ); $result = db_get_all_rows_sql($sql); - if ($result == false && $user_info['is_admin'] == false) { + if ((bool) $result === false && (bool) $user_info['is_admin'] === false) { db_pandora_audit( AUDIT_LOG_ACL_VIOLATION, 'Trying to access User Management' @@ -837,12 +863,13 @@ if (!users_is_admin() && $config['id_user'] != $id && !$new_user) { } } -if (defined('METACONSOLE')) { - if ($id) { - echo '
'.__('Update User').'
'; - } else { - echo '
'.__('Create User').'
'; - } +if (is_metaconsole() === true) { + html_print_div( + [ + 'class' => 'user_form_title', + 'content' => ((bool) $id === true) ? __('Update User') : __('Create User'), + ] + ); } if (!$new_user) { @@ -1030,6 +1057,26 @@ $comments .= html_print_textarea( true ); +$allowedIP = '

'; +$allowedIP .= __('Login allowed IP list').' '; +$allowedIP .= ui_print_help_tip(__('Add the source IPs that will allow console access. Each IP must be separated only by comma. * allows all.'), true).' '; +$allowedIP .= html_print_checkbox_switch( + 'allowed_ip_active', + 0, + $user_info['allowed_ip_active'], + true +); +$allowedIP .= '

'; +$allowedIP .= html_print_textarea( + 'allowed_ip_list', + 2, + 65, + $user_info['allowed_ip_list'], + (((bool) $view_mode === true) ? 'readonly="readonly"' : ''), + true +); + + // If we want to create a new user, skins displayed are the skins of the creator's group. If we want to update, skins displayed are the skins of the modified user. $own_info = get_user_info($config['id_user']); if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) { @@ -1046,8 +1093,8 @@ if ($new_user) { $id_usr = $id; } -if (!$meta) { - // User only can change skins if has more than one group +if ((bool) $meta === false) { + // User only can change skins if has more than one group. if (count($usr_groups) > 1) { if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) { $skin = '

'.__('Skin').'

'; @@ -1056,7 +1103,7 @@ if (!$meta) { } } -if ($meta) { +if ((bool) $meta === true) { $array_filters = get_filters_custom_fields_view(0, true); $search_custom_fields_view = '

'.__('Search custom field view').' '.ui_print_help_tip(__('Load by default the selected view in custom field view'), true).'

'; @@ -1413,6 +1460,20 @@ echo '
'.$comments.'
'; + +html_print_div( + [ + 'class' => 'user_edit_third_row white_box', + 'content' => html_print_div( + [ + 'class' => 'edit_user_allowed_ip', + 'content' => $allowedIP, + ], + true + ), + ] +); + if (!empty($ehorus)) { echo '
'.$ehorus.'
'; } diff --git a/pandora_console/index.php b/pandora_console/index.php index ad0e37c505..555da9f05a 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -299,6 +299,31 @@ if (isset($config['id_user']) === false) { // Since now, only the $pass variable are needed. unset($_GET['pass'], $_POST['pass'], $_REQUEST['pass']); + // IP allowed check. + $user_info = users_get_user_by_id($nick); + if ((bool) $user_info['allowed_ip_active'] === true) { + $userIP = $_SERVER['REMOTE_ADDR']; + if ((strpos($user_info['allowed_ip_list'], '*') !== false || strpos($user_info['allowed_ip_list'], $userIP) !== false) === false) { + $config['auth_error'] = 'IP not allowed'; + $login_failed = true; + include_once 'general/login_page.php'; + db_pandora_audit( + AUDIT_LOG_USER_REGISTRATION, + sprintf( + 'IP %s not allowed for user %s', + $userIP, + $nick + ), + $userIP + ); + while (ob_get_length() > 0) { + ob_end_flush(); + } + + exit(''); + } + } + // If the auth_code exists, we assume the user has come from // double authorization page. if (isset($_POST['auth_code']) === true) { diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php index c9c875f4f4..a42fe2e8bc 100644 --- a/pandora_console/operation/users/user_edit.php +++ b/pandora_console/operation/users/user_edit.php @@ -14,7 +14,7 @@ * |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______| * * ============================================================================ - * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas + * Copyright (c) 2005-2022 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 @@ -75,6 +75,9 @@ if (isset($_GET['modified']) && !$view_mode) { $upd_info['email'] = get_parameter_post('email', ''); $upd_info['phone'] = get_parameter_post('phone', ''); $upd_info['comments'] = get_parameter_post('comments', ''); + $upd_info['allowed_ip_active'] = ((int) get_parameter_switch('allowed_ip_active', -1) === 0); + $upd_info['allowed_ip_list'] = io_safe_input(strip_tags(io_safe_output((string) get_parameter('allowed_ip_list')))); + $upd_info['comments'] = get_parameter_post('comments', ''); $upd_info['language'] = get_parameter_post('language', $user_info['language']); $upd_info['timezone'] = get_parameter_post('timezone', ''); $upd_info['id_skin'] = get_parameter('skin', $user_info['id_skin']); @@ -111,14 +114,14 @@ if (isset($_GET['modified']) && !$view_mode) { $section = io_safe_output($upd_info['section']); - if (($section == 'Event list') || ($section == 'Group view') - || ($section == 'Alert detail') || ($section == 'Tactical view') - || ($section == 'Default') + if (($section === 'Event list') || ($section === 'Group view') + || ($section === 'Alert detail') || ($section === 'Tactical view') + || ($section === 'Default') ) { $upd_info['data_section'] = ''; - } else if ($section == 'Dashboard') { + } else if ($section === 'Dashboard') { $upd_info['data_section'] = $dashboard; - } else if ($section == 'Visual console') { + } else if ($section === 'Visual console') { $upd_info['data_section'] = $visual_console; } @@ -168,13 +171,13 @@ if (isset($_GET['modified']) && !$view_mode) { // (no changes in data) SQL function returns 0 (FALSE), but is not an error, // just no change. Previous error message could be confussing to the user. if ($return) { - if (!empty($password_new) && !empty($password_confirm)) { + if (empty($password_new) === false && empty($password_confirm) === false) { $success_msg = __('Password successfully updated'); } // If info is valid then proceed with update. - if ((filter_var($upd_info['email'], FILTER_VALIDATE_EMAIL) || $upd_info['email'] == '') - && (preg_match('/^[0-9- ]+$/D', $upd_info['phone']) || $upd_info['phone'] == '') + if ((filter_var($upd_info['email'], FILTER_VALIDATE_EMAIL) || empty($upd_info['email']) === true) + && (preg_match('/^[0-9- ]+$/D', $upd_info['phone']) || empty($upd_info['phone']) === true) ) { $return_update_user = update_user($id, $upd_info); @@ -183,7 +186,7 @@ if (isset($_GET['modified']) && !$view_mode) { } else if ($return_update_user == true) { $success_msg = __('User info successfully updated'); } else { - if (!empty($password_new) && !empty($password_confirm)) { + if (empty($password_new) === false && empty($password_confirm) === false) { $success_msg = __('Password successfully updated'); } else if ($upd_info['id_skin'] !== $user_info['id_skin']) { $success_msg = __('Skin successfully updated'); @@ -614,6 +617,26 @@ $comments .= html_print_textarea( ); $comments .= html_print_input_hidden('quick_language_change', 1, true); +$allowedIP = '

'; +$allowedIP .= __('Login allowed IP list').' '; +$allowedIP .= ui_print_help_tip(__('Add the source IPs that will allow console access. Each IP must be separated only by comma. * allows all.'), true).' '; +$allowedIP .= html_print_checkbox_switch( + 'allowed_ip_active', + 0, + $user_info['allowed_ip_active'], + true +); +$allowedIP .= '

'; +$allowedIP .= html_print_textarea( + 'allowed_ip_list', + 2, + 65, + $user_info['allowed_ip_list'], + ($view_mode ? 'readonly="readonly"' : ''), + true +); + + foreach ($timezones as $timezone_name => $tz) { if ($timezone_name == 'America/Montreal') { @@ -655,7 +678,7 @@ if (is_metaconsole()) { -if (!is_metaconsole()) { +if (is_metaconsole() === false) { echo '
@@ -664,10 +687,14 @@ if (!is_metaconsole()) { } echo '
-
+
'.$comments.'
-
+ + +
+
'.$allowedIP.'
+
'; if ($config['ehorus_enabled'] && $config['ehorus_user_level_conf']) { From 9cdb8788ff530f3167ec32eabbaa871415ab7ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Mon, 12 Sep 2022 12:41:33 +0200 Subject: [PATCH 03/12] DB Files for IP Allow control --- pandora_console/extras/mr/57.sql | 3 +++ pandora_console/pandoradb.sql | 2 ++ 2 files changed, 5 insertions(+) diff --git a/pandora_console/extras/mr/57.sql b/pandora_console/extras/mr/57.sql index 93493913a6..e77a356fdb 100644 --- a/pandora_console/extras/mr/57.sql +++ b/pandora_console/extras/mr/57.sql @@ -3,6 +3,9 @@ START TRANSACTION; ALTER TABLE `tplanned_downtime` ADD COLUMN `cron_interval_from` VARCHAR(100) DEFAULT ''; ALTER TABLE `tplanned_downtime` ADD COLUMN `cron_interval_to` VARCHAR(100) DEFAULT ''; +ALTER TABLE `tusuario` ADD COLUMN `allowed_ip_active` TINYINT DEFAULT 0; +ALTER TABLE `tusuario` ADD COLUMN `allowed_ip_list` TEXT; + SET @id_config := (SELECT id_config FROM tconfig WHERE `token` = 'metaconsole_node_id' AND `value` IS NOT NULL ORDER BY id_config DESC LIMIT 1); DELETE FROM tconfig WHERE `token` = 'metaconsole_node_id' AND (id_config < @id_config OR `value` IS NULL); diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index c3b21084a1..e9127154dd 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -1306,6 +1306,8 @@ CREATE TABLE IF NOT EXISTS `tusuario` ( `ehorus_user_level_enabled` TINYINT, `integria_user_level_user` VARCHAR(60), `integria_user_level_pass` VARCHAR(45), + `allowed_ip_active` TINYINT UNSIGNED DEFAULT 0, + `allowed_ip_list` TEXT, CONSTRAINT `fk_filter_id` FOREIGN KEY (`id_filter`) REFERENCES tevent_filter (`id_filter`) ON DELETE SET NULL, UNIQUE KEY `id_user` (`id_user`) ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; From 193ef3171c34a49745721837fbd7f2c99d98fd52 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 12 Sep 2022 13:54:23 +0200 Subject: [PATCH 04/12] #9167 Fixed macros --- pandora_server/lib/PandoraFMS/PluginServer.pm | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/PluginServer.pm b/pandora_server/lib/PandoraFMS/PluginServer.pm index 966ba22c89..7bec29513b 100644 --- a/pandora_server/lib/PandoraFMS/PluginServer.pm +++ b/pandora_server/lib/PandoraFMS/PluginServer.pm @@ -160,28 +160,35 @@ sub data_consumer ($$) { if($timeout <= 0) { $timeout = 15; } - + # Build command to execute my $command = $plugin->{'execute'}; - + if (!defined($plugin->{'parameters'})){ $plugin->{'parameters'} = ""; } - + my $parameters = $plugin->{'parameters'}; my %plugin_macros_for_alert_processing; - + if (!defined($module->{'macros'})){ $module->{'macros'} = ""; } - + # Plugin macros eval { if ($module->{'macros'} ne '') { logger ($pa_config, "Decoding json macros from # $module_id plugin command '$command'", 10); my $macros = p_decode_json($pa_config, encode_utf8($module->{'macros'})); - my %macros = %{$macros}; - if(ref($macros) eq "HASH") { + my %macros; + if(ref($macros) eq "ARRAY") { + my $count = 1; + %macros = map { $count++ => $_ } @$macros; + } else { + %macros = %{$macros}; + } + + if(ref(\%macros) eq "HASH") { foreach my $macro_id (keys(%macros)) { my $macro_field = safe_output($macros{$macro_id}{'macro'}); From 51a2da89c936eb58db39c116e609e817fc4135ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Mon, 12 Sep 2022 18:29:58 +0200 Subject: [PATCH 05/12] Fixed control for IP Ranges --- pandora_console/include/functions_users.php | 49 +++++++++++++++++++++ pandora_console/index.php | 11 ++++- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php index f4e6e25be8..966fc5446a 100755 --- a/pandora_console/include/functions_users.php +++ b/pandora_console/include/functions_users.php @@ -877,3 +877,52 @@ function users_get_users_group_by_group($id_group) return $users; } + + +/** + * Check if IP is in range. Check wildcard `*`, single IP and IP ranges. + * + * @param array $arrayIP List of IPs. + * @param string $userIP IP for determine if is in the list. + * + * @return boolean True if IP is in range. + */ +function checkIPInRange( + array $arrayIP, + string $userIP='' +) { + $output = false; + + if (empty($userIP) === true) { + $userIP = $_SERVER['REMOTE_ADDR']; + } + + if (empty($arrayIP) === false) { + foreach ($arrayIP as $ip) { + if ($ip === '*') { + // The list has wildcard, this accept all IPs. + $output = true; + break; + } else if ($ip === $userIP) { + $output = true; + break; + } else if (preg_match('/([0-2]?[0-9]{1,2})[.]([0-2]?[0-9]{1,2})[.]([0-2]?[0-9]{0,2})[.](0){1}/', $ip) > 0) { + $rangeArrayIP = explode('.', $ip); + $userArrayIP = explode('.', $userIP); + foreach ($rangeArrayIP as $position => $segmentIP) { + if ($segmentIP === $userArrayIP[$position]) { + $output = true; + } else if ((string) $segmentIP === '0') { + break 2; + } else { + $output = false; + } + } + } else { + $output = false; + } + } + } + + return $output; +} diff --git a/pandora_console/index.php b/pandora_console/index.php index 555da9f05a..df1f7e9ae7 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -303,7 +303,16 @@ if (isset($config['id_user']) === false) { $user_info = users_get_user_by_id($nick); if ((bool) $user_info['allowed_ip_active'] === true) { $userIP = $_SERVER['REMOTE_ADDR']; - if ((strpos($user_info['allowed_ip_list'], '*') !== false || strpos($user_info['allowed_ip_list'], $userIP) !== false) === false) { + $allowedIP = false; + $arrayIP = explode(',', $user_info['allowed_ip_list']); + // By default, if the IP definition is no correct, allows all. + if (empty($arrayIP) === true) { + $allowedIP = true; + } else { + $allowedIP = checkIPInRange($arrayIP, $userIP); + } + + if ($allowedIP === false) { $config['auth_error'] = 'IP not allowed'; $login_failed = true; include_once 'general/login_page.php'; From 0d369027c9194bf7484844b9f8e0d5e1f20ab2b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Tue, 13 Sep 2022 11:51:59 +0200 Subject: [PATCH 06/12] Added new macros --- .../include/functions_reporting.php | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 31026035f7..aee6a8e1ac 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -7213,7 +7213,7 @@ function reporting_sql($report, $content) $sql = $content['external_source']; } - // Check if exist sql macro + // Check if exist sql macro. $sql = reporting_sql_macro($report, $sql); // Do a security check on SQL coming from the user. @@ -14723,6 +14723,25 @@ function reporting_sql_macro(array $report, string $sql): string ); } + if (preg_match('/_start_date_/', $sql)) { + $date_init = get_parameter('date_init', date(DATE_FORMAT, (strtotime(date('Y-m-j')) - SECONDS_1DAY))); + $time_init = get_parameter('time_init', date(TIME_FORMAT, (strtotime(date('Y-m-j')) - SECONDS_1DAY))); + $datetime_init = strtotime($date_init.' '.$time_init); + $sql = str_replace( + '_start_date_', + $datetime_init, + $sql + ); + } + + if (preg_match('/_end_date_/', $sql)) { + $sql = str_replace( + '_end_date_', + $report['datetime'], + $sql + ); + } + return $sql; } From 7771a9646615f0e933e5c02bb667dc054b01d980 Mon Sep 17 00:00:00 2001 From: Daniel Barbero Date: Tue, 13 Sep 2022 14:08:26 +0200 Subject: [PATCH 07/12] fixed group by order event_get_all pandora_enterprise#9420 --- pandora_console/include/functions_events.php | 145 ++++++++++++++----- 1 file changed, 109 insertions(+), 36 deletions(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index c04308a717..0d952f5036 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -1489,6 +1489,15 @@ function events_get_all( MAX(id_evento) as max_id_evento', ($idx !== false) ? 'GROUP_CONCAT(DISTINCT user_comment SEPARATOR "
") AS comments,' : '' ); + + $group_selects_trans = sprintf( + ',tmax_event.event_rep, + %s + tmax_event.timestamp_last, + tmax_event.timestamp_first, + tmax_event.max_id_evento', + ($idx !== false) ? 'tmax_event.comments,' : '' + ); } } else { $idx = array_search('te.user_comment', $fields); @@ -1497,43 +1506,107 @@ function events_get_all( } } - $sql = sprintf( - 'SELECT %s + if ((int) $filter['group_rep'] === 1 && $count === false) { + $sql = sprintf( + 'SELECT %s + %s + FROM %s + INNER JOIN ( + SELECT te.id_evento %s + FROM %s + %s + %s + %s JOIN %s ta + ON ta.%s = te.id_agente + %s + %s + %s JOIN tgrupo tg + ON %s + WHERE 1=1 + %s + %s + %s + %s + %s + ) tmax_event + ON te.id_evento = tmax_event.max_id_evento %s - FROM %s - %s - %s - %s JOIN %s ta - ON ta.%s = te.id_agente - %s - %s - %s JOIN tgrupo tg - ON %s - WHERE 1=1 - %s - %s - %s - %s - %s - ', - join(',', $fields), - $group_selects, - $tevento, - $event_lj, - $agentmodule_join, - $tagente_join, - $tagente_table, - $tagente_field, - $conditionMetaconsole, - join(' ', $agent_join_filters), - $tgrupo_join, - join(' ', $tgrupo_join_filters), - join(' ', $sql_filters), - $group_by, - $order_by, - $pagination, - $having - ); + %s + %s JOIN %s ta + ON ta.%s = te.id_agente + %s + %s + %s JOIN tgrupo tg + ON %s', + join(',', $fields), + $group_selects_trans, + $tevento, + $group_selects, + $tevento, + $event_lj, + $agentmodule_join, + $tagente_join, + $tagente_table, + $tagente_field, + $conditionMetaconsole, + join(' ', $agent_join_filters), + $tgrupo_join, + join(' ', $tgrupo_join_filters), + join(' ', $sql_filters), + $group_by, + $order_by, + $pagination, + $having, + $event_lj, + $agentmodule_join, + $tagente_join, + $tagente_table, + $tagente_field, + $conditionMetaconsole, + join(' ', $agent_join_filters), + $tgrupo_join, + join(' ', $tgrupo_join_filters), + join(' ', $sql_filters) + ); + } else { + $sql = sprintf( + 'SELECT %s + %s + FROM %s + %s + %s + %s JOIN %s ta + ON ta.%s = te.id_agente + %s + %s + %s JOIN tgrupo tg + ON %s + WHERE 1=1 + %s + %s + %s + %s + %s + ', + join(',', $fields), + $group_selects, + $tevento, + $event_lj, + $agentmodule_join, + $tagente_join, + $tagente_table, + $tagente_field, + $conditionMetaconsole, + join(' ', $agent_join_filters), + $tgrupo_join, + join(' ', $tgrupo_join_filters), + join(' ', $sql_filters), + $group_by, + $order_by, + $pagination, + $having + ); + } if ($return_sql === true) { return $sql; From 695cc5bcdca00be9afaef7a2d6e5d22431014b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Tue, 13 Sep 2022 16:35:43 +0200 Subject: [PATCH 08/12] Added tooltip --- .../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 faa8c13ae5..3cc78b737c 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -2335,7 +2335,7 @@ $class = 'databox filters'; From 0ce954af56990b80dd94829dcb474d1cfff2dc26 Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 24 Sep 2022 01:00:20 +0200 Subject: [PATCH 09/12] 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 9f0cf4aedf..232a746b49 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.764-220923 +Version: 7.0NG.764-220924 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 6d6b45e319..538d7d2b22 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.764-220923" +pandora_version="7.0NG.764-220924" 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 06a3d7a775..86d9aff1fb 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.764'; -use constant AGENT_BUILD => '220923'; +use constant AGENT_BUILD => '220924'; # 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 e2c3fd718c..6a242ae0b6 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.764 -%define release 220923 +%define release 220924 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 e5d5b8ec01..d0a00e51e2 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.764 -%define release 220923 +%define release 220924 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 1f08ee2b18..e4b04a4b57 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.764" -PI_BUILD="220923" +PI_BUILD="220924" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index bac49c88cd..1589e7ad8e 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{220923} +{220924} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 8a52c15bee..31a4c6fa25 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.764 Build 220923") +#define PANDORA_VERSION ("7.0NG.764 Build 220924") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index c06eb8fdad..bba9fc40e5 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.764(Build 220923))" + VALUE "ProductVersion", "(7.0NG.764(Build 220924))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index b0efbe6dc2..58a5b3a915 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.764-220923 +Version: 7.0NG.764-220924 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 9ce9a86a41..623c515c2a 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.764-220923" +pandora_version="7.0NG.764-220924" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 246f7794d4..1464a5b26d 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 = 'PC220923'; +$build_version = 'PC220924'; $pandora_version = 'v7.0NG.764'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 8c69b8e09d..d2543ac880 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 860d584178..b6293822a7 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.764 -%define release 220923 +%define release 220924 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 3ffa0730e0..cfaf6ebd0e 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.764 -%define release 220923 +%define release 220924 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 9ae78e4f99..70912a21ef 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.764" -PI_BUILD="220923" +PI_BUILD="220924" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 619a5fc27b..6c8aa1c770 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.764 Build 220923"; +my $version = "7.0NG.764 Build 220924"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 9bbebbe177..3ff1190339 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.764 Build 220923"; +my $version = "7.0NG.764 Build 220924"; # save program name for logging my $progname = basename($0); From d7b4a8f24889d8dbebd18f44ca8c98441f170c32 Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 25 Sep 2022 01:00:16 +0200 Subject: [PATCH 10/12] 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 232a746b49..e39c17ab92 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.764-220924 +Version: 7.0NG.764-220925 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 538d7d2b22..f5f94821a7 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.764-220924" +pandora_version="7.0NG.764-220925" 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 86d9aff1fb..e8cc0d4d1d 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.764'; -use constant AGENT_BUILD => '220924'; +use constant AGENT_BUILD => '220925'; # 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 6a242ae0b6..126eb0f141 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.764 -%define release 220924 +%define release 220925 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 d0a00e51e2..4040eba7b3 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.764 -%define release 220924 +%define release 220925 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 e4b04a4b57..b555cfeb59 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.764" -PI_BUILD="220924" +PI_BUILD="220925" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 1589e7ad8e..3ec9cb9118 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{220924} +{220925} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 31a4c6fa25..bf21ab0c0a 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.764 Build 220924") +#define PANDORA_VERSION ("7.0NG.764 Build 220925") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index bba9fc40e5..e9dfa23692 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.764(Build 220924))" + VALUE "ProductVersion", "(7.0NG.764(Build 220925))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 58a5b3a915..93df4a780c 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.764-220924 +Version: 7.0NG.764-220925 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 623c515c2a..8f8e5b6547 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.764-220924" +pandora_version="7.0NG.764-220925" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 1464a5b26d..3d8565a753 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 = 'PC220924'; +$build_version = 'PC220925'; $pandora_version = 'v7.0NG.764'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index d2543ac880..6249348e25 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 b6293822a7..6c35dc42f8 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.764 -%define release 220924 +%define release 220925 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index cfaf6ebd0e..2048935491 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.764 -%define release 220924 +%define release 220925 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 70912a21ef..cac32d7a7f 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.764" -PI_BUILD="220924" +PI_BUILD="220925" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 6c8aa1c770..7394386112 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.764 Build 220924"; +my $version = "7.0NG.764 Build 220925"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 3ff1190339..bb318054a5 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.764 Build 220924"; +my $version = "7.0NG.764 Build 220925"; # save program name for logging my $progname = basename($0); From 4db9df6df566dfb271f9a5ca06647413b51ed693 Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 26 Sep 2022 01:00:17 +0200 Subject: [PATCH 11/12] 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 e39c17ab92..2d641b5004 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.764-220925 +Version: 7.0NG.764-220926 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 f5f94821a7..cf1df5f8c1 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.764-220925" +pandora_version="7.0NG.764-220926" 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 e8cc0d4d1d..4bbe408028 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.764'; -use constant AGENT_BUILD => '220925'; +use constant AGENT_BUILD => '220926'; # 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 126eb0f141..a92588ff5e 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.764 -%define release 220925 +%define release 220926 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 4040eba7b3..a6719dd0e3 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.764 -%define release 220925 +%define release 220926 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 b555cfeb59..4aeb74c6d7 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.764" -PI_BUILD="220925" +PI_BUILD="220926" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 3ec9cb9118..045ff9d8b9 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{220925} +{220926} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index bf21ab0c0a..79e0fa8aa6 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.764 Build 220925") +#define PANDORA_VERSION ("7.0NG.764 Build 220926") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index e9dfa23692..dc24fc2743 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.764(Build 220925))" + VALUE "ProductVersion", "(7.0NG.764(Build 220926))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 93df4a780c..2abc92bae4 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.764-220925 +Version: 7.0NG.764-220926 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 8f8e5b6547..5ddf04ef6c 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.764-220925" +pandora_version="7.0NG.764-220926" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 3d8565a753..6d8b7edb59 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 = 'PC220925'; +$build_version = 'PC220926'; $pandora_version = 'v7.0NG.764'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 6249348e25..a74798b10f 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 6c35dc42f8..04ac326184 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.764 -%define release 220925 +%define release 220926 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 2048935491..241e2efec4 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.764 -%define release 220925 +%define release 220926 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index cac32d7a7f..7024a2a8c9 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.764" -PI_BUILD="220925" +PI_BUILD="220926" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 7394386112..660f16bf61 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.764 Build 220925"; +my $version = "7.0NG.764 Build 220926"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index bb318054a5..c53935688f 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.764 Build 220925"; +my $version = "7.0NG.764 Build 220926"; # save program name for logging my $progname = basename($0); From fa8386194c8ba694929d68cc7d4e5a4c83c6406b Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 27 Sep 2022 01:00:21 +0200 Subject: [PATCH 12/12] 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 2d641b5004..236064b4e3 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.764-220926 +Version: 7.0NG.764-220927 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 cf1df5f8c1..9f086f5251 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.764-220926" +pandora_version="7.0NG.764-220927" 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 4bbe408028..87cfd2c8cf 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.764'; -use constant AGENT_BUILD => '220926'; +use constant AGENT_BUILD => '220927'; # 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 a92588ff5e..97bcbf4a2d 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.764 -%define release 220926 +%define release 220927 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 a6719dd0e3..e0096d54cc 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.764 -%define release 220926 +%define release 220927 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 4aeb74c6d7..0c07e243f0 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.764" -PI_BUILD="220926" +PI_BUILD="220927" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 045ff9d8b9..ebcb1fe62d 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{220926} +{220927} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 79e0fa8aa6..a2cc6c75fc 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.764 Build 220926") +#define PANDORA_VERSION ("7.0NG.764 Build 220927") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index dc24fc2743..6aaaf1203f 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.764(Build 220926))" + VALUE "ProductVersion", "(7.0NG.764(Build 220927))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 2abc92bae4..d45bd6a8f5 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.764-220926 +Version: 7.0NG.764-220927 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 5ddf04ef6c..1e4f6092e6 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.764-220926" +pandora_version="7.0NG.764-220927" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 6d8b7edb59..b06f18a17b 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 = 'PC220926'; +$build_version = 'PC220927'; $pandora_version = 'v7.0NG.764'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index a74798b10f..f5776a35b7 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 04ac326184..99b1365350 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.764 -%define release 220926 +%define release 220927 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 241e2efec4..b68ebfe931 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.764 -%define release 220926 +%define release 220927 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 7024a2a8c9..cbf668c86f 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.764" -PI_BUILD="220926" +PI_BUILD="220927" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 660f16bf61..e1e9896313 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.764 Build 220926"; +my $version = "7.0NG.764 Build 220927"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index c53935688f..ca5977acb3 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.764 Build 220926"; +my $version = "7.0NG.764 Build 220927"; # save program name for logging my $progname = basename($0);