diff --git a/pandora_console/extras/mr/52.sql b/pandora_console/extras/mr/52.sql index 7d8d1e6e72..9dc96b0ccc 100644 --- a/pandora_console/extras/mr/52.sql +++ b/pandora_console/extras/mr/52.sql @@ -2,8 +2,8 @@ START TRANSACTION; ALTER TABLE `tpolicy_queue` MODIFY COLUMN `progress` int(10) NOT NULL default '0'; CREATE INDEX `IDX_tservice_element` ON `tservice_element`(`id_service`,`id_agente_modulo`); -ALTER TABLE `talert_templates` ADD COLUMN `schedule` TEXT DEFAULT NULL; -ALTER TABLE `tevent_alert` ADD COLUMN `schedule` TEXT DEFAULT NULL; +ALTER TABLE `talert_templates` ADD COLUMN `schedule` TEXT; +ALTER TABLE `tevent_alert` ADD COLUMN `schedule` TEXT; SOURCE procedures/alertTemplates.sql; CALL `migrateRanges`(); 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 d6db1ad76e..393ccae260 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 @@ -715,6 +715,7 @@ ALTER TABLE `tevent_alert` ADD COLUMN `id_template_conditions` int(10) unsigned ALTER TABLE `tevent_alert` ADD COLUMN `id_template_fields` int(10) unsigned NOT NULL default 0; ALTER TABLE `tevent_alert` ADD COLUMN `last_evaluation` bigint(20) NOT NULL default 0; ALTER TABLE `tevent_alert` ADD COLUMN `pool_occurrences` int unsigned not null default 0; +ALTER TABLE `tevent_alert` ADD COLUMN `schedule` TEXT; -- ----------------------------------------------------- -- Table `tevent_alert_action` @@ -1317,6 +1318,7 @@ ALTER TABLE talert_templates ADD COLUMN `field18_recovery` TEXT NOT NULL DEFAULT ALTER TABLE talert_templates ADD COLUMN `field19_recovery` TEXT NOT NULL DEFAULT ""; ALTER TABLE talert_templates ADD COLUMN `field20_recovery` TEXT NOT NULL DEFAULT ""; ALTER TABLE `talert_templates` ADD COLUMN `disable_event` tinyint(1) DEFAULT 0; +ALTER TABLE `talert_templates` ADD COLUMN `schedule` TEXT; -- --------------------------------------------------------------------- -- Table `talert_snmp` @@ -1451,13 +1453,13 @@ ALTER TABLE `ttag` MODIFY COLUMN `name` text NOT NULL default ''; INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30'); -INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 51); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 52); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png'); UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise'; -INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package', 759); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package', 760); INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp'); UPDATE `tconfig` SET `value` = 'mini_severity,evento,id_agente,estado,timestamp' WHERE `token` LIKE 'event_fields'; DELETE FROM `tconfig` WHERE `token` LIKE 'integria_api_password'; diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 13c630f54d..bb78f734b4 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -522,7 +522,7 @@ CREATE TABLE IF NOT EXISTS `talert_templates` ( `min_alerts_reset_counter` tinyint(1) default 0, `disable_event` tinyint(1) default 0, `previous_name` text, - `schedule` text default null, + `schedule` text, PRIMARY KEY (`id`), KEY `idx_template_action` (`id_alert_action`), FOREIGN KEY (`id_alert_action`) REFERENCES talert_actions(`id`) @@ -3051,7 +3051,7 @@ CREATE TABLE IF NOT EXISTS `tevent_alert` ( `id_template_fields` int(10) unsigned NOT NULL default 0, `last_evaluation` bigint(20) NOT NULL default 0, `pool_occurrences` int unsigned not null default 0, - `schedule` text default null, + `schedule` text, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 75ed1c2cb3..83a23072cf 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -109,10 +109,10 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_report_front_logo', 'images/pandora_logo_white.jpg'), ('custom_report_front_header', ''), ('custom_report_front_footer', ''), -('MR', 51), +('MR', 52), ('identification_reminder', 1), ('identification_reminder_timestamp', 0), -('current_package', 759), +('current_package', 760), ('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.00097656250000":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}'), ('custom_docs_logo', 'default_docs.png'), ('custom_support_logo', 'default_support.png'),