From 3f4156162870a00669c0b56eeb15254396169e77 Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Fri, 29 Mar 2019 09:23:38 +0100 Subject: [PATCH 1/5] Added pandoradb.sql without output column in tnetflow_filter Former-commit-id: 7bb1ce608678dbbc192bf734515ce96caba25c66 --- pandora_console/pandoradb.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 0ecc9b8f5d..4aa8c0122c 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -1963,7 +1963,6 @@ CREATE TABLE IF NOT EXISTS `tnetflow_filter` ( `advanced_filter` TEXT NOT NULL, `filter_args` TEXT NOT NULL, `aggregate` varchar(60), - `output` varchar(60), PRIMARY KEY (`id_sg`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; From 7412a7cef0a07017bd3a623758d9e3d5bbeb77a0 Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Fri, 29 Mar 2019 13:37:12 +0100 Subject: [PATCH 2/5] change Former-commit-id: 47ccc5dce928453e1fac9c1036094e6a03c6cde7 --- pandora_console/pandoradb.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 4aa8c0122c..77c5ab9324 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -1989,7 +1989,7 @@ CREATE TABLE IF NOT EXISTS `tnetflow_report_content` ( `date` bigint(20) NOT NULL default '0', `period` int(11) NOT NULL default 0, `max` int (11) NOT NULL default 0, - `show_graph` varchar(60), + `show_graph` varchar(60) `order` int (11) NOT NULL default 0, PRIMARY KEY(`id_rc`), FOREIGN KEY (`id_report`) REFERENCES tnetflow_report(`id_report`) From b3c7a9fb4d28a73f89aecffec2845738b04e9a62 Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Fri, 29 Mar 2019 13:38:36 +0100 Subject: [PATCH 3/5] change Former-commit-id: 3fe44307ee0118db78b80a21d0aa209e709e0d7d --- pandora_console/pandoradb.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 77c5ab9324..4aa8c0122c 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -1989,7 +1989,7 @@ CREATE TABLE IF NOT EXISTS `tnetflow_report_content` ( `date` bigint(20) NOT NULL default '0', `period` int(11) NOT NULL default 0, `max` int (11) NOT NULL default 0, - `show_graph` varchar(60) + `show_graph` varchar(60), `order` int (11) NOT NULL default 0, PRIMARY KEY(`id_rc`), FOREIGN KEY (`id_report`) REFERENCES tnetflow_report(`id_report`) From 48c4eb9c01d4d518d9a06b82ac71d053e6b0b87b Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Fri, 29 Mar 2019 13:58:53 +0100 Subject: [PATCH 4/5] Add changes in migrate and 27.sql file Former-commit-id: 60c2e2f2dc9a78ff9fb236efe7ac57a288d3717a --- pandora_console/extras/mr/27.sql | 5 +++++ .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 pandora_console/extras/mr/27.sql diff --git a/pandora_console/extras/mr/27.sql b/pandora_console/extras/mr/27.sql new file mode 100644 index 0000000000..2ed92ecbaf --- /dev/null +++ b/pandora_console/extras/mr/27.sql @@ -0,0 +1,5 @@ +START TRANSACTION; + +ALTER TABLE tnetflow_filter DROP COLUMN output; + +COMMIT; 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 6e5e2ebcc9..276a984831 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 @@ -2058,3 +2058,5 @@ INSERT INTO `trecon_script` (`name`,`description`,`script`,`macros`) VALUES ('Di -- Add column in table `tagent_custom_fields` -- ---------------------------------------------------------------------- ALTER TABLE tagent_custom_fields ADD COLUMN `combo_values` VARCHAR(255) DEFAULT ''; +ALTER TABLE tnetflow_filter DROP COLUMN output; + From d3d5312f40202d582a865b099d815274cdbb7e40 Mon Sep 17 00:00:00 2001 From: Marcos Alconada Date: Mon, 15 Apr 2019 11:14:41 +0200 Subject: [PATCH 5/5] Update 27.sql Former-commit-id: 4e027274bb9edeb51dc64f935ddd3ee2bfd62d0d --- pandora_console/extras/mr/27.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/extras/mr/27.sql b/pandora_console/extras/mr/27.sql index aff9a5eeb9..d04e8da857 100644 --- a/pandora_console/extras/mr/27.sql +++ b/pandora_console/extras/mr/27.sql @@ -2,7 +2,6 @@ START TRANSACTION; ALTER TABLE `tnetflow_filter` DROP COLUMN `output`; -COMMIT; ALTER TABLE `tagente_modulo` ADD COLUMN `ff_type` tinyint(1) unsigned default '0'; ALTER TABLE `tnetwork_component` ADD COLUMN `ff_type` tinyint(1) unsigned default '0'; ALTER TABLE `tlocal_component` ADD COLUMN `ff_type` tinyint(1) unsigned default '0';