From aa70d5683655fd13d476441c056c877f76796a7c Mon Sep 17 00:00:00 2001 From: Guobiao Mo Date: Sun, 26 May 2019 23:08:21 -0700 Subject: Dynamically detect topic updates and new topics Issue-ID: DCAEGEN2-1195 Change-Id: I35d36a9aafe3a7681a9d4745bc509aded111b29d Signed-off-by: Guobiao Mo --- .../feeder/src/assembly/scripts/init_db.sql | 59 ++++++++++++---------- 1 file changed, 31 insertions(+), 28 deletions(-) (limited to 'components/datalake-handler/feeder/src/assembly') diff --git a/components/datalake-handler/feeder/src/assembly/scripts/init_db.sql b/components/datalake-handler/feeder/src/assembly/scripts/init_db.sql index 2884c3e7..6920be97 100644 --- a/components/datalake-handler/feeder/src/assembly/scripts/init_db.sql +++ b/components/datalake-handler/feeder/src/assembly/scripts/init_db.sql @@ -4,7 +4,7 @@ use datalake; CREATE TABLE `topic` ( `name` varchar(255) NOT NULL, `correlate_cleared_message` bit(1) DEFAULT NULL, - `enabled` bit(1) DEFAULT NULL, + `enabled` bit(1) DEFAULT 0, `login` varchar(255) DEFAULT NULL, `message_id_path` varchar(255) DEFAULT NULL, `pass` varchar(255) DEFAULT NULL, @@ -17,7 +17,7 @@ CREATE TABLE `topic` ( CREATE TABLE `db` ( `name` varchar(255) NOT NULL, - `enabled` bit(1) DEFAULT NULL, + `enabled` bit(1) DEFAULT 0, `host` varchar(255) DEFAULT NULL, `port` int(11) DEFAULT NULL, `database_name` varchar(255) DEFAULT NULL, @@ -40,29 +40,6 @@ CREATE TABLE `map_db_topic` ( CONSTRAINT `FK_db_name` FOREIGN KEY (`db_name`) REFERENCES `db` (`name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE TABLE `dashboard_template` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL, - `body` text DEFAULT NULL, - `note` text DEFAULT NULL, - `topic` varchar(255) DEFAULT NULL, - `type` varchar(255) DEFAULT NULL, - PRIMARY KEY (`id`), - KEY `FK_topic` (`topic`), - KEY `FK_type` (`type`), - CONSTRAINT `FK_topic` FOREIGN KEY (`topic`) REFERENCES `topic` (`name`) ON DELETE SET NULL, - CONSTRAINT `FK_type` FOREIGN KEY (`type`) REFERENCES `dashboard_type` (`name`) ON DELETE SET NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `dashboard_type` ( - `name` varchar(255) NOT NULL, - `dashboard` varchar(255) DEFAULT NULL, - `note` text DEFAULT NULL, - PRIMARY KEY (`name`), - KEY `FK_dashboard` (`dashboard`), - CONSTRAINT `FK_dashboard` FOREIGN KEY (`dashboard`) REFERENCES `dashboard` (`name`) ON DELETE SET NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - CREATE TABLE `dashboard` ( `name` varchar(255) NOT NULL DEFAULT '', `type` varchar(255) DEFAULT NULL, @@ -76,7 +53,28 @@ CREATE TABLE `dashboard` ( CONSTRAINT `FK_related_db` FOREIGN KEY (`related_db`) REFERENCES `db` (`name`) ON DELETE SET NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE `dashboard_type` ( + `name` varchar(255) NOT NULL, + `dashboard` varchar(255) DEFAULT NULL, + `note` text DEFAULT NULL, + PRIMARY KEY (`name`), + KEY `FK_dashboard` (`dashboard`), + CONSTRAINT `FK_dashboard` FOREIGN KEY (`dashboard`) REFERENCES `dashboard` (`name`) ON DELETE SET NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE `dashboard_template` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `body` text DEFAULT NULL, + `note` text DEFAULT NULL, + `topic` varchar(255) DEFAULT NULL, + `type` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `FK_topic` (`topic`), + KEY `FK_type` (`type`), + CONSTRAINT `FK_topic` FOREIGN KEY (`topic`) REFERENCES `topic` (`name`) ON DELETE SET NULL, + CONSTRAINT `FK_type` FOREIGN KEY (`type`) REFERENCES `dashboard_type` (`name`) ON DELETE SET NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8; insert into db (`name`,`host`,`login`,`pass`,`database_name`) values ('Couchbase','dl_couchbase','dl','dl1234','datalake'); insert into db (`name`,`host`) values ('Elasticsearch','dl_es'); @@ -87,12 +85,17 @@ insert into db (`name`,`host`,`login`) values ('HDFS','dlhdfs','dl'); -- in production, default enabled should be off insert into `topic`(`name`,`enabled`,`save_raw`,`ttl`,`data_format`) values ('_DL_DEFAULT_',1,0,3650,'JSON'); -insert into `topic`(`name`,`enabled`) values ('__consumer_offsets',0); -insert into `topic`(`name`,correlate_cleared_message,`enabled`, message_id_path) values ('unauthenticated.SEC_FAULT_OUTPUT',1,0,'/event/commonEventHeader/eventName,/event/commonEventHeader/reportingEntityName,/event/faultFields/specificProblem'); - insert into `map_db_topic`(`db_name`,`topic_name`) values ('Couchbase','_DL_DEFAULT_'); insert into `map_db_topic`(`db_name`,`topic_name`) values ('Elasticsearch','_DL_DEFAULT_'); insert into `map_db_topic`(`db_name`,`topic_name`) values ('MongoDB','_DL_DEFAULT_'); insert into `map_db_topic`(`db_name`,`topic_name`) values ('Druid','_DL_DEFAULT_'); insert into `map_db_topic`(`db_name`,`topic_name`) values ('HDFS','_DL_DEFAULT_'); + +insert into `topic`(`name`,correlate_cleared_message,`enabled`, message_id_path,`data_format`) values ('unauthenticated.SEC_FAULT_OUTPUT',1,1,'/event/commonEventHeader/eventName,/event/commonEventHeader/reportingEntityName,/event/faultFields/specificProblem,/event/commonEventHeader/eventId','JSON'); + +insert into `map_db_topic`(`db_name`,`topic_name`) values ('Couchbase','unauthenticated.SEC_FAULT_OUTPUT'); +insert into `map_db_topic`(`db_name`,`topic_name`) values ('Elasticsearch','unauthenticated.SEC_FAULT_OUTPUT'); +insert into `map_db_topic`(`db_name`,`topic_name`) values ('MongoDB','unauthenticated.SEC_FAULT_OUTPUT'); +insert into `map_db_topic`(`db_name`,`topic_name`) values ('Druid','unauthenticated.SEC_FAULT_OUTPUT'); +insert into `map_db_topic`(`db_name`,`topic_name`) values ('HDFS','unauthenticated.SEC_FAULT_OUTPUT'); -- cgit 1.2.3-korg