From ba8087f49beab2457875792f0e12495f07930422 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 24 Nov 2021 22:01:21 +0100 Subject: [PATCH] ncm2 with schedules --- pandora_console/extras/mr/51.sql | 4 ++++ .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 11 +++++++---- pandora_console/pandoradb.sql | 11 +++++++---- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pandora_console/extras/mr/51.sql b/pandora_console/extras/mr/51.sql index 28bbcf243f..cf8e0968e1 100644 --- a/pandora_console/extras/mr/51.sql +++ b/pandora_console/extras/mr/51.sql @@ -5,6 +5,7 @@ CREATE TABLE IF NOT EXISTS `tncm_queue` ( `id_agent` INT(10) UNSIGNED NOT NULL, `id_script` BIGINT(20) UNSIGNED NOT NULL, `utimestamp` INT UNSIGNED NOT NULL, + `scheduled` INT UNSIGNED DEFAULT NULL, FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY (`id_script`) REFERENCES `tncm_script`(`id`) ON UPDATE CASCADE ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -25,6 +26,9 @@ CREATE TABLE IF NOT EXISTS `talert_calendar` ( UNIQUE (`name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `tncm_agent` ADD COLUMN `cron_interval` varchar(100) default '' AFTER `execute`; +ALTER TABLE `tncm_agent` ADD COLUMN `event_on_change` int unsigned default null AFTER `cron_interval`; + ALTER TABLE `talert_special_days` ADD COLUMN `id_calendar` int(10) unsigned NOT NULL DEFAULT 1; ALTER TABLE `talert_special_days` ADD COLUMN `day_code` tinyint(2) unsigned NOT NULL DEFAULT 0; ALTER TABLE `talert_special_days` DROP COLUMN `same_day`; diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index dec6f1ab0e..64a29e66a4 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -4174,6 +4174,8 @@ CREATE TABLE IF NOT EXISTS `tncm_agent` ( `id_template` bigint(20) unsigned, `execute_type` int(2) UNSIGNED NOT NULL default 0, `execute` int(2) UNSIGNED NOT NULL default 0, + `cron_interval` varchar(100) default '', + `event_on_change` int unsigned default null, `last_error` text, PRIMARY KEY (`id_agent`), FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) ON UPDATE CASCADE ON DELETE CASCADE, @@ -4200,12 +4202,13 @@ CREATE TABLE IF NOT EXISTS `tncm_agent_data` ( -- Table `tncm_queue` -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tncm_queue` ( - `id` SERIAL, + `id` SERIAL, `id_agent` INT(10) UNSIGNED NOT NULL, `id_script` BIGINT(20) UNSIGNED NOT NULL, - `utimestamp` INT UNSIGNED NOT NULL, + `utimestamp` INT UNSIGNED NOT NULL, + `scheduled` INT UNSIGNED DEFAULT NULL, FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) ON UPDATE CASCADE ON DELETE CASCADE, - FOREIGN KEY (`id_script`) REFERENCES `tncm_script`(`id`) ON UPDATE CASCADE ON DELETE CASCADE + FOREIGN KEY (`id_script`) REFERENCES `tncm_script`(`id`) ON UPDATE CASCADE ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- ---------------------------------------------------------------------- @@ -4214,7 +4217,7 @@ CREATE TABLE IF NOT EXISTS `tncm_queue` ( CREATE TABLE IF NOT EXISTS `tncm_snippet` ( `id` SERIAL, `name` TEXT, - `content` TEXT, + `content` TEXT, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 2a2f65f440..6f85ebf325 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -4124,6 +4124,8 @@ CREATE TABLE IF NOT EXISTS `tncm_agent` ( `id_template` bigint(20) unsigned, `execute_type` int(2) UNSIGNED NOT NULL default 0, `execute` int(2) UNSIGNED NOT NULL default 0, + `cron_interval` varchar(100) default '', + `event_on_change` int unsigned default null, `last_error` text, PRIMARY KEY (`id_agent`), FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) ON UPDATE CASCADE ON DELETE CASCADE, @@ -4150,12 +4152,13 @@ CREATE TABLE IF NOT EXISTS `tncm_agent_data` ( -- Table `tncm_queue` -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tncm_queue` ( - `id` SERIAL, + `id` SERIAL, `id_agent` INT(10) UNSIGNED NOT NULL, `id_script` BIGINT(20) UNSIGNED NOT NULL, - `utimestamp` INT UNSIGNED NOT NULL, + `utimestamp` INT UNSIGNED NOT NULL, + `scheduled` INT UNSIGNED DEFAULT NULL, FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) ON UPDATE CASCADE ON DELETE CASCADE, - FOREIGN KEY (`id_script`) REFERENCES `tncm_script`(`id`) ON UPDATE CASCADE ON DELETE CASCADE + FOREIGN KEY (`id_script`) REFERENCES `tncm_script`(`id`) ON UPDATE CASCADE ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- ---------------------------------------------------------------------- @@ -4164,6 +4167,6 @@ CREATE TABLE IF NOT EXISTS `tncm_queue` ( CREATE TABLE IF NOT EXISTS `tncm_snippet` ( `id` SERIAL, `name` TEXT, - `content` TEXT, + `content` TEXT, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8;