From cc43ab26db906411747b60081d3f7e8eeea4f60e Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 15 Feb 2024 16:25:11 +0100 Subject: [PATCH 01/90] #11634 deleted ha legacy --- pandora_console/extras/delete_files/delete_files.txt | 2 ++ pandora_console/extras/mr/68.sql | 2 ++ pandora_console/include/class/ConsoleSupervisor.php | 2 +- pandora_console/include/functions_config.php | 8 -------- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pandora_console/extras/delete_files/delete_files.txt b/pandora_console/extras/delete_files/delete_files.txt index b3fbea46dd..040a88497b 100644 --- a/pandora_console/extras/delete_files/delete_files.txt +++ b/pandora_console/extras/delete_files/delete_files.txt @@ -1738,3 +1738,5 @@ extensions/files_repo/sql/files_repo.sql extensions/files_repo extensions/resource_exportation.php extensions/resource_registration.php +enterprise/include/class/DatabaseHA.class.php +enterprise/godmode/servers/HA_cluster.php \ No newline at end of file diff --git a/pandora_console/extras/mr/68.sql b/pandora_console/extras/mr/68.sql index 80038a0e0d..00623ccaf7 100644 --- a/pandora_console/extras/mr/68.sql +++ b/pandora_console/extras/mr/68.sql @@ -86,4 +86,6 @@ INSERT IGNORE INTO `tcredential_store` (`identifier`, `id_group`, `product`, `ex ; UPDATE `trecon_task` SET `auth_strings` = IF(`auth_strings` = '',CONCAT(@creds_name,`id_rt`),CONCAT(@creds_name,`id_rt`,',',`auth_strings`)) WHERE `snmp_version` = 3 AND `snmp_enabled` = 1; +DELETE FROM tconfig WHERE `token` = 'legacy_database_ha' + COMMIT; \ No newline at end of file diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index 8f57ec9138..dd3a4016fe 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -3008,7 +3008,7 @@ class ConsoleSupervisor public function checkHaStatus() { global $config; - enterprise_include_once('include/class/DatabaseHA.class.php'); + enterprise_include_once('include/class/NewDatabaseHA.class.php'); $cluster = new DatabaseHA(); $nodes = $cluster->getNodes(); diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 268bfe45b4..572ea9323e 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -503,10 +503,6 @@ function config_update_config() $error_update[] = __('Enable Update Manager'); } - if (config_update_value('legacy_database_ha', get_parameter('legacy_database_ha'), true) === false) { - $error_update[] = __('Legacy database HA'); - } - if (config_update_value('agent_vulnerabilities', get_parameter('agent_vulnerabilities'), true) === false) { $error_update[] = __('agent_vulnerabilities'); } @@ -2424,10 +2420,6 @@ function config_process_config() config_update_value('enable_update_manager', 1); } - if (!isset($config['legacy_database_ha'])) { - config_update_value('legacy_database_ha', 0); - } - if (!isset($config['disabled_newsletter'])) { config_update_value('disabled_newsletter', 0); } From af0f8a4fc48c7e6847362dd5fc7cdc71a0326b93 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 15 Feb 2024 16:40:18 +0100 Subject: [PATCH 02/90] #11634 updated url in console supervisor --- 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 dd3a4016fe..fad31abaa2 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -3031,7 +3031,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.HAMASTER.MESSAGE', 'title' => __('Desynchronized operation on the node '.$node['host']), 'message' => __($message), - 'url' => '__url__/index.php?sec=gservers&sec2=enterprise/godmode/servers/HA_cluster', + 'url' => '__url__/index.php?sec=gservers&sec2=enterprise/godmode/servers/new_HA_cluster', 'icon_notification' => self::ICON_ERROR, ] ); From 1dc733c7bb56bd53b1fb1c2908d0348e5e918c6a Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 28 Feb 2024 09:37:12 +0100 Subject: [PATCH 03/90] #12158 correction words --- pandora_console/godmode/setup/setup_ITSM.php | 12 ++++++------ pandora_console/godmode/setup/setup_general.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pandora_console/godmode/setup/setup_ITSM.php b/pandora_console/godmode/setup/setup_ITSM.php index 899a73a985..376d9111ad 100644 --- a/pandora_console/godmode/setup/setup_ITSM.php +++ b/pandora_console/godmode/setup/setup_ITSM.php @@ -180,7 +180,7 @@ $button_test .= html_print_image( 'images/status_sets/default/severity_normal.png', true ); -$button_test .= ' '.__('Connection its OK').''; +$button_test .= ' '.__('Connection is OK').''; $button_test .= ''; $button_test .= ' '; $row['control'] = html_print_label_input_block( - __('Test connection pandora to ITSM'), + __('Test connection PFMS to Pandora ITSM'), $button_test, ['div_class' => 'ITSM-remote-setup-ITSM_token'] ); @@ -206,8 +206,8 @@ if (empty($itsm_public_url) === true) { } $row['publicUrl'] = html_print_label_input_block( - __('URL conect to API %s', get_product_name()).ui_print_help_tip( - __('Full URL to your Pandora (e.g., http://192.168.1.20).'), + __('URL connect to API %s', get_product_name()).ui_print_help_tip( + __('Full URL to your Pandora FMS (e.g., http://192.168.1.20).'), true ), html_print_input_text( @@ -221,7 +221,7 @@ $row['publicUrl'] = html_print_label_input_block( ); $row['agentsSync'] = html_print_label_input_block( - __('Number Agents to synchronize').ui_print_help_tip( + __('Number of Agents to synchronize').ui_print_help_tip( __('Number of agents that will synchronize at the same time, minimum 10 max 1000'), true ), @@ -261,7 +261,7 @@ $button_test_pandora .= html_print_image( 'images/status_sets/default/severity_normal.png', true ); -$button_test_pandora .= ' '.__('Connection its OK').''; +$button_test_pandora .= ' '.__('Connection is OK').''; $button_test_pandora .= '