Merge branch 'ent-3790-sobra-una-columna-de-tnetflow_filter' into 'develop'

Ent 3790 sobra una columna de tnetflow filter

See merge request artica/pandorafms!2313

Former-commit-id: 31e8399658450e3f0ac4bd591f7eee631b3ba937

pandora_console/extras/mr/27.sql

@@ -1,5 +1,7 @@
 START TRANSACTION;
 
+ALTER TABLE `tnetflow_filter` DROP COLUMN `output`;
+
 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';
@@ -37,4 +39,4 @@ ALTER TABLE `treport_content_template` ADD COLUMN `unknown_checks` TINYINT(1) DE
 ALTER TABLE `treport_content_template` ADD COLUMN `agent_max_value` TINYINT(1) DEFAULT '1';
 ALTER TABLE `treport_content_template` ADD COLUMN `agent_min_value` TINYINT(1) DEFAULT '1';
 
-COMMIT;
+COMMIT;

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

@@ -2093,6 +2093,12 @@ INSERT INTO `trecon_script` (`name`,`description`,`script`,`macros`) VALUES ('Di
 -- ----------------------------------------------------------------------
 ALTER TABLE tagent_custom_fields ADD COLUMN `combo_values` VARCHAR(255) DEFAULT '';
 
+-- ----------------------------------------------------------------------
+-- Add column in table `tnetflow_filter`
+-- ----------------------------------------------------------------------
+ALTER TABLE `tnetflow_filter` DROP COLUMN `output`;
+
+
 -- ----------------------------------------------------------------------
 -- Update table `tuser_task`
 -- ----------------------------------------------------------------------

pandora_console/pandoradb.sql

@@ -1968,7 +1968,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;