From 7514195572034dcb24d07a396c266a75335df40d Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Tue, 18 Apr 2023 15:56:50 +0200 Subject: [PATCH] #9771 added mr 63 --- pandora_console/extras/mr/63.sql | 42 ++++++++++++++++++++++++++++++ pandora_console/pandoradb.sql | 44 ++++++++++++++++++++++++++++++-- 2 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 pandora_console/extras/mr/63.sql diff --git a/pandora_console/extras/mr/63.sql b/pandora_console/extras/mr/63.sql new file mode 100644 index 0000000000..51e2dec838 --- /dev/null +++ b/pandora_console/extras/mr/63.sql @@ -0,0 +1,42 @@ +CREATE TABLE IF NOT EXISTS `tdiscovery_apps` ( + `id_app` int(10) auto_increment, + `short_name` varchar(250) NOT NULL DEFAULT '', + `name` varchar(250) NOT NULL DEFAULT '', + `section` varchar(250) NOT NULL DEFAULT 'custom', + `description` varchar(250) NOT NULL DEFAULT '', + `version` varchar(250) NOT NULL DEFAULT '', + PRIMARY KEY (`id_app`), + UNIQUE (`short_name`) +) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; + +CREATE TABLE IF NOT EXISTS `tdiscovery_apps_scripts` ( + `id_app` int(10), + `macro` varchar(250) NOT NULL DEFAULT '', + `value` text NOT NULL DEFAULT '', + PRIMARY KEY (`id_app`, `macro`), + FOREIGN KEY (`id_app`) REFERENCES tdiscovery_apps(`id_app`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; + +CREATE TABLE IF NOT EXISTS `tdiscovery_apps_executions` ( + `id` int(10) unsigned NOT NULL auto_increment, + `id_app` int(10), + `execution` text NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + FOREIGN KEY (`id_app`) REFERENCES tdiscovery_apps(`id_app`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; + +CREATE TABLE IF NOT EXISTS `tdiscovery_apps_tasks_macros` ( + `id_task` int(10) unsigned NOT NULL, + `macro` varchar(250) NOT NULL DEFAULT '', + `type` varchar(250) NOT NULL DEFAULT 'custom', + `value` text NOT NULL DEFAULT '', + `temp_conf` tinyint unsigned NOT NULL DEFAULT 0, + PRIMARY KEY (`id_task`, `macro`), + FOREIGN KEY (`id_task`) REFERENCES trecon_task(`id_rt`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; + + +ALTER TABLE `trecon_task` + ADD COLUMN `id_app` int(10), + ADD COLUMN `setup_complete` tinyint unsigned NOT NULL DEFAULT 0, + ADD FOREIGN KEY (`id_app`) REFERENCES tdiscovery_apps(`id_app`) ON DELETE CASCADE ON UPDATE CASCADE; diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 981b8a5ded..e4aa1b1143 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -830,6 +830,17 @@ CREATE TABLE IF NOT EXISTS `tmodule_group` ( PRIMARY KEY (`id_mg`) ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; +CREATE TABLE IF NOT EXISTS `tdiscovery_apps` ( + `id_app` int(10) auto_increment, + `short_name` varchar(250) NOT NULL DEFAULT '', + `name` varchar(250) NOT NULL DEFAULT '', + `section` varchar(250) NOT NULL DEFAULT 'custom', + `description` varchar(250) NOT NULL DEFAULT '', + `version` varchar(250) NOT NULL DEFAULT '', + PRIMARY KEY (`id_app`), + UNIQUE (`short_name`) +) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; + -- This table was moved cause the `tmodule_relationship` will add -- a foreign key for the trecon_task(id_rt) -- ---------------------------------------------------------------------- @@ -880,8 +891,11 @@ CREATE TABLE IF NOT EXISTS `trecon_task` ( `type` INT NOT NULL DEFAULT 0, `subnet_csv` TINYINT UNSIGNED DEFAULT 0, `snmp_skip_non_enabled_ifs` TINYINT UNSIGNED DEFAULT 1, + `id_app` int(10), + `setup_complete` tinyint unsigned NOT NULL DEFAULT 0, PRIMARY KEY (`id_rt`), - KEY `recon_task_daemon` (`id_recon_server`) + KEY `recon_task_daemon` (`id_recon_server`), + FOREIGN KEY (`id_app`) REFERENCES tdiscovery_apps(`id_app`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; -- ---------------------------------------------------------------------- @@ -4288,4 +4302,30 @@ CREATE TABLE IF NOT EXISTS `tfavmenu_user` ( `url` TEXT NOT NULL, `label` VARCHAR(255) NOT NULL, `section` VARCHAR(255) NOT NULL, - PRIMARY KEY (`id`)); \ No newline at end of file + PRIMARY KEY (`id`)); + +CREATE TABLE IF NOT EXISTS `tdiscovery_apps_scripts` ( + `id_app` int(10), + `macro` varchar(250) NOT NULL DEFAULT '', + `value` text NOT NULL DEFAULT '', + PRIMARY KEY (`id_app`, `macro`), + FOREIGN KEY (`id_app`) REFERENCES tdiscovery_apps(`id_app`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; + +CREATE TABLE IF NOT EXISTS `tdiscovery_apps_executions` ( + `id` int(10) unsigned NOT NULL auto_increment, + `id_app` int(10), + `execution` text NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + FOREIGN KEY (`id_app`) REFERENCES tdiscovery_apps(`id_app`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4; + +CREATE TABLE IF NOT EXISTS `tdiscovery_apps_tasks_macros` ( + `id_task` int(10) unsigned NOT NULL, + `macro` varchar(250) NOT NULL DEFAULT '', + `type` varchar(250) NOT NULL DEFAULT 'custom', + `value` text NOT NULL DEFAULT '', + `temp_conf` tinyint unsigned NOT NULL DEFAULT 0, + PRIMARY KEY (`id_task`, `macro`), + FOREIGN KEY (`id_task`) REFERENCES trecon_task(`id_rt`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;