From cc43ab26db906411747b60081d3f7e8eeea4f60e Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 15 Feb 2024 16:25:11 +0100 Subject: [PATCH] #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); }