#11634 deleted ha legacy

This commit is contained in:
Daniel Cebrian 2024-02-15 16:25:11 +01:00
parent 80991a32f9
commit cc43ab26db
4 changed files with 5 additions and 9 deletions

View File

@ -1738,3 +1738,5 @@ extensions/files_repo/sql/files_repo.sql
extensions/files_repo extensions/files_repo
extensions/resource_exportation.php extensions/resource_exportation.php
extensions/resource_registration.php extensions/resource_registration.php
enterprise/include/class/DatabaseHA.class.php
enterprise/godmode/servers/HA_cluster.php

View File

@ -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; 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; COMMIT;

View File

@ -3008,7 +3008,7 @@ class ConsoleSupervisor
public function checkHaStatus() public function checkHaStatus()
{ {
global $config; global $config;
enterprise_include_once('include/class/DatabaseHA.class.php'); enterprise_include_once('include/class/NewDatabaseHA.class.php');
$cluster = new DatabaseHA(); $cluster = new DatabaseHA();
$nodes = $cluster->getNodes(); $nodes = $cluster->getNodes();

View File

@ -503,10 +503,6 @@ function config_update_config()
$error_update[] = __('Enable Update Manager'); $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) { if (config_update_value('agent_vulnerabilities', get_parameter('agent_vulnerabilities'), true) === false) {
$error_update[] = __('agent_vulnerabilities'); $error_update[] = __('agent_vulnerabilities');
} }
@ -2424,10 +2420,6 @@ function config_process_config()
config_update_value('enable_update_manager', 1); 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'])) { if (!isset($config['disabled_newsletter'])) {
config_update_value('disabled_newsletter', 0); config_update_value('disabled_newsletter', 0);
} }