Merge branch 'fix/mr26' into 'develop'

fix mr 26

See merge request artica/pandorafms!2306

Former-commit-id: d90f41df35dfbe7655af56648ca40ec9e9b3cc43
This commit is contained in:
fbsanchez 2019-03-27 17:57:24 +01:00
commit c85a84673f
1 changed files with 2 additions and 1 deletions

View File

@ -12,11 +12,12 @@ CREATE TABLE IF NOT EXISTS `tnetwork_matrix` (
) ENGINE = InnoDB DEFAULT CHARSET=utf8 ;
ALTER TABLE `treport_content` ADD COLUMN `show_extended_events` tinyint(1) default '0';
UPDATE `treport_content` SET type="netflow_summary" WHERE type="netflow_pie" OR type="netflow_statistics";
UPDATE `tnetflow_filter` SET aggregate="dstip" WHERE aggregate NOT IN ("dstip", "srcip", "dstport", "srcport");
ALTER TABLE `treport_content` ADD COLUMN `show_extended_events` tinyint(1) default '0';
ALTER TABLE tagent_custom_fields ADD COLUMN `combo_values` VARCHAR(255) DEFAULT '';
ALTER TABLE `trecon_task` ADD COLUMN `summary` text;