tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-7982-bug-en-edicion-de-correlacion-de-alertas' into 'develop'

Browse Source 
Ent 7982 bug en edicion de correlacion de alertas

See merge request
This commit is contained in:
Daniel Rodriguez 2021-09-22 12:32:23 +00:00
commit ea654fb323
3 changed files with 6 additions and 0 deletions

2
pandora_console/extras/mr/50.sql

@ -1,5 +1,7 @@
START TRANSACTION;
ALTER TABLE `tevent_alert` ADD COLUMN `id_template_conditions` int(10) unsigned NOT NULL default 0;
ALTER TABLE `tevent_alert` ADD COLUMN `id_template_fields` int(10) unsigned NOT NULL default 0;
ALTER TABLE `tevent_filter` ADD COLUMN `time_from` TIME NULL;
ALTER TABLE `tevent_filter` ADD COLUMN `time_to` TIME NULL;

2
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@ -710,6 +710,8 @@ CREATE TABLE IF NOT EXISTS `tevent_alert` (
ALTER TABLE `tevent_alert` ADD COLUMN `special_days` tinyint(1) default 0;
ALTER TABLE `tevent_alert` MODIFY COLUMN `time_threshold` int(10) NOT NULL default 86400;
ALTER TABLE `tevent_alert` ADD COLUMN `disable_event` tinyint(1) DEFAULT 0;
ALTER TABLE `tevent_alert` ADD COLUMN `id_template_conditions` int(10) unsigned NOT NULL default 0;
ALTER TABLE `tevent_alert` ADD COLUMN `id_template_fields` int(10) unsigned NOT NULL default 0;
-- -----------------------------------------------------
-- Table `tevent_alert_action`

2
pandora_console/pandoradb.sql

@ -3012,6 +3012,8 @@ CREATE TABLE IF NOT EXISTS `tevent_alert` (
`group_by` enum ('','id_agente','id_agentmodule','id_alert_am','id_grupo') default '',
`special_days` tinyint(1) default 0,
`disable_event` tinyint(1) default 0,
`id_template_conditions` int(10) unsigned NOT NULL default 0,
`id_template_fields` int(10) unsigned NOT NULL default 0,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;