From 5c789125f2b561017a7fab325da91764eb8cf462 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Mon, 9 May 2022 12:40:36 +0200 Subject: [PATCH 01/10] changed id_user field length from tusuario --- pandora_console/extras/mr/55.sql | 15 +++++++++++++++ .../extras/pandoradb_migrate_6.0_to_759.mysql.sql | 15 +++++++++++++++ pandora_console/pandoradb.sql | 12 ++++++------ 3 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 pandora_console/extras/mr/55.sql diff --git a/pandora_console/extras/mr/55.sql b/pandora_console/extras/mr/55.sql new file mode 100644 index 0000000000..b00619d357 --- /dev/null +++ b/pandora_console/extras/mr/55.sql @@ -0,0 +1,15 @@ +START TRANSACTION; + +ALTER TABLE `tuser_double_auth` DROP FOREIGN KEY `tuser_double_auth_ibfk_1`, MODIFY `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tnotification_user` DROP FOREIGN KEY `tnotification_user_ibfk_2`, MODIFY `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tnotification_source_user` DROP FOREIGN KEY `tnotification_source_user_ibfk_2`, MODIFY `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tnotification_source_group_user` DROP FOREIGN KEY `tnotification_source_group_user_ibfk_2`, MODIFY `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tvisual_console_elements_cache` DROP FOREIGN KEY `tvisual_console_elements_cache_ibfk_3`, MODIFY `user_id` VARCHAR(255) DEFAULT NULL; +ALTER TABLE `tusuario` MODIFY `id_user` VARCHAR(255) NOT NULL DEFAULT '0'; +ALTER TABLE `tuser_double_auth` ADD CONSTRAINT `tuser_double_auth_ibfk_1` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE; +ALTER TABLE `tnotification_user` ADD CONSTRAINT `tnotification_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE `tnotification_source_user` ADD CONSTRAINT `tnotification_source_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE `tnotification_source_group_user` ADD CONSTRAINT `tnotification_source_group_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE `tvisual_console_elements_cache` ADD CONSTRAINT `tvisual_console_elements_cache_ibfk_3` FOREIGN KEY (`user_id`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; + +COMMIT; diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql index ca68a5472a..242e7d42c6 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql @@ -4338,3 +4338,18 @@ ALTER TABLE `talert_special_days` DROP COLUMN `same_day`; ALTER TABLE `talert_special_days` ADD FOREIGN KEY (`id_calendar`) REFERENCES `talert_calendar`(`id`) ON DELETE CASCADE ON UPDATE CASCADE; UPDATE `tconfig` c1 JOIN (select count(*) as n FROM `tconfig` c2 WHERE (c2.`token` = "node_metaconsole" AND c2.`value` = 1) OR (c2.`token` = "centralized_management" AND c2.`value` = 1) ) v SET c1. `value` = 0 WHERE c1.token = "autocreate_remote_users" AND v.n = 2; + +-- ---------------------------------------------------------------------- +-- Table `tusuario` +-- ---------------------------------------------------------------------- +ALTER TABLE `tuser_double_auth` DROP FOREIGN KEY `tuser_double_auth_ibfk_1`, MODIFY `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tnotification_user` DROP FOREIGN KEY `tnotification_user_ibfk_2`, MODIFY `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tnotification_source_user` DROP FOREIGN KEY `tnotification_source_user_ibfk_2`, MODIFY `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tnotification_source_group_user` DROP FOREIGN KEY `tnotification_source_group_user_ibfk_2`, MODIFY `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tvisual_console_elements_cache` DROP FOREIGN KEY `tvisual_console_elements_cache_ibfk_3`, MODIFY `user_id` VARCHAR(255) DEFAULT NULL; +ALTER TABLE `tusuario` MODIFY `id_user` VARCHAR(255) NOT NULL DEFAULT '0'; +ALTER TABLE `tuser_double_auth` ADD CONSTRAINT `tuser_double_auth_ibfk_1` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE; +ALTER TABLE `tnotification_user` ADD CONSTRAINT `tnotification_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE `tnotification_source_user` ADD CONSTRAINT `tnotification_source_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE `tnotification_source_group_user` ADD CONSTRAINT `tnotification_source_group_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE `tvisual_console_elements_cache` ADD CONSTRAINT `tvisual_console_elements_cache_ibfk_3` FOREIGN KEY (`user_id`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 29ec6e572b..bb98a706e3 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -1260,7 +1260,7 @@ CREATE TABLE IF NOT EXISTS `tevent_filter` ( -- Table `tusuario` -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tusuario` ( - `id_user` VARCHAR(60) NOT NULL DEFAULT '0', + `id_user` VARCHAR(255) NOT NULL DEFAULT '0', `fullname` VARCHAR(255) NOT NULL, `firstname` VARCHAR(255) NOT NULL, `lastname` VARCHAR(255) NOT NULL, @@ -1328,7 +1328,7 @@ CREATE TABLE IF NOT EXISTS `tusuario_perfil` ( -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tuser_double_auth` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `id_user` VARCHAR(60) NOT NULL, + `id_user` VARCHAR(255) NOT NULL, `secret` VARCHAR(20) NOT NULL, PRIMARY KEY (`id`), UNIQUE (`id_user`), @@ -1388,7 +1388,7 @@ CREATE TABLE IF NOT EXISTS `tmensajes` ( -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tnotification_user` ( `id_mensaje` INT UNSIGNED NOT NULL, - `id_user` VARCHAR(60) NOT NULL, + `id_user` VARCHAR(255) NOT NULL, `utimestamp_read` BIGINT, `utimestamp_erased` BIGINT, `postpone` INT, @@ -1415,7 +1415,7 @@ CREATE TABLE IF NOT EXISTS `tnotification_group` ( -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tnotification_source_user` ( `id_source` BIGINT UNSIGNED NOT NULL, - `id_user` VARCHAR(60), + `id_user` VARCHAR(255), `enabled` INT DEFAULT NULL, `also_mail` INT DEFAULT NULL, PRIMARY KEY (`id_source`,`id_user`), @@ -1443,7 +1443,7 @@ CREATE TABLE IF NOT EXISTS `tnotification_source_group` ( CREATE TABLE IF NOT EXISTS `tnotification_source_group_user` ( `id_source` BIGINT UNSIGNED NOT NULL, `id_group` MEDIUMINT UNSIGNED NOT NULL, - `id_user` VARCHAR(60), + `id_user` VARCHAR(255), `enabled` INT DEFAULT NULL, `also_mail` INT DEFAULT NULL, PRIMARY KEY (`id_source`,`id_user`), @@ -3836,7 +3836,7 @@ CREATE TABLE IF NOT EXISTS `tvisual_console_elements_cache` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, `vc_id` INT UNSIGNED NOT NULL, `vc_item_id` INT UNSIGNED NOT NULL, - `user_id` VARCHAR(60) DEFAULT NULL, + `user_id` VARCHAR(255) DEFAULT NULL, `data` TEXT, `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, `expiration` INT UNSIGNED NOT NULL COMMENT 'Seconds to expire', From 0c9fdf8a18ea8cc14bb49d58bbacb89f89a1a317 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Fri, 3 Jun 2022 12:25:24 +0200 Subject: [PATCH 02/10] changed field max length --- pandora_console/godmode/users/configure_user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 669bdf4fdf..67a269bc66 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -860,7 +860,7 @@ if (!$new_user) { '', '', 20, - 100, + 255, !$new_user || $view_mode, '', [ From 12b0f5cda10b34ba065dbbf0941768e6a005691e Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Wed, 8 Jun 2022 11:49:48 +0200 Subject: [PATCH 03/10] database changes --- pandora_console/extras/mr/55.sql | 35 +++++++-- .../pandoradb_migrate_6.0_to_759.mysql.sql | 73 +++++++++++++++++++ pandora_console/pandoradb.sql | 46 ++++++------ 3 files changed, 125 insertions(+), 29 deletions(-) diff --git a/pandora_console/extras/mr/55.sql b/pandora_console/extras/mr/55.sql index f833cb0517..ea2d76070e 100644 --- a/pandora_console/extras/mr/55.sql +++ b/pandora_console/extras/mr/55.sql @@ -1,16 +1,39 @@ START TRANSACTION; -ALTER TABLE `tuser_double_auth` DROP FOREIGN KEY `tuser_double_auth_ibfk_1`, MODIFY `id_user` VARCHAR(255) NOT NULL; -ALTER TABLE `tnotification_user` DROP FOREIGN KEY `tnotification_user_ibfk_2`, MODIFY `id_user` VARCHAR(255) NOT NULL; -ALTER TABLE `tnotification_source_user` DROP FOREIGN KEY `tnotification_source_user_ibfk_2`, MODIFY `id_user` VARCHAR(255) NOT NULL; -ALTER TABLE `tnotification_source_group_user` DROP FOREIGN KEY `tnotification_source_group_user_ibfk_2`, MODIFY `id_user` VARCHAR(255) NOT NULL; -ALTER TABLE `tvisual_console_elements_cache` DROP FOREIGN KEY `tvisual_console_elements_cache_ibfk_3`, MODIFY `user_id` VARCHAR(255) DEFAULT NULL; -ALTER TABLE `tusuario` MODIFY `id_user` VARCHAR(255) NOT NULL DEFAULT '0'; +ALTER TABLE `tuser_double_auth` DROP FOREIGN KEY `tuser_double_auth_ibfk_1`, MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tnotification_user` DROP FOREIGN KEY `tnotification_user_ibfk_2`, MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tnotification_source_user` DROP FOREIGN KEY `tnotification_source_user_ibfk_2`, MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tnotification_source_group_user` DROP FOREIGN KEY `tnotification_source_group_user_ibfk_2`, MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tvisual_console_elements_cache` DROP FOREIGN KEY `tvisual_console_elements_cache_ibfk_3`, MODIFY COLUMN `user_id` VARCHAR(255) DEFAULT NULL; +ALTER TABLE `tusuario` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '0'; ALTER TABLE `tuser_double_auth` ADD CONSTRAINT `tuser_double_auth_ibfk_1` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE; ALTER TABLE `tnotification_user` ADD CONSTRAINT `tnotification_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `tnotification_source_user` ADD CONSTRAINT `tnotification_source_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `tnotification_source_group_user` ADD CONSTRAINT `tnotification_source_group_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `tvisual_console_elements_cache` ADD CONSTRAINT `tvisual_console_elements_cache_ibfk_3` FOREIGN KEY (`user_id`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `tservice` ADD COLUMN `enable_sunburst` tinyint(1) NOT NULL default 0; +ALTER TABLE `tattachment` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; +ALTER TABLE `tevento` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; +ALTER TABLE `tincidencia` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; +ALTER TABLE `tnota` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; +ALTER TABLE `tsesion` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; +ALTER TABLE `ttrap` MODIFY COLUMN `id_usuario` VARCHAR(255) DEFAULT ''; +ALTER TABLE `tusuario_perfil` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; +ALTER TABLE `treset_pass_history` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tmensajes` MODIFY COLUMN `id_usuario_origen` VARCHAR(255) NOT NULL DEFAULT ''; +ALTER TABLE `tgraph` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; +ALTER TABLE `treport` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; +ALTER TABLE `tplanned_downtime` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '0'; +ALTER TABLE `tnetwork_map` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tpassword_history` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; +ALTER TABLE `tupdate_journal` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; +ALTER TABLE `tmap` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; +ALTER TABLE `tdashboard` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; +ALTER TABLE `treport_template` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; +ALTER TABLE `tmetaconsole_event` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; +ALTER TABLE `tmetaconsole_event_history` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; +ALTER TABLE `treset_pass` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; +ALTER TABLE `tuser_task_scheduled` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; +ALTER TABLE `tbackup` MODIFY COLUMN `id_user` VARCHAR(255) DEFAULT ''; COMMIT; diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql index 242e7d42c6..df09c2b8e4 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql @@ -838,6 +838,8 @@ CREATE TABLE IF NOT EXISTS `treport_template` ( PRIMARY KEY(`id_report`) ) ENGINE = InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `treport_template` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; + -- ----------------------------------------------------- -- Table `treport_content_template` -- ----------------------------------------------------- @@ -1054,6 +1056,7 @@ ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_module_status_idx` (`module_stat ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_criticity_idx` (`criticity`); ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_agent_name_idx` (`agent_name`); ALTER TABLE `tmetaconsole_event` MODIFY `data` TINYTEXT default NULL; +ALTER TABLE `tmetaconsole_event` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; -- --------------------------------------------------------------------- -- Table `tmetaconsole_event_history` @@ -1104,6 +1107,8 @@ ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `data` double(50,5) default ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `module_status` int(4) NOT NULL default '0'; ALTER TABLE `tmetaconsole_event_history` ADD INDEX `tmeh_estado_idx` (`estado`); ALTER TABLE `tmetaconsole_event_history` ADD INDEX `tmeh_timestamp_idx` (`timestamp`); +ALTER TABLE `tmetaconsole_event_history` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; + -- --------------------------------------------------------------------- -- Table `textension_translate_string` -- --------------------------------------------------------------------- @@ -1454,6 +1459,7 @@ ALTER TABLE `talert_commands` MODIFY COLUMN `id_group` mediumint(8) unsigned NUL -- Table `tmap` -- --------------------------------------------------------------------- ALTER TABLE `tmap` MODIFY COLUMN `id_user` varchar(250) NOT NULL DEFAULT ''; +ALTER TABLE `tmap` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; -- --------------------------------------------------------------------- -- Table `ttag` @@ -1749,6 +1755,7 @@ ALTER TABLE tgraph ADD COLUMN `average_series` tinyint(1) UNSIGNED NOT NULL def ALTER TABLE tgraph ADD COLUMN `modules_series` tinyint(1) UNSIGNED NOT NULL default '0'; ALTER TABLE tgraph ADD COLUMN `fullscale` tinyint(1) UNSIGNED NOT NULL default '0'; ALTER TABLE `tgraph` MODIFY COLUMN `percentil` tinyint(1) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `tgraph` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; -- --------------------------------------------------------------------- -- Table `tnetflow_filter` @@ -1952,6 +1959,8 @@ CREATE TABLE IF NOT EXISTS `treset_pass_history` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `treset_pass_history` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; + -- --------------------------------------------------------------------- -- Table `tcontainer_item` -- --------------------------------------------------------------------- @@ -1978,6 +1987,9 @@ CREATE TABLE IF NOT EXISTS `tcontainer_item` ( ALTER TABLE tusuario add default_event_filter int(10) unsigned NOT NULL DEFAULT 0; +-- --------------------------------------------------------------------- +-- Table `treset_pass` +-- --------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `treset_pass` ( `id` bigint(10) unsigned NOT NULL auto_increment, `id_user` varchar(100) NOT NULL default '', @@ -1986,6 +1998,8 @@ CREATE TABLE IF NOT EXISTS `treset_pass` ( PRIMARY KEY (`id`) )ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `treset_pass` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; + UPDATE tgis_map_connection SET conection_data = '{"type":"OSM","url":"http://tile.openstreetmap.org/${z}/${x}/${y}.png"}' where id_tmap_connection = 1; ALTER TABLE tpolicy_modules MODIFY post_process double(24,15) default 0; @@ -2047,6 +2061,7 @@ INSERT INTO `ttipo_modulo` VALUES -- Table `tdashboard` -- --------------------------------------------------------------------- ALTER TABLE `tdashboard` ADD COLUMN `cells_slideshow` TINYINT(1) NOT NULL default 0; +ALTER TABLE `tdashboard` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; -- --------------------------------------------------------------------- -- Table `tsnmp_filter` @@ -2356,6 +2371,7 @@ ALTER TABLE `treport` ADD COLUMN `orientation` varchar(25) NOT NULL default 'ver ALTER TABLE `treport` MODIFY COLUMN `hidden` tinyint(1) NULL DEFAULT '0' AFTER `non_interactive`; ALTER TABLE `treport` ADD COLUMN `cover_page_render` tinyint(1) NOT NULL DEFAULT 1; ALTER TABLE `treport` ADD COLUMN `index_render` tinyint(1) NOT NULL DEFAULT 1; +ALTER TABLE `treport` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; ALTER TABLE `trecon_task` ADD COLUMN `snmp_version` varchar(5) NOT NULL default '1'; ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_user` varchar(255) NOT NULL default ''; @@ -2393,6 +2409,8 @@ ALTER TABLE `tevento` ADD COLUMN `module_status` int(4) NOT NULL default '0'; ALTER TABLE `tevento` MODIFY `data` TINYTEXT default NULL; +ALTER TABLE `tevento` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; + -- --------------------------------------------------------------------- -- Table `tevent_extended` -- --------------------------------------------------------------------- @@ -2462,6 +2480,8 @@ CREATE TABLE IF NOT EXISTS `tuser_task_scheduled` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `tuser_task_scheduled` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; + -- ----------------------------------------------------- -- Table `tnotification_source` -- ----------------------------------------------------- @@ -2501,6 +2521,8 @@ ALTER TABLE `tmensajes` ADD CONSTRAINT `tsource_fk` FOREIGN KEY (`id_source`) RE ALTER TABLE `tmensajes` DROP COLUMN `id_usuario_destino`, ADD UNIQUE INDEX `id_mensaje` (`id_mensaje`); +ALTER TABLE `tmensajes` MODIFY COLUMN `id_usuario_origen` VARCHAR(255) NOT NULL DEFAULT ''; + -- ---------------------------------------------------------------------- -- Table `tnotification_user` -- ---------------------------------------------------------------------- @@ -2796,6 +2818,7 @@ UPDATE `trecon_script` SET `description`='Specific Pandora FMS In -- Table `tusuario_perfil` -- --------------------------------------------------------------------- ALTER TABLE `tusuario_perfil` MODIFY COLUMN `no_hierarchy` tinyint(1) NOT NULL DEFAULT '0'; +ALTER TABLE `tusuario_perfil` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; -- Extra tnetwork_component @@ -4353,3 +4376,53 @@ ALTER TABLE `tnotification_user` ADD CONSTRAINT `tnotification_user_ibfk_2` FORE ALTER TABLE `tnotification_source_user` ADD CONSTRAINT `tnotification_source_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `tnotification_source_group_user` ADD CONSTRAINT `tnotification_source_group_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `tvisual_console_elements_cache` ADD CONSTRAINT `tvisual_console_elements_cache_ibfk_3` FOREIGN KEY (`user_id`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- ---------------------------------------------------------------------- +-- Table `tattachment` +-- ---------------------------------------------------------------------- +ALTER TABLE `tattachment` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; + +-- ---------------------------------------------------------------------- +-- Table `tincidencia` +-- ---------------------------------------------------------------------- +ALTER TABLE `tincidencia` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; + +-- ---------------------------------------------------------------------- +-- Table `tnota` +-- ---------------------------------------------------------------------- +ALTER TABLE `tnota` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; + +-- ---------------------------------------------------------------------- +-- Table `tsesion` +-- ---------------------------------------------------------------------- +ALTER TABLE `tsesion` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; + +-- ---------------------------------------------------------------------- +-- Table `ttrap` +-- ---------------------------------------------------------------------- +ALTER TABLE `ttrap` MODIFY COLUMN `id_usuario` VARCHAR(255) DEFAULT ''; + +-- ---------------------------------------------------------------------- +-- Table `tplanned_downtime` +-- ---------------------------------------------------------------------- +ALTER TABLE `tplanned_downtime` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '0'; + +-- ---------------------------------------------------------------------- +-- Table `tnetwork_map` +-- ---------------------------------------------------------------------- +ALTER TABLE `tnetwork_map` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; + +-- ---------------------------------------------------------------------- +-- Table `tpassword_history` +-- ---------------------------------------------------------------------- +ALTER TABLE `tpassword_history` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; + +-- ---------------------------------------------------------------------- +-- Table `tupdate_journal` +-- ---------------------------------------------------------------------- +ALTER TABLE `tupdate_journal` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; + +-- ---------------------------------------------------------------------- +-- Table `tbackup` +-- ---------------------------------------------------------------------- +ALTER TABLE `tbackup` MODIFY COLUMN `id_user` VARCHAR(255) DEFAULT ''; diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 9bdad4af90..08a43d2979 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -616,7 +616,7 @@ CREATE TABLE IF NOT EXISTS `talert_execution_queue` ( CREATE TABLE IF NOT EXISTS `tattachment` ( `id_attachment` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_incidencia` INT UNSIGNED NOT NULL DEFAULT 0, - `id_usuario` VARCHAR(60) NOT NULL DEFAULT '', + `id_usuario` VARCHAR(255) NOT NULL DEFAULT '', `filename` VARCHAR(255) NOT NULL DEFAULT '', `description` VARCHAR(150) DEFAULT '', `size` BIGINT UNSIGNED NOT NULL DEFAULT 0, @@ -689,7 +689,7 @@ CREATE TABLE IF NOT EXISTS `tcontainer_item` ( CREATE TABLE IF NOT EXISTS `tevento` ( `id_evento` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, `id_agente` INT NOT NULL DEFAULT 0, - `id_usuario` VARCHAR(100) NOT NULL DEFAULT '0', + `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0', `id_grupo` MEDIUMINT NOT NULL DEFAULT 0, `estado` TINYINT UNSIGNED NOT NULL DEFAULT 0, `timestamp` DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00', @@ -779,7 +779,7 @@ CREATE TABLE IF NOT EXISTS `tincidencia` ( `cierre` DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00', `titulo` TEXT, `descripcion` TEXT, - `id_usuario` VARCHAR(60) NOT NULL DEFAULT '', + `id_usuario` VARCHAR(255) NOT NULL DEFAULT '', `origen` VARCHAR(100) NOT NULL DEFAULT '', `estado` INT NOT NULL DEFAULT 0, `prioridad` INT NOT NULL DEFAULT 0, @@ -1059,7 +1059,7 @@ CREATE TABLE IF NOT EXISTS `tnetwork_profile_pen` ( CREATE TABLE IF NOT EXISTS `tnota` ( `id_nota` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, `id_incident` BIGINT UNSIGNED NOT NULL, - `id_usuario` VARCHAR(100) NOT NULL DEFAULT '0', + `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0', `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `nota` MEDIUMTEXT, PRIMARY KEY (`id_nota`), @@ -1172,7 +1172,7 @@ CREATE TABLE IF NOT EXISTS `tserver` ( -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tsesion` ( `id_sesion` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, - `id_usuario` VARCHAR(60) NOT NULL DEFAULT '0', + `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0', `ip_origen` VARCHAR(100) NOT NULL DEFAULT '', `accion` VARCHAR(100) NOT NULL DEFAULT '', `descripcion` TEXT, @@ -1208,7 +1208,7 @@ CREATE TABLE IF NOT EXISTS `ttrap` ( `value_custom` TEXT, `alerted` SMALLINT NOT NULL DEFAULT 0, `status` SMALLINT NOT NULL DEFAULT 0, - `id_usuario` VARCHAR(150) DEFAULT '', + `id_usuario` VARCHAR(255) DEFAULT '', `timestamp` DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00', `priority` TINYINT UNSIGNED NOT NULL DEFAULT 2, `text` VARCHAR(255) DEFAULT '', @@ -1313,7 +1313,7 @@ CREATE TABLE IF NOT EXISTS `tusuario` ( -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tusuario_perfil` ( `id_up` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, - `id_usuario` VARCHAR(100) NOT NULL DEFAULT '', + `id_usuario` VARCHAR(255) NOT NULL DEFAULT '', `id_perfil` INT UNSIGNED NOT NULL DEFAULT 0, `id_grupo` INT NOT NULL DEFAULT 0, `no_hierarchy` TINYINT NOT NULL DEFAULT 0, @@ -1340,7 +1340,7 @@ CREATE TABLE IF NOT EXISTS `tuser_double_auth` ( -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `treset_pass_history` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `id_user` VARCHAR(60) NOT NULL, + `id_user` VARCHAR(255) NOT NULL, `reset_moment` DATETIME NOT NULL, `success` TINYINT NOT NULL, PRIMARY KEY (`id`) @@ -1366,7 +1366,7 @@ CREATE TABLE IF NOT EXISTS `tnotification_source` ( -- ----------------------------------------------------- CREATE TABLE IF NOT EXISTS `tmensajes` ( `id_mensaje` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `id_usuario_origen` VARCHAR(60) NOT NULL DEFAULT '', + `id_usuario_origen` VARCHAR(255) NOT NULL DEFAULT '', `mensaje` TEXT, `timestamp` BIGINT UNSIGNED NOT NULL DEFAULT 0, `subject` VARCHAR(255) NOT NULL DEFAULT '', @@ -1476,7 +1476,7 @@ CREATE TABLE IF NOT EXISTS `tnews` ( -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tgraph` ( `id_graph` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `id_user` VARCHAR(100) NOT NULL DEFAULT '', + `id_user` VARCHAR(255) NOT NULL DEFAULT '', `name` VARCHAR(150) NOT NULL DEFAULT '', `description` TEXT, `period` INT NOT NULL DEFAULT 0, @@ -1514,7 +1514,7 @@ CREATE TABLE IF NOT EXISTS `tgraph_source` ( -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `treport` ( `id_report` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `id_user` VARCHAR(100) NOT NULL DEFAULT '', + `id_user` VARCHAR(255) NOT NULL DEFAULT '', `name` VARCHAR(150) NOT NULL DEFAULT '', `description` TEXT, `private` TINYINT UNSIGNED NOT NULL DEFAULT 0, @@ -1813,7 +1813,7 @@ CREATE TABLE IF NOT EXISTS `tplanned_downtime` ( `type_downtime` VARCHAR(100) NOT NULL DEFAULT 'disabled_agents_alerts', `type_execution` VARCHAR(100) NOT NULL DEFAULT 'once', `type_periodicity` VARCHAR(100) NOT NULL DEFAULT 'weekly', - `id_user` VARCHAR(100) NOT NULL DEFAULT '0', + `id_user` VARCHAR(255) NOT NULL DEFAULT '0', PRIMARY KEY ( `id` ) ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; @@ -2036,7 +2036,7 @@ CREATE TABLE IF NOT EXISTS `tgroup_stat` ( -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tnetwork_map` ( `id_networkmap` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `id_user` VARCHAR(60) NOT NULL, + `id_user` VARCHAR(255) NOT NULL, `name` VARCHAR(100) NOT NULL, `type` VARCHAR(20) NOT NULL, `layout` VARCHAR(20) NOT NULL, @@ -2196,7 +2196,7 @@ CREATE TABLE IF NOT EXISTS `tnetflow_report_content` ( -- --------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tpassword_history` ( `id_pass` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `id_user` VARCHAR(60) NOT NULL, + `id_user` VARCHAR(255) NOT NULL, `password` VARCHAR(45) DEFAULT NULL, `date_begin` DATETIME, `date_end` DATETIME, @@ -2249,7 +2249,7 @@ CREATE TABLE `tupdate_journal` ( `version` VARCHAR(25) DEFAULT '', `type` VARCHAR(25) DEFAULT '', `origin` VARCHAR(25) DEFAULT '', - `id_user` VARCHAR(250) NOT NULL DEFAULT '' + `id_user` VARCHAR(255) NOT NULL DEFAULT '' ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; -- --------------------------------------------------------------------- @@ -2298,7 +2298,7 @@ CREATE TABLE IF NOT EXISTS `tsessions_php` ( CREATE TABLE IF NOT EXISTS `tmap` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_group` INT UNSIGNED NOT NULL DEFAULT 0, - `id_user` VARCHAR(250) NOT NULL DEFAULT '', + `id_user` VARCHAR(255) NOT NULL DEFAULT '', `type` INT UNSIGNED NOT NULL DEFAULT 0, `subtype` INT UNSIGNED NOT NULL DEFAULT 0, `name` VARCHAR(250) DEFAULT '', @@ -2579,7 +2579,7 @@ CREATE TABLE IF NOT EXISTS `tpolicy_group_agents` ( CREATE TABLE IF NOT EXISTS `tdashboard` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, `name` VARCHAR(60) NOT NULL DEFAULT '', - `id_user` VARCHAR(60) NOT NULL DEFAULT '', + `id_user` VARCHAR(255) NOT NULL DEFAULT '', `id_group` INT NOT NULL DEFAULT 0, `active` TINYINT NOT NULL DEFAULT 0, `cells` INT UNSIGNED DEFAULT 0, @@ -3128,7 +3128,7 @@ CREATE TABLE IF NOT EXISTS `tnetworkmap_ent_rel_nodes` ( -- ----------------------------------------------------- CREATE TABLE IF NOT EXISTS `treport_template` ( `id_report` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `id_user` VARCHAR(100) NOT NULL DEFAULT '', + `id_user` VARCHAR(255) NOT NULL DEFAULT '', `name` VARCHAR(150) NOT NULL DEFAULT '', `description` TEXT, `private` TINYINT UNSIGNED NOT NULL DEFAULT 0, @@ -3297,7 +3297,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event` ( `id_source_event` BIGINT UNSIGNED NOT NULL, `id_agente` INT NOT NULL DEFAULT 0, `agent_name` VARCHAR(600) NOT NULL DEFAULT '', - `id_usuario` VARCHAR(100) NOT NULL DEFAULT '0', + `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0', `id_grupo` MEDIUMINT NOT NULL DEFAULT 0, `group_name` VARCHAR(100) NOT NULL DEFAULT '', `estado` TINYINT UNSIGNED NOT NULL DEFAULT 0, @@ -3349,7 +3349,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event_history` ( `id_source_event` BIGINT UNSIGNED NOT NULL, `id_agente` INT NOT NULL DEFAULT 0, `agent_name` VARCHAR(600) NOT NULL DEFAULT '', - `id_usuario` VARCHAR(100) NOT NULL DEFAULT '0', + `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0', `id_grupo` MEDIUMINT NOT NULL DEFAULT 0, `group_name` VARCHAR(100) NOT NULL DEFAULT '', `estado` TINYINT UNSIGNED NOT NULL DEFAULT 0, @@ -3513,7 +3513,7 @@ CREATE TABLE IF NOT EXISTS `tphase`( CREATE TABLE IF NOT EXISTS `treset_pass` ( `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, - `id_user` VARCHAR(100) NOT NULL DEFAULT '', + `id_user` VARCHAR(255) NOT NULL DEFAULT '', `cod_hash` VARCHAR(100) NOT NULL DEFAULT '', `reset_time` INT UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) @@ -3818,7 +3818,7 @@ CREATE TABLE IF NOT EXISTS `tuser_task` ( -- --------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tuser_task_scheduled` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `id_usuario` VARCHAR(60) NOT NULL DEFAULT '0', + `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0', `id_user_task` INT UNSIGNED NOT NULL DEFAULT 0, `args` TEXT, `scheduled` ENUM('no','hourly','daily','weekly','monthly','yearly','custom') DEFAULT 'no', @@ -4217,7 +4217,7 @@ CREATE TABLE IF NOT EXISTS `tbackup` ( `id` SERIAL, `utimestamp` BIGINT DEFAULT 0, `filename` VARCHAR(512) DEFAULT '', - `id_user` VARCHAR(60) DEFAULT '', + `id_user` VARCHAR(255) DEFAULT '', `description` MEDIUMTEXT, `pid` INT UNSIGNED DEFAULT 0, `filepath` VARCHAR(512) DEFAULT '', From a5517a9c0243cafe8a3ff9aaae7a71f94b866d02 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Thu, 9 Jun 2022 15:12:05 +0200 Subject: [PATCH 04/10] #9134 Added disabled --- pandora_console/pandoradb.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index ebd940c749..6da9fd470b 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -3664,7 +3664,7 @@ CREATE TABLE IF NOT EXISTS `tautoconfig` ( `name` VARCHAR(100) NOT NULL, `order` INT NOT NULL DEFAULT 0, `description` TEXT, - + `disabled` TINYINT DEFAULT 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; From 519fd13299b4a2ba96d09ce6d5c08b7fce681b97 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Thu, 9 Jun 2022 15:22:14 +0200 Subject: [PATCH 05/10] #9134 Added dsiabled in mr --- pandora_console/extras/mr/55.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pandora_console/extras/mr/55.sql b/pandora_console/extras/mr/55.sql index f53133c456..b802aa2dd8 100644 --- a/pandora_console/extras/mr/55.sql +++ b/pandora_console/extras/mr/55.sql @@ -4,4 +4,14 @@ ALTER TABLE `tservice` ADD COLUMN `enable_sunburst` tinyint(1) NOT NULL default ALTER TABLE `tdashboard` MODIFY `name` TEXT NOT NULL DEFAULT ''; +SET @st_oum763 = (SELECT IF( + (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = 'tautoconfig' AND table_schema = DATABASE() AND column_name = 'disabled') > 0, + "SELECT 1", + "ALTER TABLE `tautoconfig` ADD COLUMN `disabled` TINYINT DEFAULT 0" +)); + +PREPARE pr_oum763 FROM @st_oum763; +EXECUTE pr_oum763; +DEALLOCATE PREPARE pr_oum763; + COMMIT; From c09d1334d6297408fd6ccd5327d712af86cf3baa Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Tue, 14 Jun 2022 10:05:05 +0200 Subject: [PATCH 06/10] revert migrate file --- .../pandoradb_migrate_6.0_to_759.mysql.sql | 73 ------------------- 1 file changed, 73 deletions(-) diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql index df09c2b8e4..242e7d42c6 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql @@ -838,8 +838,6 @@ CREATE TABLE IF NOT EXISTS `treport_template` ( PRIMARY KEY(`id_report`) ) ENGINE = InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `treport_template` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; - -- ----------------------------------------------------- -- Table `treport_content_template` -- ----------------------------------------------------- @@ -1056,7 +1054,6 @@ ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_module_status_idx` (`module_stat ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_criticity_idx` (`criticity`); ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_agent_name_idx` (`agent_name`); ALTER TABLE `tmetaconsole_event` MODIFY `data` TINYTEXT default NULL; -ALTER TABLE `tmetaconsole_event` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; -- --------------------------------------------------------------------- -- Table `tmetaconsole_event_history` @@ -1107,8 +1104,6 @@ ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `data` double(50,5) default ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `module_status` int(4) NOT NULL default '0'; ALTER TABLE `tmetaconsole_event_history` ADD INDEX `tmeh_estado_idx` (`estado`); ALTER TABLE `tmetaconsole_event_history` ADD INDEX `tmeh_timestamp_idx` (`timestamp`); -ALTER TABLE `tmetaconsole_event_history` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; - -- --------------------------------------------------------------------- -- Table `textension_translate_string` -- --------------------------------------------------------------------- @@ -1459,7 +1454,6 @@ ALTER TABLE `talert_commands` MODIFY COLUMN `id_group` mediumint(8) unsigned NUL -- Table `tmap` -- --------------------------------------------------------------------- ALTER TABLE `tmap` MODIFY COLUMN `id_user` varchar(250) NOT NULL DEFAULT ''; -ALTER TABLE `tmap` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; -- --------------------------------------------------------------------- -- Table `ttag` @@ -1755,7 +1749,6 @@ ALTER TABLE tgraph ADD COLUMN `average_series` tinyint(1) UNSIGNED NOT NULL def ALTER TABLE tgraph ADD COLUMN `modules_series` tinyint(1) UNSIGNED NOT NULL default '0'; ALTER TABLE tgraph ADD COLUMN `fullscale` tinyint(1) UNSIGNED NOT NULL default '0'; ALTER TABLE `tgraph` MODIFY COLUMN `percentil` tinyint(1) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `tgraph` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; -- --------------------------------------------------------------------- -- Table `tnetflow_filter` @@ -1959,8 +1952,6 @@ CREATE TABLE IF NOT EXISTS `treset_pass_history` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `treset_pass_history` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; - -- --------------------------------------------------------------------- -- Table `tcontainer_item` -- --------------------------------------------------------------------- @@ -1987,9 +1978,6 @@ CREATE TABLE IF NOT EXISTS `tcontainer_item` ( ALTER TABLE tusuario add default_event_filter int(10) unsigned NOT NULL DEFAULT 0; --- --------------------------------------------------------------------- --- Table `treset_pass` --- --------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `treset_pass` ( `id` bigint(10) unsigned NOT NULL auto_increment, `id_user` varchar(100) NOT NULL default '', @@ -1998,8 +1986,6 @@ CREATE TABLE IF NOT EXISTS `treset_pass` ( PRIMARY KEY (`id`) )ENGINE=InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `treset_pass` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; - UPDATE tgis_map_connection SET conection_data = '{"type":"OSM","url":"http://tile.openstreetmap.org/${z}/${x}/${y}.png"}' where id_tmap_connection = 1; ALTER TABLE tpolicy_modules MODIFY post_process double(24,15) default 0; @@ -2061,7 +2047,6 @@ INSERT INTO `ttipo_modulo` VALUES -- Table `tdashboard` -- --------------------------------------------------------------------- ALTER TABLE `tdashboard` ADD COLUMN `cells_slideshow` TINYINT(1) NOT NULL default 0; -ALTER TABLE `tdashboard` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; -- --------------------------------------------------------------------- -- Table `tsnmp_filter` @@ -2371,7 +2356,6 @@ ALTER TABLE `treport` ADD COLUMN `orientation` varchar(25) NOT NULL default 'ver ALTER TABLE `treport` MODIFY COLUMN `hidden` tinyint(1) NULL DEFAULT '0' AFTER `non_interactive`; ALTER TABLE `treport` ADD COLUMN `cover_page_render` tinyint(1) NOT NULL DEFAULT 1; ALTER TABLE `treport` ADD COLUMN `index_render` tinyint(1) NOT NULL DEFAULT 1; -ALTER TABLE `treport` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; ALTER TABLE `trecon_task` ADD COLUMN `snmp_version` varchar(5) NOT NULL default '1'; ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_user` varchar(255) NOT NULL default ''; @@ -2409,8 +2393,6 @@ ALTER TABLE `tevento` ADD COLUMN `module_status` int(4) NOT NULL default '0'; ALTER TABLE `tevento` MODIFY `data` TINYTEXT default NULL; -ALTER TABLE `tevento` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; - -- --------------------------------------------------------------------- -- Table `tevent_extended` -- --------------------------------------------------------------------- @@ -2480,8 +2462,6 @@ CREATE TABLE IF NOT EXISTS `tuser_task_scheduled` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `tuser_task_scheduled` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; - -- ----------------------------------------------------- -- Table `tnotification_source` -- ----------------------------------------------------- @@ -2521,8 +2501,6 @@ ALTER TABLE `tmensajes` ADD CONSTRAINT `tsource_fk` FOREIGN KEY (`id_source`) RE ALTER TABLE `tmensajes` DROP COLUMN `id_usuario_destino`, ADD UNIQUE INDEX `id_mensaje` (`id_mensaje`); -ALTER TABLE `tmensajes` MODIFY COLUMN `id_usuario_origen` VARCHAR(255) NOT NULL DEFAULT ''; - -- ---------------------------------------------------------------------- -- Table `tnotification_user` -- ---------------------------------------------------------------------- @@ -2818,7 +2796,6 @@ UPDATE `trecon_script` SET `description`='Specific Pandora FMS In -- Table `tusuario_perfil` -- --------------------------------------------------------------------- ALTER TABLE `tusuario_perfil` MODIFY COLUMN `no_hierarchy` tinyint(1) NOT NULL DEFAULT '0'; -ALTER TABLE `tusuario_perfil` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; -- Extra tnetwork_component @@ -4376,53 +4353,3 @@ ALTER TABLE `tnotification_user` ADD CONSTRAINT `tnotification_user_ibfk_2` FORE ALTER TABLE `tnotification_source_user` ADD CONSTRAINT `tnotification_source_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `tnotification_source_group_user` ADD CONSTRAINT `tnotification_source_group_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `tvisual_console_elements_cache` ADD CONSTRAINT `tvisual_console_elements_cache_ibfk_3` FOREIGN KEY (`user_id`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; - --- ---------------------------------------------------------------------- --- Table `tattachment` --- ---------------------------------------------------------------------- -ALTER TABLE `tattachment` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; - --- ---------------------------------------------------------------------- --- Table `tincidencia` --- ---------------------------------------------------------------------- -ALTER TABLE `tincidencia` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; - --- ---------------------------------------------------------------------- --- Table `tnota` --- ---------------------------------------------------------------------- -ALTER TABLE `tnota` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; - --- ---------------------------------------------------------------------- --- Table `tsesion` --- ---------------------------------------------------------------------- -ALTER TABLE `tsesion` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; - --- ---------------------------------------------------------------------- --- Table `ttrap` --- ---------------------------------------------------------------------- -ALTER TABLE `ttrap` MODIFY COLUMN `id_usuario` VARCHAR(255) DEFAULT ''; - --- ---------------------------------------------------------------------- --- Table `tplanned_downtime` --- ---------------------------------------------------------------------- -ALTER TABLE `tplanned_downtime` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '0'; - --- ---------------------------------------------------------------------- --- Table `tnetwork_map` --- ---------------------------------------------------------------------- -ALTER TABLE `tnetwork_map` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; - --- ---------------------------------------------------------------------- --- Table `tpassword_history` --- ---------------------------------------------------------------------- -ALTER TABLE `tpassword_history` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; - --- ---------------------------------------------------------------------- --- Table `tupdate_journal` --- ---------------------------------------------------------------------- -ALTER TABLE `tupdate_journal` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; - --- ---------------------------------------------------------------------- --- Table `tbackup` --- ---------------------------------------------------------------------- -ALTER TABLE `tbackup` MODIFY COLUMN `id_user` VARCHAR(255) DEFAULT ''; From ac246aefb12573ec3af4d60820bd9b706d02d4ef Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Tue, 14 Jun 2022 10:06:28 +0200 Subject: [PATCH 07/10] revert migrate file --- .../pandoradb_migrate_6.0_to_759.mysql.sql | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql index 242e7d42c6..df09c2b8e4 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql @@ -838,6 +838,8 @@ CREATE TABLE IF NOT EXISTS `treport_template` ( PRIMARY KEY(`id_report`) ) ENGINE = InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `treport_template` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; + -- ----------------------------------------------------- -- Table `treport_content_template` -- ----------------------------------------------------- @@ -1054,6 +1056,7 @@ ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_module_status_idx` (`module_stat ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_criticity_idx` (`criticity`); ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_agent_name_idx` (`agent_name`); ALTER TABLE `tmetaconsole_event` MODIFY `data` TINYTEXT default NULL; +ALTER TABLE `tmetaconsole_event` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; -- --------------------------------------------------------------------- -- Table `tmetaconsole_event_history` @@ -1104,6 +1107,8 @@ ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `data` double(50,5) default ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `module_status` int(4) NOT NULL default '0'; ALTER TABLE `tmetaconsole_event_history` ADD INDEX `tmeh_estado_idx` (`estado`); ALTER TABLE `tmetaconsole_event_history` ADD INDEX `tmeh_timestamp_idx` (`timestamp`); +ALTER TABLE `tmetaconsole_event_history` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; + -- --------------------------------------------------------------------- -- Table `textension_translate_string` -- --------------------------------------------------------------------- @@ -1454,6 +1459,7 @@ ALTER TABLE `talert_commands` MODIFY COLUMN `id_group` mediumint(8) unsigned NUL -- Table `tmap` -- --------------------------------------------------------------------- ALTER TABLE `tmap` MODIFY COLUMN `id_user` varchar(250) NOT NULL DEFAULT ''; +ALTER TABLE `tmap` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; -- --------------------------------------------------------------------- -- Table `ttag` @@ -1749,6 +1755,7 @@ ALTER TABLE tgraph ADD COLUMN `average_series` tinyint(1) UNSIGNED NOT NULL def ALTER TABLE tgraph ADD COLUMN `modules_series` tinyint(1) UNSIGNED NOT NULL default '0'; ALTER TABLE tgraph ADD COLUMN `fullscale` tinyint(1) UNSIGNED NOT NULL default '0'; ALTER TABLE `tgraph` MODIFY COLUMN `percentil` tinyint(1) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE `tgraph` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; -- --------------------------------------------------------------------- -- Table `tnetflow_filter` @@ -1952,6 +1959,8 @@ CREATE TABLE IF NOT EXISTS `treset_pass_history` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `treset_pass_history` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; + -- --------------------------------------------------------------------- -- Table `tcontainer_item` -- --------------------------------------------------------------------- @@ -1978,6 +1987,9 @@ CREATE TABLE IF NOT EXISTS `tcontainer_item` ( ALTER TABLE tusuario add default_event_filter int(10) unsigned NOT NULL DEFAULT 0; +-- --------------------------------------------------------------------- +-- Table `treset_pass` +-- --------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `treset_pass` ( `id` bigint(10) unsigned NOT NULL auto_increment, `id_user` varchar(100) NOT NULL default '', @@ -1986,6 +1998,8 @@ CREATE TABLE IF NOT EXISTS `treset_pass` ( PRIMARY KEY (`id`) )ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `treset_pass` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; + UPDATE tgis_map_connection SET conection_data = '{"type":"OSM","url":"http://tile.openstreetmap.org/${z}/${x}/${y}.png"}' where id_tmap_connection = 1; ALTER TABLE tpolicy_modules MODIFY post_process double(24,15) default 0; @@ -2047,6 +2061,7 @@ INSERT INTO `ttipo_modulo` VALUES -- Table `tdashboard` -- --------------------------------------------------------------------- ALTER TABLE `tdashboard` ADD COLUMN `cells_slideshow` TINYINT(1) NOT NULL default 0; +ALTER TABLE `tdashboard` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; -- --------------------------------------------------------------------- -- Table `tsnmp_filter` @@ -2356,6 +2371,7 @@ ALTER TABLE `treport` ADD COLUMN `orientation` varchar(25) NOT NULL default 'ver ALTER TABLE `treport` MODIFY COLUMN `hidden` tinyint(1) NULL DEFAULT '0' AFTER `non_interactive`; ALTER TABLE `treport` ADD COLUMN `cover_page_render` tinyint(1) NOT NULL DEFAULT 1; ALTER TABLE `treport` ADD COLUMN `index_render` tinyint(1) NOT NULL DEFAULT 1; +ALTER TABLE `treport` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; ALTER TABLE `trecon_task` ADD COLUMN `snmp_version` varchar(5) NOT NULL default '1'; ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_user` varchar(255) NOT NULL default ''; @@ -2393,6 +2409,8 @@ ALTER TABLE `tevento` ADD COLUMN `module_status` int(4) NOT NULL default '0'; ALTER TABLE `tevento` MODIFY `data` TINYTEXT default NULL; +ALTER TABLE `tevento` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; + -- --------------------------------------------------------------------- -- Table `tevent_extended` -- --------------------------------------------------------------------- @@ -2462,6 +2480,8 @@ CREATE TABLE IF NOT EXISTS `tuser_task_scheduled` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `tuser_task_scheduled` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; + -- ----------------------------------------------------- -- Table `tnotification_source` -- ----------------------------------------------------- @@ -2501,6 +2521,8 @@ ALTER TABLE `tmensajes` ADD CONSTRAINT `tsource_fk` FOREIGN KEY (`id_source`) RE ALTER TABLE `tmensajes` DROP COLUMN `id_usuario_destino`, ADD UNIQUE INDEX `id_mensaje` (`id_mensaje`); +ALTER TABLE `tmensajes` MODIFY COLUMN `id_usuario_origen` VARCHAR(255) NOT NULL DEFAULT ''; + -- ---------------------------------------------------------------------- -- Table `tnotification_user` -- ---------------------------------------------------------------------- @@ -2796,6 +2818,7 @@ UPDATE `trecon_script` SET `description`='Specific Pandora FMS In -- Table `tusuario_perfil` -- --------------------------------------------------------------------- ALTER TABLE `tusuario_perfil` MODIFY COLUMN `no_hierarchy` tinyint(1) NOT NULL DEFAULT '0'; +ALTER TABLE `tusuario_perfil` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; -- Extra tnetwork_component @@ -4353,3 +4376,53 @@ ALTER TABLE `tnotification_user` ADD CONSTRAINT `tnotification_user_ibfk_2` FORE ALTER TABLE `tnotification_source_user` ADD CONSTRAINT `tnotification_source_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `tnotification_source_group_user` ADD CONSTRAINT `tnotification_source_group_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `tvisual_console_elements_cache` ADD CONSTRAINT `tvisual_console_elements_cache_ibfk_3` FOREIGN KEY (`user_id`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- ---------------------------------------------------------------------- +-- Table `tattachment` +-- ---------------------------------------------------------------------- +ALTER TABLE `tattachment` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; + +-- ---------------------------------------------------------------------- +-- Table `tincidencia` +-- ---------------------------------------------------------------------- +ALTER TABLE `tincidencia` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; + +-- ---------------------------------------------------------------------- +-- Table `tnota` +-- ---------------------------------------------------------------------- +ALTER TABLE `tnota` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; + +-- ---------------------------------------------------------------------- +-- Table `tsesion` +-- ---------------------------------------------------------------------- +ALTER TABLE `tsesion` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; + +-- ---------------------------------------------------------------------- +-- Table `ttrap` +-- ---------------------------------------------------------------------- +ALTER TABLE `ttrap` MODIFY COLUMN `id_usuario` VARCHAR(255) DEFAULT ''; + +-- ---------------------------------------------------------------------- +-- Table `tplanned_downtime` +-- ---------------------------------------------------------------------- +ALTER TABLE `tplanned_downtime` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '0'; + +-- ---------------------------------------------------------------------- +-- Table `tnetwork_map` +-- ---------------------------------------------------------------------- +ALTER TABLE `tnetwork_map` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; + +-- ---------------------------------------------------------------------- +-- Table `tpassword_history` +-- ---------------------------------------------------------------------- +ALTER TABLE `tpassword_history` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; + +-- ---------------------------------------------------------------------- +-- Table `tupdate_journal` +-- ---------------------------------------------------------------------- +ALTER TABLE `tupdate_journal` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; + +-- ---------------------------------------------------------------------- +-- Table `tbackup` +-- ---------------------------------------------------------------------- +ALTER TABLE `tbackup` MODIFY COLUMN `id_user` VARCHAR(255) DEFAULT ''; From 4d3d684eebf1ce170e7c0346f07d5bfb78ef136d Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Tue, 14 Jun 2022 10:15:15 +0200 Subject: [PATCH 08/10] revert migrate file --- .../pandoradb_migrate_6.0_to_759.mysql.sql | 73 ------------------- 1 file changed, 73 deletions(-) diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql index df09c2b8e4..242e7d42c6 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql @@ -838,8 +838,6 @@ CREATE TABLE IF NOT EXISTS `treport_template` ( PRIMARY KEY(`id_report`) ) ENGINE = InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `treport_template` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; - -- ----------------------------------------------------- -- Table `treport_content_template` -- ----------------------------------------------------- @@ -1056,7 +1054,6 @@ ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_module_status_idx` (`module_stat ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_criticity_idx` (`criticity`); ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_agent_name_idx` (`agent_name`); ALTER TABLE `tmetaconsole_event` MODIFY `data` TINYTEXT default NULL; -ALTER TABLE `tmetaconsole_event` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; -- --------------------------------------------------------------------- -- Table `tmetaconsole_event_history` @@ -1107,8 +1104,6 @@ ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `data` double(50,5) default ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `module_status` int(4) NOT NULL default '0'; ALTER TABLE `tmetaconsole_event_history` ADD INDEX `tmeh_estado_idx` (`estado`); ALTER TABLE `tmetaconsole_event_history` ADD INDEX `tmeh_timestamp_idx` (`timestamp`); -ALTER TABLE `tmetaconsole_event_history` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; - -- --------------------------------------------------------------------- -- Table `textension_translate_string` -- --------------------------------------------------------------------- @@ -1459,7 +1454,6 @@ ALTER TABLE `talert_commands` MODIFY COLUMN `id_group` mediumint(8) unsigned NUL -- Table `tmap` -- --------------------------------------------------------------------- ALTER TABLE `tmap` MODIFY COLUMN `id_user` varchar(250) NOT NULL DEFAULT ''; -ALTER TABLE `tmap` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; -- --------------------------------------------------------------------- -- Table `ttag` @@ -1755,7 +1749,6 @@ ALTER TABLE tgraph ADD COLUMN `average_series` tinyint(1) UNSIGNED NOT NULL def ALTER TABLE tgraph ADD COLUMN `modules_series` tinyint(1) UNSIGNED NOT NULL default '0'; ALTER TABLE tgraph ADD COLUMN `fullscale` tinyint(1) UNSIGNED NOT NULL default '0'; ALTER TABLE `tgraph` MODIFY COLUMN `percentil` tinyint(1) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `tgraph` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; -- --------------------------------------------------------------------- -- Table `tnetflow_filter` @@ -1959,8 +1952,6 @@ CREATE TABLE IF NOT EXISTS `treset_pass_history` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `treset_pass_history` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; - -- --------------------------------------------------------------------- -- Table `tcontainer_item` -- --------------------------------------------------------------------- @@ -1987,9 +1978,6 @@ CREATE TABLE IF NOT EXISTS `tcontainer_item` ( ALTER TABLE tusuario add default_event_filter int(10) unsigned NOT NULL DEFAULT 0; --- --------------------------------------------------------------------- --- Table `treset_pass` --- --------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `treset_pass` ( `id` bigint(10) unsigned NOT NULL auto_increment, `id_user` varchar(100) NOT NULL default '', @@ -1998,8 +1986,6 @@ CREATE TABLE IF NOT EXISTS `treset_pass` ( PRIMARY KEY (`id`) )ENGINE=InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `treset_pass` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; - UPDATE tgis_map_connection SET conection_data = '{"type":"OSM","url":"http://tile.openstreetmap.org/${z}/${x}/${y}.png"}' where id_tmap_connection = 1; ALTER TABLE tpolicy_modules MODIFY post_process double(24,15) default 0; @@ -2061,7 +2047,6 @@ INSERT INTO `ttipo_modulo` VALUES -- Table `tdashboard` -- --------------------------------------------------------------------- ALTER TABLE `tdashboard` ADD COLUMN `cells_slideshow` TINYINT(1) NOT NULL default 0; -ALTER TABLE `tdashboard` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; -- --------------------------------------------------------------------- -- Table `tsnmp_filter` @@ -2371,7 +2356,6 @@ ALTER TABLE `treport` ADD COLUMN `orientation` varchar(25) NOT NULL default 'ver ALTER TABLE `treport` MODIFY COLUMN `hidden` tinyint(1) NULL DEFAULT '0' AFTER `non_interactive`; ALTER TABLE `treport` ADD COLUMN `cover_page_render` tinyint(1) NOT NULL DEFAULT 1; ALTER TABLE `treport` ADD COLUMN `index_render` tinyint(1) NOT NULL DEFAULT 1; -ALTER TABLE `treport` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; ALTER TABLE `trecon_task` ADD COLUMN `snmp_version` varchar(5) NOT NULL default '1'; ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_user` varchar(255) NOT NULL default ''; @@ -2409,8 +2393,6 @@ ALTER TABLE `tevento` ADD COLUMN `module_status` int(4) NOT NULL default '0'; ALTER TABLE `tevento` MODIFY `data` TINYTEXT default NULL; -ALTER TABLE `tevento` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; - -- --------------------------------------------------------------------- -- Table `tevent_extended` -- --------------------------------------------------------------------- @@ -2480,8 +2462,6 @@ CREATE TABLE IF NOT EXISTS `tuser_task_scheduled` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `tuser_task_scheduled` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; - -- ----------------------------------------------------- -- Table `tnotification_source` -- ----------------------------------------------------- @@ -2521,8 +2501,6 @@ ALTER TABLE `tmensajes` ADD CONSTRAINT `tsource_fk` FOREIGN KEY (`id_source`) RE ALTER TABLE `tmensajes` DROP COLUMN `id_usuario_destino`, ADD UNIQUE INDEX `id_mensaje` (`id_mensaje`); -ALTER TABLE `tmensajes` MODIFY COLUMN `id_usuario_origen` VARCHAR(255) NOT NULL DEFAULT ''; - -- ---------------------------------------------------------------------- -- Table `tnotification_user` -- ---------------------------------------------------------------------- @@ -2818,7 +2796,6 @@ UPDATE `trecon_script` SET `description`='Specific Pandora FMS In -- Table `tusuario_perfil` -- --------------------------------------------------------------------- ALTER TABLE `tusuario_perfil` MODIFY COLUMN `no_hierarchy` tinyint(1) NOT NULL DEFAULT '0'; -ALTER TABLE `tusuario_perfil` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; -- Extra tnetwork_component @@ -4376,53 +4353,3 @@ ALTER TABLE `tnotification_user` ADD CONSTRAINT `tnotification_user_ibfk_2` FORE ALTER TABLE `tnotification_source_user` ADD CONSTRAINT `tnotification_source_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `tnotification_source_group_user` ADD CONSTRAINT `tnotification_source_group_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `tvisual_console_elements_cache` ADD CONSTRAINT `tvisual_console_elements_cache_ibfk_3` FOREIGN KEY (`user_id`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; - --- ---------------------------------------------------------------------- --- Table `tattachment` --- ---------------------------------------------------------------------- -ALTER TABLE `tattachment` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; - --- ---------------------------------------------------------------------- --- Table `tincidencia` --- ---------------------------------------------------------------------- -ALTER TABLE `tincidencia` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT ''; - --- ---------------------------------------------------------------------- --- Table `tnota` --- ---------------------------------------------------------------------- -ALTER TABLE `tnota` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; - --- ---------------------------------------------------------------------- --- Table `tsesion` --- ---------------------------------------------------------------------- -ALTER TABLE `tsesion` MODIFY COLUMN `id_usuario` VARCHAR(255) NOT NULL DEFAULT '0'; - --- ---------------------------------------------------------------------- --- Table `ttrap` --- ---------------------------------------------------------------------- -ALTER TABLE `ttrap` MODIFY COLUMN `id_usuario` VARCHAR(255) DEFAULT ''; - --- ---------------------------------------------------------------------- --- Table `tplanned_downtime` --- ---------------------------------------------------------------------- -ALTER TABLE `tplanned_downtime` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT '0'; - --- ---------------------------------------------------------------------- --- Table `tnetwork_map` --- ---------------------------------------------------------------------- -ALTER TABLE `tnetwork_map` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; - --- ---------------------------------------------------------------------- --- Table `tpassword_history` --- ---------------------------------------------------------------------- -ALTER TABLE `tpassword_history` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL; - --- ---------------------------------------------------------------------- --- Table `tupdate_journal` --- ---------------------------------------------------------------------- -ALTER TABLE `tupdate_journal` MODIFY COLUMN `id_user` VARCHAR(255) NOT NULL DEFAULT ''; - --- ---------------------------------------------------------------------- --- Table `tbackup` --- ---------------------------------------------------------------------- -ALTER TABLE `tbackup` MODIFY COLUMN `id_user` VARCHAR(255) DEFAULT ''; From ec7a2f89bd5fc9f72d65b69cdd0e88d54ddaba32 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Tue, 14 Jun 2022 10:17:43 +0200 Subject: [PATCH 09/10] revert migrate file --- .../extras/pandoradb_migrate_6.0_to_759.mysql.sql | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql index 242e7d42c6..ca68a5472a 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_759.mysql.sql @@ -4338,18 +4338,3 @@ ALTER TABLE `talert_special_days` DROP COLUMN `same_day`; ALTER TABLE `talert_special_days` ADD FOREIGN KEY (`id_calendar`) REFERENCES `talert_calendar`(`id`) ON DELETE CASCADE ON UPDATE CASCADE; UPDATE `tconfig` c1 JOIN (select count(*) as n FROM `tconfig` c2 WHERE (c2.`token` = "node_metaconsole" AND c2.`value` = 1) OR (c2.`token` = "centralized_management" AND c2.`value` = 1) ) v SET c1. `value` = 0 WHERE c1.token = "autocreate_remote_users" AND v.n = 2; - --- ---------------------------------------------------------------------- --- Table `tusuario` --- ---------------------------------------------------------------------- -ALTER TABLE `tuser_double_auth` DROP FOREIGN KEY `tuser_double_auth_ibfk_1`, MODIFY `id_user` VARCHAR(255) NOT NULL; -ALTER TABLE `tnotification_user` DROP FOREIGN KEY `tnotification_user_ibfk_2`, MODIFY `id_user` VARCHAR(255) NOT NULL; -ALTER TABLE `tnotification_source_user` DROP FOREIGN KEY `tnotification_source_user_ibfk_2`, MODIFY `id_user` VARCHAR(255) NOT NULL; -ALTER TABLE `tnotification_source_group_user` DROP FOREIGN KEY `tnotification_source_group_user_ibfk_2`, MODIFY `id_user` VARCHAR(255) NOT NULL; -ALTER TABLE `tvisual_console_elements_cache` DROP FOREIGN KEY `tvisual_console_elements_cache_ibfk_3`, MODIFY `user_id` VARCHAR(255) DEFAULT NULL; -ALTER TABLE `tusuario` MODIFY `id_user` VARCHAR(255) NOT NULL DEFAULT '0'; -ALTER TABLE `tuser_double_auth` ADD CONSTRAINT `tuser_double_auth_ibfk_1` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE; -ALTER TABLE `tnotification_user` ADD CONSTRAINT `tnotification_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; -ALTER TABLE `tnotification_source_user` ADD CONSTRAINT `tnotification_source_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; -ALTER TABLE `tnotification_source_group_user` ADD CONSTRAINT `tnotification_source_group_user_ibfk_2` FOREIGN KEY (`id_user`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; -ALTER TABLE `tvisual_console_elements_cache` ADD CONSTRAINT `tvisual_console_elements_cache_ibfk_3` FOREIGN KEY (`user_id`) REFERENCES `tusuario` (`id_user`) ON DELETE CASCADE ON UPDATE CASCADE; From 3ee1ba0bbcf07e7bc08ad06dce2538e71eb360ab Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 15 Jun 2022 01:00:16 +0200 Subject: [PATCH 10/10] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index ad4eead89a..119f59a1e4 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.762-220614 +Version: 7.0NG.762-220615 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 25a646be50..8c9841cbb7 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.762-220614" +pandora_version="7.0NG.762-220615" 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 8763ad999e..e3a83cec84 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1015,7 +1015,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.762'; -use constant AGENT_BUILD => '220614'; +use constant AGENT_BUILD => '220615'; # 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 3dec167453..03414f5138 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.762 -%define release 220614 +%define release 220615 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 1249b8e6e7..ce161155b3 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.762 -%define release 220614 +%define release 220615 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 07f0a9babf..88b55738c5 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.762" -PI_BUILD="220614" +PI_BUILD="220615" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 4d65f05a32..4a81e3c2a7 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{220614} +{220615} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 6a4d7782f9..490ac8919b 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.762 Build 220614") +#define PANDORA_VERSION ("7.0NG.762 Build 220615") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index ca70a5662b..695cb556d0 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.762(Build 220614))" + VALUE "ProductVersion", "(7.0NG.762(Build 220615))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 28ad21f54e..51e17e0701 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.762-220614 +Version: 7.0NG.762-220615 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 af4c21ef4e..558ea0017b 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.762-220614" +pandora_version="7.0NG.762-220615" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index b7d03fe4f4..9823d14fe5 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC220614'; +$build_version = 'PC220615'; $pandora_version = 'v7.0NG.762'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 6b3aeef58f..07c51d5494 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 1b5ebbdc00..5c4d09f07f 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.762 -%define release 220614 +%define release 220615 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 785b404cb2..9dead83f81 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.762 -%define release 220614 +%define release 220615 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 5642aa9ec6..f7453e724d 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.762" -PI_BUILD="220614" +PI_BUILD="220615" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index c2cd3f5a11..d5ca16614c 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.762 Build 220614"; +my $version = "7.0NG.762 Build 220615"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index cffa3811ef..96ae2ece1a 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.762 Build 220614"; +my $version = "7.0NG.762 Build 220615"; # save program name for logging my $progname = basename($0);