From 8d1e3c1cf679dcc89a405b1c085effe893497a4e Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Fri, 26 Apr 2024 10:21:26 +0200 Subject: [PATCH 01/20] 13853-Fixes in wizard visual consoles --- pandora_console/extras/mr/69.sql | 2 ++ pandora_console/pandoradb.sql | 1 + 2 files changed, 3 insertions(+) diff --git a/pandora_console/extras/mr/69.sql b/pandora_console/extras/mr/69.sql index 45047f9149..cdfb110894 100644 --- a/pandora_console/extras/mr/69.sql +++ b/pandora_console/extras/mr/69.sql @@ -15,6 +15,8 @@ ALTER TABLE tfiles_repo_group CONVERT TO CHARACTER SET UTF8MB4; ALTER TABLE `tusuario` ADD COLUMN `stop_lts_modal` TINYINT NOT NULL DEFAULT 0 AFTER `session_max_time_expire`; +ALTER TABLE `tlayout_template` ADD COLUMN `create_from` INT UNSIGNED NOT NULL DEFAULT 0; + -- START MIGRATION MSSQL -- SET @current_app_type = 12; SET @short_name = 'pandorafms.mssql'; diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 9b4d2b595a..8696d17d95 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -3777,6 +3777,7 @@ CREATE TABLE IF NOT EXISTS `tlayout_template` ( `maintenance_mode` TEXT, `grid_color` VARCHAR(45) NOT NULL DEFAULT '#cccccc', `grid_size` VARCHAR(45) NOT NULL DEFAULT '10', + `create_from` INT UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY(`id`) ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; From 5a1b7b2c4d51f73595d45b3017f79d1cb29a6141 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 29 Apr 2024 14:04:18 +0200 Subject: [PATCH 02/20] #13626 fixed link --- pandora_console/include/class/SnmpConsole.class.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php index f564b6599d..28eac42969 100644 --- a/pandora_console/include/class/SnmpConsole.class.php +++ b/pandora_console/include/class/SnmpConsole.class.php @@ -819,7 +819,13 @@ class SnmpConsole extends HTML // User ID. $tmp->user_id = '
'; if (empty($status) === false) { - $tmp->user_id .= ''.substr($tmp->id_usuario, 0, 8).''; + if (users_is_admin($config['id_user']) === true || check_acl($config['id_user'], 0, 'UM') === true) { + $url = ui_get_full_url('index.php?sec=gusuarios&sec2=godmode/users/configure_user&edit_user=1&pure=0&id_user='.$tmp->id_usuario); + $tmp->user_id .= ''.substr($tmp->id_usuario, 0, 8).''; + } else { + $tmp->user_id .= substr($tmp->id_usuario, 0, 8); + } + if (!empty($tmp->id_usuario)) { $tmp->user_id .= ui_print_help_tip(get_user_fullname($tmp->id_usuario), true); } From 7e2350101108ef684fe16bbd1d2a77ed227fb1a2 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Mon, 29 Apr 2024 14:49:44 +0200 Subject: [PATCH 03/20] 13639-Fix snmp console group acl --- .../include/class/SnmpConsole.class.php | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php index f564b6599d..e026081d6d 100644 --- a/pandora_console/include/class/SnmpConsole.class.php +++ b/pandora_console/include/class/SnmpConsole.class.php @@ -581,7 +581,30 @@ class SnmpConsole extends HTML $prea = array_keys($user_groups); $ids = join(',', $prea); - $user_in_group_wo_agents = db_get_value_sql('select count(DISTINCT(id_usuario)) from tusuario_perfil where id_usuario ="'.$config['id_user'].'" and id_perfil = 1 and id_grupo in (select id_grupo from tgrupo where id_grupo in ('.$ids.') and id_grupo not in (select id_grupo from tagente))'); + $sql_count = sprintf( + 'SELECT + count(DISTINCT(id_usuario)) + FROM + tusuario_perfil + WHERE + id_usuario = "%s" + AND id_grupo IN ( + SELECT + id_grupo + FROM + tgrupo + WHERE + id_grupo IN (%s) + AND id_grupo NOT IN ( + SELECT + id_grupo + FROM + tagente))', + $config['id_user'], + $ids + ); + + $user_in_group_wo_agents = db_get_value_sql($sql_count); if ($user_in_group_wo_agents == 0) { $rows = db_get_all_rows_filter( 'tagente', @@ -778,7 +801,7 @@ class SnmpConsole extends HTML // SNMP Agent. $agent = agents_get_agent_with_ip($tmp->source); if ($agent === false) { - $tmp->snmp_agent .= 'source.'" title="'.__('Create agent').'">'.$tmp->source.''; + $tmp->snmp_agent .= ''.$tmp->source.''; } else { $tmp->snmp_agent .= '
'; $tmp->snmp_agent .= ''.$agent['alias'].ui_print_help_tip($tmp->source, true); From 87c61fd01524a6f9c6448ac553c04346512c1c7e Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 29 Apr 2024 17:20:17 +0200 Subject: [PATCH 04/20] #13085 added new input password in secondary ldap --- pandora_console/godmode/setup/setup_auth.php | 10 ++++++++-- pandora_console/include/functions_config.php | 6 ++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php index e17d13806f..5d7922cce0 100644 --- a/pandora_console/godmode/setup/setup_auth.php +++ b/pandora_console/godmode/setup/setup_auth.php @@ -362,14 +362,20 @@ if (is_ajax() === true) { $row['name'] = __('Admin secondary LDAP password'); $row['control'] = html_print_input_password( 'ldap_admin_pass_secondary', - io_output_password($config['ldap_admin_pass_secondary']), + (empty(io_output_password($config['ldap_admin_pass_secondary'])) === false) ? '*****' : '', $alt = '', 60, 100, true, false, false, - 'w400px-important' + 'w400px-important', + 'on', + false, + '', + true, + false, + true ); $table->data['ldap_admin_pass_secondary'] = $row; break; diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 7026165089..d4c71597fc 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -741,8 +741,10 @@ function config_update_config() $error_update[] = __('Admin secondary LDAP login'); } - if (config_update_value('ldap_admin_pass_secondary', get_parameter('ldap_admin_pass_secondary'), true, true) === false) { - $error_update[] = __('Admin secondary LDAP password'); + if ((bool) get_parameter('ldap_admin_pass_secondary_password_changed', false) === true) { + if (config_update_value('ldap_admin_pass_secondary', get_parameter('ldap_admin_pass_secondary'), true, true) === false) { + $error_update[] = __('Admin LDAP password secondary'); + } } if (config_update_value('fallback_local_auth', get_parameter('fallback_local_auth'), true) === false) { From 130230549fecee88739add4440869a6e7657bb76 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Tue, 30 Apr 2024 10:49:30 +0200 Subject: [PATCH 05/20] #13465 fixed translate --- pandora_console/include/functions_reporting_html.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index c3fceb7644..00b34a88a2 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -1712,7 +1712,7 @@ function reporting_html_event_report_group($table, $item, $pdf=0) $table1->head[3] = __('Name'); $table1->head[4] = __('Agent'); $table1->head[5] = __('Severity'); - $table1->head[6] = __('Val. by'); + $table1->head[6] = __('Validated by'); $table1->head[7] = __('Timestamp'); } else { $table1->head[0] = __('Status'); @@ -1720,7 +1720,7 @@ function reporting_html_event_report_group($table, $item, $pdf=0) $table1->head[2] = __('Name'); $table1->head[3] = __('Agent'); $table1->head[4] = __('Severity'); - $table1->head[5] = __('Val. by'); + $table1->head[5] = __('Validated by'); $table1->head[6] = __('Timestamp'); } @@ -3845,7 +3845,7 @@ function reporting_html_event_report_agent($table, $item, $pdf=0) $table1->head[2] = __('Name'); $table1->head[4] = __('Severity'); - $table1->head[5] = __('Val. by'); + $table1->head[5] = __('Validated by'); $table1->head[6] = __('Timestamp'); if ((bool) $item['show_custom_data'] === true) { $table1->head[7] = __('Custom data'); From ba2778ae7b272bdfb81f7d9daa6d5e4f173f35ec Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 30 Apr 2024 11:09:21 +0200 Subject: [PATCH 06/20] #13462 remove ------ alerts --- pandora_console/include/functions_reporting.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index aa2567952b..a8c9d66ce1 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -6128,7 +6128,7 @@ function reporting_alert_get_fired($id_agent_module, $id_alert_template_module, $datelimit = ($datetime - $period); - $empty = '----------------------------'; + $empty = ''; if (empty($firedTimes)) { $firedTimes = []; $firedTimes[0]['timestamp'] = $empty; @@ -6429,7 +6429,7 @@ function reporting_alert_report_agent($report, $content) $data_action[$naction]['name'] = $action['name']; $fired = $action['fired']; if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)) { - $data_action[$naction]['fired'] = '----------------------------'; + $data_action[$naction]['fired'] = ''; } else { $data_action[$naction]['fired'] = $fired; } @@ -6441,7 +6441,7 @@ function reporting_alert_report_agent($report, $content) $data_action[$naction]['name'] = $action['name']; $fired = $action['fired']; if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)) { - $data_action[$naction]['fired'] = '----------------------------'; + $data_action[$naction]['fired'] = ''; } else { $data_action[$naction]['fired'] = $fired; } @@ -6453,7 +6453,7 @@ function reporting_alert_report_agent($report, $content) $data_action[$naction]['name'] = $action['name']; $fired = $action['fired']; if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)) { - $data_action[$naction]['fired'] = '----------------------------'; + $data_action[$naction]['fired'] = ''; } else { $data_action[$naction]['fired'] = $fired; } @@ -6604,7 +6604,7 @@ function reporting_alert_report_module($report, $content) $data_action[$naction]['name'] = $action['name']; $fired = $action['fired']; if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)) { - $data_action[$naction]['fired'] = '----------------------------'; + $data_action[$naction]['fired'] = ''; } else { $data_action[$naction]['fired'] = $fired; } @@ -6616,7 +6616,7 @@ function reporting_alert_report_module($report, $content) $data_action[$naction]['name'] = $action['name']; $fired = $action['fired']; if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)) { - $data_action[$naction]['fired'] = '----------------------------'; + $data_action[$naction]['fired'] = ''; } else { $data_action[$naction]['fired'] = $fired; } @@ -6628,7 +6628,7 @@ function reporting_alert_report_module($report, $content) $data_action[$naction]['name'] = $action['name']; $fired = $action['fired']; if ($fired == 0 || ($fired <= $datelimit || $fired > $datetime)) { - $data_action[$naction]['fired'] = '----------------------------'; + $data_action[$naction]['fired'] = ''; } else { $data_action[$naction]['fired'] = $fired; } From 9e860f253f4a9b89ad674d9257b2a81e02a59a57 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Tue, 30 Apr 2024 11:21:42 +0200 Subject: [PATCH 07/20] #13573 fixed date select --- pandora_console/include/functions_html.php | 3 ++- pandora_console/operation/inventory/inventory.php | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 6de4467d83..a1ecf8d219 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -7942,6 +7942,7 @@ function html_print_select_date_range( $date_format_js='yy/mm/dd', $time_format_js='HH:mm:ss', $id='', + $units_selected='1', ) { global $config; @@ -8136,7 +8137,7 @@ function html_print_select_date_range( $output .= html_print_select( $units, $name.'_units', - '1', + $units_selected, '', '', 0, diff --git a/pandora_console/operation/inventory/inventory.php b/pandora_console/operation/inventory/inventory.php index bb4236da25..b3c83699a7 100755 --- a/pandora_console/operation/inventory/inventory.php +++ b/pandora_console/operation/inventory/inventory.php @@ -46,6 +46,7 @@ $date_init_less = (strtotime(date('Y/m/d')) - SECONDS_1DAY); $date_init = get_parameter('date_init', date(DATE_FORMAT, $date_init_less)); $time_init = get_parameter('time_init', date(TIME_FORMAT, $date_init_less)); $datetime_init = strtotime($date_init.' '.$time_init); +$date_units = get_parameter('utimestamp_units'); if ($custom_date === '1') { if ($datetime_init >= $datetime_end) { $datetime_init = $date_init_less; @@ -55,7 +56,6 @@ if ($custom_date === '1') { $date_end = date('Y/m/d H:i:s', $datetime_end); $period = ($datetime_end - $datetime_init); } else if ($custom_date === '2') { - $date_units = get_parameter('utimestamp_units'); $date_end = date('Y/m/d H:i:s'); $date_init = date('Y/m/d H:i:s', (strtotime($date_end) - ((int) $date_text * (int) $date_units))); $period = (strtotime($date_end) - strtotime($date_init)); @@ -768,7 +768,14 @@ if (is_metaconsole() === false) { date('H:i:s', $date_init), date('Y/m/d', $utimestamp), date('H:i:s', $utimestamp), - $date_text + $date_text, + 'w100p', + 'Y/m/d', + 'H:i:s', + 'yy/mm/dd', + 'HH:mm:ss', + '', + $date_units ) ); } From 3d5b6502e57ecfe423acdb5d7e800e2bd3742b57 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Tue, 30 Apr 2024 12:17:59 +0200 Subject: [PATCH 08/20] #13575 fixed api check --- pandora_console/extensions/api_checker.php | 53 ++++++++++++---------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/pandora_console/extensions/api_checker.php b/pandora_console/extensions/api_checker.php index 38488fc9e4..557ec82e1b 100755 --- a/pandora_console/extensions/api_checker.php +++ b/pandora_console/extensions/api_checker.php @@ -69,38 +69,41 @@ function api_execute( if (empty($url) === true) { $url = 'http://'.$ip.$pandora_url.'/include/api.php?'; + } else { + $url_schema = parse_url($url); + $url = $url_schema['scheme'].'://'.$url_schema['host'].$pandora_url.'/include/api.php?'; + } - if (empty($op) === false) { - $data['op'] = $op; - } + if (empty($op) === false) { + $data['op'] = $op; + } - if (empty($op2) === false) { - $data['op2'] = $op2; - } + if (empty($op2) === false) { + $data['op2'] = $op2; + } - if (empty($id) === false) { - $data['id'] = $id; - } + if (empty($id) === false) { + $data['id'] = $id; + } - if (empty($id2) === false) { - $data['id2'] = $id2; - } + if (empty($id2) === false) { + $data['id2'] = $id2; + } - if (empty($return_type) === false) { - $data['return_type'] = $return_type; - } + if (empty($return_type) === false) { + $data['return_type'] = $return_type; + } - if (empty($other) === false) { - $data['other_mode'] = $other_mode; - $data['other'] = $other; - } + if (empty($other) === false) { + $data['other_mode'] = $other_mode; + $data['other'] = $other; + } - // If token is not reported,use old method. - if (empty($token) === true) { - $data['apipass'] = $apipass; - $data['user'] = $user; - $data['pass'] = $password; - } + // If token is not reported,use old method. + if (empty($token) === true) { + $data['apipass'] = $apipass; + $data['user'] = $user; + $data['pass'] = $password; } $url_protocol = parse_url($url)['scheme']; From dd0efd50179377c89106c1bfc6281b9dccf2dfca Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Fri, 3 May 2024 12:21:13 +0200 Subject: [PATCH 09/20] #13271 Fixed ACL error and added flot dependencies to ajax --- pandora_console/operation/reporting/graph_analytics.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pandora_console/operation/reporting/graph_analytics.php b/pandora_console/operation/reporting/graph_analytics.php index 4b5facb139..e5c910bb43 100644 --- a/pandora_console/operation/reporting/graph_analytics.php +++ b/pandora_console/operation/reporting/graph_analytics.php @@ -55,11 +55,12 @@ if (is_ajax()) { $search = io_safe_input($search_left); // Agents. - // Concatenate AW and AD permisions to get all the possible groups where the user can manage. + // Concatenate AR, AW and AD permisions to get all the possible groups where the user can manage. $user_groupsAW = users_get_groups($config['id_user'], 'AW'); $user_groupsAD = users_get_groups($config['id_user'], 'AD'); + $user_groupsAR = users_get_groups($config['id_user'], 'AR'); - $user_groups = ($user_groupsAW + $user_groupsAD); + $user_groups = ($user_groupsAW + $user_groupsAD + $user_groupsAR); $user_groups_to_sql = implode(',', array_keys($user_groups)); $search_sql = ' AND (nombre LIKE "%%'.$search.'%%" OR alias LIKE "%%'.$search.'%%")'; @@ -197,6 +198,9 @@ if (is_ajax()) { 'graph_analytics' => true, ]; + // Included dependencies when is an ajax request. + include_javascript_dependencies_flot_graph(false); + $graph_return = graphic_combined_module( $modules, $params, From 309159a8605453b6db4855f2f3a1fb106b6af7dc Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 3 May 2024 12:52:13 +0200 Subject: [PATCH 10/20] fix prediction date report pandora_enterprise#13568 --- .../include/functions_forecast.php | 91 ++++++++++--------- 1 file changed, 49 insertions(+), 42 deletions(-) diff --git a/pandora_console/include/functions_forecast.php b/pandora_console/include/functions_forecast.php index 1f0d1e59d9..e4fb43a7c5 100644 --- a/pandora_console/include/functions_forecast.php +++ b/pandora_console/include/functions_forecast.php @@ -134,11 +134,14 @@ function forecast_projection_graph( // 3.1 Standard deviation for X: sqrt((Sum(Xi²)/Obs) - (avg X)²) // 3.2 Standard deviation for Y: sqrt((Sum(Yi²)/Obs) - (avg Y)²) // Linear correlation coefficient: - // Agent interval could be zero, 300 is the predefined + // Agent interval could be zero, 300 is the predefined. if ($sum_obs == 0) { $agent_interval = SECONDS_5MINUTES; } else { $agent_interval = ($sum_diff_dates / $sum_obs); + if ($agent_interval < 60) { + $agent_interval = SECONDS_1MINUTE; + } } // Could be a inverse correlation coefficient @@ -170,7 +173,7 @@ function forecast_projection_graph( $a = 0; } - // Data inicialization + // Data inicialization. $output_data = []; if ($prediction_period != false) { $limit_timestamp = ($last_timestamp + $prediction_period); @@ -199,50 +202,54 @@ function forecast_projection_graph( $time_format = 'M d'; } - // Aplying linear regression to module data in order to do the prediction - $idx = 0; - // Create data in graph format like - while ($in_range) { - $now = time(); + try { + // Aplying linear regression to module data in order to do the prediction. + $idx = 0; + // Create data in graph format like. + while ($in_range) { + $now = time(); - // Check that exec time is not greater than half max exec server time - if ($max_exec_time != false) { - if (($begin_time + ($max_exec_time / 2)) < $now) { - return false; - } - } - - $timestamp_f = ($current_ts * 1000); - - if ($csv) { - $output_data[$idx]['date'] = $current_ts; - $output_data[$idx]['data'] = ($a + ($b * $current_ts)); - } else { - $output_data[$idx][0] = $timestamp_f; - $output_data[$idx][1] = ($a + ($b * $current_ts)); - } - - // Using this function for prediction_date - if ($prediction_period == false) { - // These statements stop the prediction when interval is greater than 2 years - if (($current_ts - $last_timestamp) >= 94608000 - || $max_value == $min_value - ) { - return false; + // Check that exec time is not greater than half max exec server time. + if ($max_exec_time != false) { + if (($begin_time + ($max_exec_time / 2)) < $now) { + return false; + } } - // Found it - if (($max_value >= $output_data[$idx][1]) - && ($min_value <= $output_data[$idx][0]) - ) { - return ($current_ts + ($sum_diff_dates * $agent_interval)); - } - } else if ($current_ts > $limit_timestamp) { - $in_range = false; - } + $timestamp_f = ($current_ts * 1000); - $current_ts = ($current_ts + $agent_interval); - $idx++; + if ($csv) { + $output_data[$idx]['date'] = $current_ts; + $output_data[$idx]['data'] = ($a + ($b * $current_ts)); + } else { + $output_data[$idx][0] = $timestamp_f; + $output_data[$idx][1] = ($a + ($b * $current_ts)); + } + + // Using this function for prediction_date. + if ($prediction_period == false) { + // These statements stop the prediction when interval is greater than 2 years. + if (($current_ts - $last_timestamp) >= 94608000 + || $max_value == $min_value + ) { + return false; + } + + // Found it. + if (($max_value >= $output_data[$idx][1]) + && ($min_value <= $output_data[$idx][0]) + ) { + return ($current_ts + ($sum_diff_dates * $agent_interval)); + } + } else if ($current_ts > $limit_timestamp) { + $in_range = false; + } + + $current_ts = ($current_ts + $agent_interval); + $idx++; + } + } catch (\Exception $e) { + return false; } return $output_data; From 17c303ff97a91c00240c462857a5d947d6ed6565 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Fri, 3 May 2024 14:51:58 +0200 Subject: [PATCH 11/20] #13465 changed name in list report --- pandora_console/include/functions_reporting_html.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 00b34a88a2..14ff38afd5 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -1801,7 +1801,11 @@ function reporting_html_event_report_group($table, $item, $pdf=0) 'id_user', $event['id_usuario'] ); - $data[] = io_safe_output($user_name); + if (isset($event['id_usuario']) === true && empty($event['id_usuario']) === false) { + $data[] = io_safe_output($user_name).' ('.$event['id_usuario'].')'; + } else { + $data[] = ''; + } } if ($item['show_summary_group']) { From 59aafe40450fd7c5d04e6ad899fb4a8c7496a7ab Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 4 May 2024 01:00:04 +0200 Subject: [PATCH 12/20] 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.redhat_bin.el8.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.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 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 122d43ed05..368b71b844 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240503 +Version: 7.0NG.776-240504 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 03461beb0f..2662ad33f2 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.776-240503" +pandora_version="7.0NG.776-240504" 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 05d49335cb..78d6272c34 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240503'; +use constant AGENT_BUILD => '240504'; # 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 037ebbe6bb..997b258337 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240503 +%define release 240504 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index d3558b0026..2ad019abfc 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240503 +%define release 240504 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index a7d6c6a620..adb07304b8 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240503 +%define release 240504 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index db99b6fbf2..cea0a88e7b 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240503 +%define release 240504 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 250f327421..41060e513c 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240503 +%define release 240504 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 aae9e94d1a..464a917dc7 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240503" +PI_BUILD="240504" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 37d4289b18..86fa14a130 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240503} +{240504} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 85da7bbecd..efbf1dfcff 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.776 Build 240503") +#define PANDORA_VERSION ("7.0NG.776 Build 240504") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 44c1b8d6a1..4d5860f9b8 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.776(Build 240503))" + VALUE "ProductVersion", "(7.0NG.776(Build 240504))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index e947bc0573..cfe214773e 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240503 +Version: 7.0NG.776-240504 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 c6b8402407..146102e61a 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.776-240503" +pandora_version="7.0NG.776-240504" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 9af4949d06..7b1e4f69bb 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240503'; +$build_version = 'PC240504'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index d97bd64d26..585dc8ed68 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 7cc4e63064..d21da67e2b 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240503 +%define release 240504 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 16ad3ac618..beb93b2468 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240503 +%define release 240504 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 5a42f571c6..431190a3b7 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240503" +PI_BUILD="240504" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 511a173cf1..6bad5449bc 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240503"; +my $version = "7.0NG.776 Build 240504"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index a74b93661d..312420b14a 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.776 Build 240503"; +my $version = "7.0NG.776 Build 240504"; # save program name for logging my $progname = basename($0); From 6f63e22caf898edb2c59f26fdcd9d597f25acff7 Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 5 May 2024 01:00:03 +0200 Subject: [PATCH 13/20] 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.redhat_bin.el8.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.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 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 368b71b844..6bf5a29def 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240504 +Version: 7.0NG.776-240505 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 2662ad33f2..54c158b7a4 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.776-240504" +pandora_version="7.0NG.776-240505" 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 78d6272c34..4ff881fa4c 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240504'; +use constant AGENT_BUILD => '240505'; # 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 997b258337..2984fdaf90 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240504 +%define release 240505 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index 2ad019abfc..51083523b9 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240504 +%define release 240505 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index adb07304b8..527f9828d0 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240504 +%define release 240505 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index cea0a88e7b..8e9b56f9ab 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240504 +%define release 240505 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 41060e513c..f960a0a816 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240504 +%define release 240505 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 464a917dc7..a5ad6de1ee 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240504" +PI_BUILD="240505" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 86fa14a130..300a9efbb6 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240504} +{240505} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index efbf1dfcff..5e62da0d1a 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.776 Build 240504") +#define PANDORA_VERSION ("7.0NG.776 Build 240505") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 4d5860f9b8..b567300d73 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.776(Build 240504))" + VALUE "ProductVersion", "(7.0NG.776(Build 240505))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index cfe214773e..189774ebd1 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240504 +Version: 7.0NG.776-240505 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 146102e61a..f409448a62 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.776-240504" +pandora_version="7.0NG.776-240505" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 7b1e4f69bb..24ae75d07f 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240504'; +$build_version = 'PC240505'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 585dc8ed68..de6aac3ec8 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index d21da67e2b..04948579a1 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240504 +%define release 240505 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index beb93b2468..65bdc79bad 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240504 +%define release 240505 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 431190a3b7..021bdb7904 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240504" +PI_BUILD="240505" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 6bad5449bc..658dbaaafe 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240504"; +my $version = "7.0NG.776 Build 240505"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 312420b14a..12f06bea3a 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.776 Build 240504"; +my $version = "7.0NG.776 Build 240505"; # save program name for logging my $progname = basename($0); From feba65819b7114152055d710f4d927c5896d0bc3 Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 6 May 2024 01:00:04 +0200 Subject: [PATCH 14/20] 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.redhat_bin.el8.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.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 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 6bf5a29def..aaba742659 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240505 +Version: 7.0NG.776-240506 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 54c158b7a4..c2fa12960c 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.776-240505" +pandora_version="7.0NG.776-240506" 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 4ff881fa4c..b784189567 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240505'; +use constant AGENT_BUILD => '240506'; # 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 2984fdaf90..ee143f48f4 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240505 +%define release 240506 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index 51083523b9..543ecf5db8 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240505 +%define release 240506 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index 527f9828d0..bce5bc22c9 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240505 +%define release 240506 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index 8e9b56f9ab..c195e54d12 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240505 +%define release 240506 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index f960a0a816..943cfc54f1 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240505 +%define release 240506 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 a5ad6de1ee..cb23e3bd30 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240505" +PI_BUILD="240506" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 300a9efbb6..435fd2861e 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240505} +{240506} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 5e62da0d1a..d02064850c 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.776 Build 240505") +#define PANDORA_VERSION ("7.0NG.776 Build 240506") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index b567300d73..c3df89f6c4 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.776(Build 240505))" + VALUE "ProductVersion", "(7.0NG.776(Build 240506))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 189774ebd1..25ad1edcad 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240505 +Version: 7.0NG.776-240506 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 f409448a62..570166590b 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.776-240505" +pandora_version="7.0NG.776-240506" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 24ae75d07f..7a215f9070 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240505'; +$build_version = 'PC240506'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index de6aac3ec8..1abad96ca9 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 04948579a1..2928d1e365 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240505 +%define release 240506 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 65bdc79bad..d58d1fc072 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240505 +%define release 240506 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 021bdb7904..bd176b3fc7 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240505" +PI_BUILD="240506" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 658dbaaafe..c3d616f0a5 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240505"; +my $version = "7.0NG.776 Build 240506"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 12f06bea3a..131be6734d 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.776 Build 240505"; +my $version = "7.0NG.776 Build 240506"; # save program name for logging my $progname = basename($0); From 6e38614ca87256bc7d8a732be594f6f6e2f1ac59 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 6 May 2024 09:28:01 +0200 Subject: [PATCH 15/20] #13465 added id user in list events report --- pandora_console/include/functions_reporting_html.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 14ff38afd5..1238609915 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -3908,7 +3908,11 @@ function reporting_html_event_report_agent($table, $item, $pdf=0) $data[] = ''.__('System').''; } else { $user_name = db_get_value('fullname', 'tusuario', 'id_user', $event['validated_by']); - $data[] = io_safe_output($user_name); + if (isset($event['id_usuario']) === true && empty($event['id_usuario']) === false) { + $data[] = io_safe_output($user_name).' ('.$event['id_usuario'].')'; + } else { + $data[] = ''; + } } if ($item['show_summary_group']) { From 9861b02c0e6044ac6d6a1c6f708077ac72f9e02b Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Mon, 6 May 2024 11:22:34 +0200 Subject: [PATCH 16/20] #13289 delete of the Create incident from event option --- pandora_console/extras/mr/69.sql | 3 +++ pandora_console/pandoradb_data.sql | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pandora_console/extras/mr/69.sql b/pandora_console/extras/mr/69.sql index 534cef73ef..393fffc7a3 100644 --- a/pandora_console/extras/mr/69.sql +++ b/pandora_console/extras/mr/69.sql @@ -7764,4 +7764,7 @@ DELETE FROM tconfig WHERE `token` = 'loginhash_pwd'; UPDATE `tdiscovery_apps` SET `version` = '1.5' WHERE `short_name` = 'pandorafms.vmware'; +-- Delete Create incident from event, from tevent_response +DELETE FROM tevent_response WHERE name = 'Create incident from event'; + COMMIT; \ No newline at end of file diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 83f017d531..d76f65b3f8 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -1217,7 +1217,7 @@ INSERT INTO `tagent_custom_fields` VALUES (1,'Serial Number',0,0,'',0),(2,' INSERT INTO `ttag` VALUES (1,'network','Network equipment','http://pandorafms.com','','',''),(2,'critical','Critical modules','','','',''),(3,'dmz','DMZ Network Zone','','','',''),(4,'performance','Performance anda capacity modules','','','',''),(5,'configuration','','','','',''); -INSERT INTO `tevent_response` VALUES (1,'Ping to host','Ping to the agent host','ping -c 5 _agent_address_','command',0,620,500,0,'',0,90,0),(3,'Create incident from event','Create a incident from the event with the standard incidents system of Pandora FMS','index.php?sec=workspace&sec2=operation/incidents/incident_detail&insert_form&from_event=_event_id_','url',0,0,0,1,'',0,90,0),(5,'Restart agent','Restart the agent with using UDP protocol. To use this response is necessary to have installed Pandora FMS server and console in the same machine.','/usr/share/pandora_server/util/udp_client.pl _agent_address_ 41122 "REFRESH AGENT"','command',0,620,500,0,'',0,90,0),(6,'Ping to module agent host','Ping to the module agent host','ping -c 5 _module_address_','command',0,620,500,0,'',0,90,0),(7,'Create ticket in Pandora ITSM from event','Create a ticket in Pandora ITSM from an event','index.php?sec=manageTickets&sec2=operation/ITSM/itsm&operation=edit&from_event=_event_id_','url',0,0,0,1,'',0,90,1); +INSERT INTO `tevent_response` VALUES (1,'Ping to host','Ping to the agent host','ping -c 5 _agent_address_','command',0,620,500,0,'',0,90,0),(5,'Restart agent','Restart the agent with using UDP protocol. To use this response is necessary to have installed Pandora FMS server and console in the same machine.','/usr/share/pandora_server/util/udp_client.pl _agent_address_ 41122 "REFRESH AGENT"','command',0,620,500,0,'',0,90,0),(6,'Ping to module agent host','Ping to the module agent host','ping -c 5 _module_address_','command',0,620,500,0,'',0,90,0),(7,'Create ticket in Pandora ITSM from event','Create a ticket in Pandora ITSM from an event','index.php?sec=manageTickets&sec2=operation/ITSM/itsm&operation=edit&from_event=_event_id_','url',0,0,0,1,'',0,90,1); INSERT INTO `tupdate_settings` VALUES ('current_update', '412'), ('customer_key', 'PANDORA-FREE'), ('updating_binary_path', 'Path where the updated binary files will be stored'), ('updating_code_path', 'Path where the updated code is stored'), ('dbname', ''), ('dbhost', ''), ('dbpass', ''), ('dbuser', ''), ('dbport', ''), ('proxy', ''), ('proxy_port', ''), ('proxy_user', ''), ('proxy_pass', ''); From 0a397dbbec8e9d161b25a1e0231ea3d31d7cf748 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Mon, 6 May 2024 13:43:36 +0200 Subject: [PATCH 17/20] 13639-Fix snmp console group acl & filter by alias --- .../include/class/SnmpConsole.class.php | 271 ++++++++++-------- .../operation/snmpconsole/snmp_view.php | 4 +- 2 files changed, 154 insertions(+), 121 deletions(-) diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php index c0f3f9b4fc..d186bd1b56 100644 --- a/pandora_console/include/class/SnmpConsole.class.php +++ b/pandora_console/include/class/SnmpConsole.class.php @@ -85,6 +85,13 @@ class SnmpConsole extends HTML */ private $filter_free_search; + /** + * Filter alias. + * + * @var string + */ + private $filter_alias_search; + /** * Filter status. * @@ -135,7 +142,8 @@ class SnmpConsole extends HTML int $filter_group_by, int $filter_hours_ago, int $filter_trap_type, - int $refr + int $refr, + string $filter_alias_search ) { global $config; @@ -157,6 +165,7 @@ class SnmpConsole extends HTML $this->filter_alert = $filter_alert; $this->filter_severity = $filter_severity; $this->filter_free_search = $filter_free_search; + $this->filter_alias_search = $filter_alias_search; $this->filter_status = $filter_status; $this->filter_group_by = $filter_group_by; $this->filter_hours_ago = $filter_hours_ago; @@ -375,13 +384,21 @@ class SnmpConsole extends HTML 'style' => 'widht:100%', ], [ - 'label' => __('Free search'), + 'label' => __('Search').ui_print_help_tip(__('It will search through the contents of the raw trap, which does not include the agent name. You can search by the next values: IP, OID, Value, Text, Description, User ID and Source.'), true), 'type' => 'text', 'id' => 'filter_free_search', 'input_class' => 'filter_input_datatable', 'name' => 'filter_free_search', 'value' => $this->filter_free_search, ], + [ + 'label' => __('Search Alias').ui_print_help_tip(__('It will search by the agent alias. This option could make the system slower.'), true), + 'type' => 'text', + 'id' => 'filter_alias_search', + 'input_class' => 'filter_input_datatable', + 'name' => 'filter_alias_search', + 'value' => $this->filter_alias_search, + ], [ 'label' => __('Status'), 'type' => 'select', @@ -449,7 +466,7 @@ class SnmpConsole extends HTML 1000, ], ], - 'filter_main_class' => 'box-flat white_table_graph fixed_filter_bar', + 'filter_main_class' => 'box-flat white_table_graph fixed_filter_bar snmp-console-filter', ] ); } catch (Exception $e) { @@ -554,10 +571,6 @@ class SnmpConsole extends HTML $filters = get_parameter('filter', []); // Build ranges. - if (empty($filters['filter_hours_ago']) === true) { - $filters['filter_hours_ago'] = 8; - } - $now_timestamp = time(); $interval_seconds = ($filters['filter_hours_ago'] * 3600); $ago_timestamp = ($now_timestamp - $interval_seconds); @@ -577,141 +590,148 @@ class SnmpConsole extends HTML ob_start(); $data = []; - $user_groups = users_get_groups($config['id_user'], 'AR', false); - $prea = array_keys($user_groups); - $ids = join(',', $prea); - - $sql_count = sprintf( - 'SELECT - count(DISTINCT(id_usuario)) + $whereSubquery = ''; + $sql = 'SELECT + * FROM - tusuario_perfil - WHERE - id_usuario = "%s" - AND id_grupo IN ( - SELECT - id_grupo - FROM - tgrupo - WHERE - id_grupo IN (%s) - AND id_grupo NOT IN ( - SELECT - id_grupo - FROM - tagente))', - $config['id_user'], - $ids - ); + ttrap + %s + WHERE 1=1 + %s + ORDER BY + timestamp DESC + LIMIT %d, %d'; - $user_in_group_wo_agents = db_get_value_sql($sql_count); - if ($user_in_group_wo_agents == 0) { + $sql_count = 'SELECT + COUNT(`ttrap`.`id_trap`) + FROM + ttrap + %s + WHERE 1=1 + %s'; + + if (users_is_admin() === false || users_can_manage_group_all('AR') === false) { + $user_groups = users_get_groups($config['id_user'], 'AR', false); $rows = db_get_all_rows_filter( 'tagente', ['id_grupo' => array_keys($user_groups)], ['id_agente'] ); + $id_agents = []; foreach ($rows as $row) { $id_agents[] = $row['id_agente']; } - if (!empty($id_agents)) { + if (empty($id_agents) === false) { $address_by_user_groups = agents_get_addresses($id_agents); foreach ($address_by_user_groups as $i => $a) { $address_by_user_groups[$i] = '"'.$a.'"'; } } - } else { - $rows = db_get_all_rows_filter( - 'tagente', - [], - ['id_agente'] + + if (empty($address_by_user_groups) === true) { + $address_by_user_groups = []; + array_unshift($address_by_user_groups, '""'); + } + + $whereSubquery .= sprintf( + 'AND ( + `ttrap`.`source` IN (%s) OR + `ttrap`.`source`="" + )', + implode(',', $address_by_user_groups) ); - $id_agents = []; - foreach ($rows as $row) { - $id_agents[] = $row['id_agente']; - } - - $all_address_agents = agents_get_addresses($id_agents); - foreach ($all_address_agents as $i => $a) { - $all_address_agents[$i] = '"'.$a.'"'; - } } - if (empty($address_by_user_groups)) { - $address_by_user_groups = []; - array_unshift($address_by_user_groups, '""'); + if ($filters['filter_alias_search'] !== '') { + $sql_join = ' + LEFT JOIN `tagente` + ON `tagente`.`direccion` = `ttrap`.`source` + LEFT JOIN `taddress_agent` + ON `tagente`.`id_agente` = `taddress_agent`.`id_agent` + LEFT JOIN `taddress` + ON `taddress_agent`.`id_a` = `taddress`.`id_a` + '; + } else { + $sql_join = ''; } - if (empty($all_address_agents)) { - $all_address_agents = []; - array_unshift($all_address_agents, '""'); - } - - $sql = 'SELECT * FROM ttrap - WHERE ( - `source` IN ('.implode(',', $address_by_user_groups).") OR - `source`='' OR - `source` NOT IN (".implode(',', $all_address_agents).') - ) - %s - ORDER BY timestamp DESC - LIMIT %d,%d'; - - $whereSubquery = ''; if ($filters['filter_alert'] != -1) { - $whereSubquery .= ' AND alerted = '.$filters['filter_alert']; + $whereSubquery .= ' AND `ttrap`.`alerted` = '.$filters['filter_alert']; } - $filters['filter_severity'] = (int) $filters['filter_severity']; if ($filters['filter_severity'] != -1) { // There are two special severity values aimed to match two different trap standard severities // in database: warning/critical and critical/normal. - if ($filters['filter_severity'] !== EVENT_CRIT_OR_NORMAL - && $filters['filter_severity'] !== EVENT_CRIT_WARNING_OR_CRITICAL - && $filters['filter_severity'] !== EVENT_CRIT_NOT_NORMAL + if ($filters['filter_severity'] != EVENT_CRIT_OR_NORMAL + && $filters['filter_severity'] != EVENT_CRIT_WARNING_OR_CRITICAL ) { // Test if enterprise is installed to search oid in text or oid field in ttrap. - $whereSubquery .= ' AND severity = '.$filters['filter_severity']; + if ($config['enterprise_installed']) { + $whereSubquery .= ' AND ( + (`ttrap`.`alerted` = 0 AND `ttrap`.`severity` = '.$filters['filter_severity'].') OR + (`ttrap`.`alerted` = 1 AND `ttrap`.`priority` = '.$filters['filter_severity'].'))'; + } else { + $whereSubquery .= ' AND ( + (`ttrap`.`alerted` = 0 AND 1 = '.$filters['filter_severity'].') OR + (`ttrap`.`alerted` = 1 AND `ttrap`.`priority` = '.$filters['filter_severity'].'))'; + } } else if ($filters['filter_severity'] === EVENT_CRIT_WARNING_OR_CRITICAL) { // Test if enterprise is installed to search oid in text or oid field in ttrap. - $whereSubquery .= ' AND (severity = '.EVENT_CRIT_WARNING.' OR severity = '.EVENT_CRIT_CRITICAL.' OR severity = '.EVENT_CRIT_WARNING_OR_CRITICAL.')'; + if ($config['enterprise_installed']) { + $whereSubquery .= ' AND ( + (`ttrap`.`alerted` = 0 AND (`ttrap`.`severity` = '.EVENT_CRIT_WARNING.' OR `ttrap`.`severity` = '.EVENT_CRIT_CRITICAL.')) OR + (`ttrap`.`alerted` = 1 AND (`ttrap`.`priority` = '.EVENT_CRIT_WARNING.' OR `ttrap`.`priority` = '.EVENT_CRIT_CRITICAL.')))'; + } else { + $whereSubquery .= ' AND ( + (`ttrap`.`alerted` = 1 AND (`ttrap`.`priority` = '.EVENT_CRIT_WARNING.' OR `ttrap`.`priority` = '.EVENT_CRIT_CRITICAL.')))'; + } } else if ($filters['filter_severity'] === EVENT_CRIT_OR_NORMAL) { // Test if enterprise is installed to search oid in text or oid field in ttrap. - $whereSubquery .= ' AND (severity = '.EVENT_CRIT_NORMAL.' OR severity = '.EVENT_CRIT_CRITICAL.' OR severity = '.EVENT_CRIT_OR_NORMAL.')'; - } else if ($filters['filter_severity'] === EVENT_CRIT_NOT_NORMAL) { - // Test if enterprise is installed to search oid in text or oid field in ttrap. - $whereSubquery .= ' AND (severity = '.EVENT_CRIT_WARNING.' OR severity = '.EVENT_CRIT_CRITICAL.' OR severity = '.EVENT_CRIT_NOT_NORMAL.')'; + if ($config['enterprise_installed']) { + $whereSubquery .= ' AND ( + (`ttrap`.`alerted` = 0 AND (`ttrap`.`severity` = '.EVENT_CRIT_NORMAL.' OR `ttrap`.`severity` = '.EVENT_CRIT_CRITICAL.')) OR + (`ttrap`.`alerted` = 1 AND (`ttrap`.`priority` = '.EVENT_CRIT_NORMAL.' OR `ttrap`.`priority` = '.EVENT_CRIT_CRITICAL.')))'; + } else { + $whereSubquery .= ' AND ( + (`ttrap`.`alerted` = 1 AND (`ttrap`.`priority` = '.EVENT_CRIT_NORMAL.' OR `ttrap`.`priority` = '.EVENT_CRIT_CRITICAL.')))'; + } } } if ($filters['filter_free_search'] !== '') { $free_search_str = io_safe_output($filters['filter_free_search']); $whereSubquery .= ' - AND (source LIKE "%'.$free_search_str.'%" OR - oid LIKE "%'.$free_search_str.'%" OR - oid_custom LIKE "%'.$free_search_str.'%" OR - type_custom LIKE "%'.$free_search_str.'%" OR - value LIKE "%'.$free_search_str.'%" OR - value_custom LIKE "%'.$free_search_str.'%" OR - id_usuario LIKE "%'.$free_search_str.'%" OR - text LIKE "%'.$free_search_str.'%" OR - description LIKE "%'.$free_search_str.'%")'; + AND (`ttrap`.`source` LIKE "%'.$free_search_str.'%" OR + `ttrap`.`oid` LIKE "%'.$free_search_str.'%" OR + `ttrap`.`oid_custom` LIKE "%'.$free_search_str.'%" OR + `ttrap`.`type_custom` LIKE "%'.$free_search_str.'%" OR + `ttrap`.`value` LIKE "%'.$free_search_str.'%" OR + `ttrap`.`value_custom` LIKE "%'.$free_search_str.'%" OR + `ttrap`.`id_usuario` LIKE "%'.$free_search_str.'%" OR + `ttrap`.`text` LIKE "%'.$free_search_str.'%" OR + `ttrap`.`description` LIKE "%'.$free_search_str.'%")'; + } + + if ($filters['filter_alias_search'] !== '') { + $alias_search = io_safe_output($filters['filter_alias_search']); + $whereSubquery .= ' + AND `tagente`.`alias` LIKE "%'.$alias_search.'%"'; } if ($filters['filter_status'] != -1) { - $whereSubquery .= ' AND status = '.$filters['filter_status']; + $whereSubquery .= ' AND `ttrap`.`status` = '.$filters['filter_status']; } if ($date_from_trap != '') { if ($time_from_trap != '') { $whereSubquery .= ' - AND (utimestamp > '.$ago_timestamp.') + AND (`ttrap`.`utimestamp` > '.$ago_timestamp.') '; } else { $whereSubquery .= ' - AND (UNIX_TIMESTAMP(timestamp) > UNIX_TIMESTAMP("'.$date_from_trap.' 23:59:59")) + AND (UNIX_TIMESTAMP(`ttrap`.`timestamp`) > UNIX_TIMESTAMP("'.$date_from_trap.' 23:59:59")) '; } } @@ -719,37 +739,31 @@ class SnmpConsole extends HTML if ($date_to_trap != '') { if ($time_to_trap) { $whereSubquery .= ' - AND (utimestamp < '.$now_timestamp.') + AND (`ttrap`.`utimestamp` < '.$now_timestamp.') '; } else { $whereSubquery .= ' - AND (UNIX_TIMESTAMP(timestamp) < UNIX_TIMESTAMP("'.$date_to_trap.' 23:59:59")) + AND (UNIX_TIMESTAMP(`ttrap`.`timestamp`) < UNIX_TIMESTAMP("'.$date_to_trap.' 23:59:59")) '; } } if ($filters['filter_trap_type'] == 5) { - $whereSubquery .= ' AND type NOT IN (0, 1, 2, 3, 4)'; + $whereSubquery .= ' AND `ttrap`.`type` NOT IN (0, 1, 2, 3, 4)'; } else if ($filters['filter_trap_type'] != -1) { - $whereSubquery .= ' AND type = '.$filters['filter_trap_type']; + $whereSubquery .= ' AND `ttrap`.`type` = '.$filters['filter_trap_type']; } + $where_without_group = ''; if ($filters['filter_group_by']) { $where_without_group = $whereSubquery; - $whereSubquery .= ' GROUP BY source,oid'; + $whereSubquery .= ' GROUP BY `ttrap`.`source`,`ttrap`.`oid`,`ttrap`.`id_trap`'; + } else if ($filters['filter_alias_search'] !== '') { + $whereSubquery .= ' GROUP BY `ttrap`.`id_trap`'; } - $sql = sprintf($sql, $whereSubquery, $start, $length); - - $sql_count = 'SELECT COUNT(id_trap) FROM ttrap - WHERE ( - source IN ('.implode(',', $address_by_user_groups).") OR - source='' OR - source NOT IN (".implode(',', $all_address_agents).') - ) - %s'; - - $sql_count = sprintf($sql_count, $whereSubquery); + $sql = sprintf($sql, $sql_join, $whereSubquery, $start, $length); + $sql_count = sprintf($sql_count, $sql_join, $whereSubquery); $traps = db_get_all_rows_sql($sql, true); $total = (int) db_get_value_sql($sql_count, false, false); @@ -804,8 +818,8 @@ class SnmpConsole extends HTML $tmp->snmp_agent .= ''.$tmp->source.''; } else { $tmp->snmp_agent .= '
'; - $tmp->snmp_agent .= ''.$agent['alias'].''.ui_print_help_tip($tmp->source, true); - '
'; + $tmp->snmp_agent .= ''.$agent['alias'].ui_print_help_tip($tmp->source, true); + '
'; } // Enterprise string. @@ -1152,25 +1166,42 @@ class SnmpConsole extends HTML $whereSubquery .= ' AND alerted = '.$$alert; } - $severity = (int) $severity; - if ($severity !== -1) { + if ($severity != -1) { // There are two special severity values aimed to match two different trap standard severities // in database: warning/critical and critical/normal. - if ($severity !== EVENT_CRIT_OR_NORMAL - && $severity !== EVENT_CRIT_WARNING_OR_CRITICAL - && $severity !== EVENT_CRIT_NOT_NORMAL + if ($severity != EVENT_CRIT_OR_NORMAL + && $severity != EVENT_CRIT_WARNING_OR_CRITICAL ) { // Test if enterprise is installed to search oid in text or oid field in ttrap. - $whereSubquery .= ' AND severity = '.$severity; + if ($config['enterprise_installed']) { + $whereSubquery .= ' AND ( + (alerted = 0 AND severity = '.$severity.') OR + (alerted = 1 AND priority = '.$severity.'))'; + } else { + $whereSubquery .= ' AND ( + (alerted = 0 AND 1 = '.$severity.') OR + (alerted = 1 AND priority = '.$severity.'))'; + } } else if ($severity === EVENT_CRIT_WARNING_OR_CRITICAL) { // Test if enterprise is installed to search oid in text or oid field in ttrap. - $whereSubquery .= ' AND (severity = '.EVENT_CRIT_WARNING.' OR severity = '.EVENT_CRIT_CRITICAL.' OR severity = '.EVENT_CRIT_WARNING_OR_CRITICAL.')'; + if ($config['enterprise_installed']) { + $whereSubquery .= ' AND ( + (alerted = 0 AND (severity = '.EVENT_CRIT_WARNING.' OR severity = '.EVENT_CRIT_CRITICAL.')) OR + (alerted = 1 AND (priority = '.EVENT_CRIT_WARNING.' OR priority = '.EVENT_CRIT_CRITICAL.')))'; + } else { + $whereSubquery .= ' AND ( + (alerted = 1 AND (priority = '.EVENT_CRIT_WARNING.' OR priority = '.EVENT_CRIT_CRITICAL.')))'; + } } else if ($severity === EVENT_CRIT_OR_NORMAL) { // Test if enterprise is installed to search oid in text or oid field in ttrap. - $whereSubquery .= ' AND (severity = '.EVENT_CRIT_NORMAL.' OR severity = '.EVENT_CRIT_CRITICAL.' OR severity = '.EVENT_CRIT_OR_NORMAL.')'; - } else if ($severity === EVENT_CRIT_NOT_NORMAL) { - // Test if enterprise is installed to search oid in text or oid field in ttrap. - $whereSubquery .= ' AND (severity = '.EVENT_CRIT_WARNING.' OR severity = '.EVENT_CRIT_CRITICAL.' OR severity = '.EVENT_CRIT_NOT_NORMAL.')'; + if ($config['enterprise_installed']) { + $whereSubquery .= ' AND ( + (alerted = 0 AND (severity = '.EVENT_CRIT_NORMAL.' OR severity = '.EVENT_CRIT_CRITICAL.')) OR + (alerted = 1 AND (priority = '.EVENT_CRIT_NORMAL.' OR priority = '.EVENT_CRIT_CRITICAL.')))'; + } else { + $whereSubquery .= ' AND ( + (alerted = 1 AND (priority = '.EVENT_CRIT_NORMAL.' OR priority = '.EVENT_CRIT_CRITICAL.')))'; + } } } diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php index 1073598c51..c9fea95119 100755 --- a/pandora_console/operation/snmpconsole/snmp_view.php +++ b/pandora_console/operation/snmpconsole/snmp_view.php @@ -36,6 +36,7 @@ $ajaxPage = $config['homedir'].'/operation/snmpconsole/snmp_view'; $filter_alert = get_parameter('filter_alert', -1); $filter_severity = get_parameter('filter_severity', -1); $filter_free_search = get_parameter('filter_free_search', ''); +$filter_alias_search = get_parameter('filter_alias_search', ''); $filter_status = get_parameter('filter_status', 0); $filter_group_by = get_parameter('filter_group_by', 0); $filter_hours_ago = get_parameter('filter_hours_ago', 8); @@ -54,7 +55,8 @@ try { $filter_group_by, $filter_hours_ago, $filter_trap_type, - $refr + $refr, + $filter_alias_search ); } catch (Exception $e) { if ((bool) is_ajax() === true) { From 55f2eb1fadf759a2cd422316abefa3ed9fd07d4d Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Mon, 6 May 2024 14:38:53 +0200 Subject: [PATCH 18/20] 13357-Fix datalabel in horizontal bars graph pdf --- pandora_console/include/functions_graph.php | 6 +++++- pandora_console/include/functions_reporting.php | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 83f47e00b9..0a0b66f5c9 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -3508,7 +3508,11 @@ function graph_custom_sql_graph( } if ((int) $ttl === 2) { - $options['dataLabel'] = ['display' => 'auto']; + $options['dataLabel'] = ['display' => true]; + + if ($layout !== false && is_array($layout) === true) { + $options['layout'] = $layout; + } } $output .= vbar_graph( diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 71ac93dc19..4ef6baff96 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -6690,6 +6690,7 @@ function reporting_sql_graph( switch ($type_sql_graph) { case 'sql_graph_hbar': default: + $layout = ['padding' => ['right' => '40']]; $return['type'] = 'sql_graph_hbar'; break; From cc90847711a3bfdba1d3bab5529b478111431e29 Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Mon, 6 May 2024 16:06:30 +0200 Subject: [PATCH 19/20] #13353 Pause and resume if edit mode is checked in the View panel --- .../include/javascript/pandora_dashboards.js | 13 +++++++++++++ pandora_console/views/dashboard/layout.php | 3 +++ 2 files changed, 16 insertions(+) diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js index b6e20aa4ba..9acd059543 100644 --- a/pandora_console/include/javascript/pandora_dashboards.js +++ b/pandora_console/include/javascript/pandora_dashboards.js @@ -1722,3 +1722,16 @@ function show_projection_period() { $("#div_projection_period").hide(); } } + +// Paused and resume if edit mode is checked. +// eslint-disable-next-line no-unused-vars +function paused_resume_dashboard_countdown() { + $("#checkbox-edit-mode").on("click", function() { + let isChecked = $("#checkbox-edit-mode").is(":checked"); + if (isChecked) { + $("#refrcounter").countdown("pause"); + } else { + $("#refrcounter").countdown("resume"); + } + }); +} diff --git a/pandora_console/views/dashboard/layout.php b/pandora_console/views/dashboard/layout.php index 4d1553dd7e..478d0f0f4e 100644 --- a/pandora_console/views/dashboard/layout.php +++ b/pandora_console/views/dashboard/layout.php @@ -94,5 +94,8 @@ echo $output; $("#button-add-widget-"+cellId).trigger("click"); }, 500); } + + // Paused and resume if edit mode is checked. + paused_resume_dashboard_countdown(); }); From 3444e41dd4d607d25cd6ea08565095dee9f4c47e Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 7 May 2024 01:00:07 +0200 Subject: [PATCH 20/20] 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.redhat_bin.el8.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.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 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index aaba742659..2a9c5b46b3 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240506 +Version: 7.0NG.776-240507 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 c2fa12960c..08c4806462 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.776-240506" +pandora_version="7.0NG.776-240507" 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 b784189567..bf0e6fe17c 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240506'; +use constant AGENT_BUILD => '240507'; # 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 ee143f48f4..f379e25a34 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240506 +%define release 240507 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index 543ecf5db8..b13d18455c 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240506 +%define release 240507 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index bce5bc22c9..634829a853 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240506 +%define release 240507 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index c195e54d12..ddffff177d 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240506 +%define release 240507 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 943cfc54f1..6a2a4c8c2d 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240506 +%define release 240507 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 cb23e3bd30..da84075418 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240506" +PI_BUILD="240507" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 435fd2861e..9c0d558882 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240506} +{240507} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index d02064850c..c7a14b4a92 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.776 Build 240506") +#define PANDORA_VERSION ("7.0NG.776 Build 240507") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index c3df89f6c4..010821e584 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.776(Build 240506))" + VALUE "ProductVersion", "(7.0NG.776(Build 240507))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 25ad1edcad..4903088492 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240506 +Version: 7.0NG.776-240507 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 570166590b..5c37755fe2 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.776-240506" +pandora_version="7.0NG.776-240507" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 7a215f9070..9c9f151cae 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240506'; +$build_version = 'PC240507'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 1abad96ca9..455f424d25 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 2928d1e365..b141d93645 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240506 +%define release 240507 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index d58d1fc072..347377da8e 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240506 +%define release 240507 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index bd176b3fc7..b1445712b1 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240506" +PI_BUILD="240507" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index c3d616f0a5..0ed9637448 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240506"; +my $version = "7.0NG.776 Build 240507"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 131be6734d..b66b6f5f23 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.776 Build 240506"; +my $version = "7.0NG.776 Build 240507"; # save program name for logging my $progname = basename($0);