From 2b3436bcda9170e7e8fb9864b15f586b89d78d43 Mon Sep 17 00:00:00 2001 From: r7raul1984 Date: Tue, 10 Jan 2017 07:56:56 +0800 Subject: [PATCH 1/4] [MINOR] Change AlertEagleStorePlugin in sql file - Change to org.apache.eagle.alert.engine.publisher.impl.AlertEagleStorePlugin --- .../alert-metadata/src/test/resources/init.sql | 2 +- eagle-server-assembly/src/main/bin/metadata-ddl.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/init.sql b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/init.sql index caa107cb68..2b1786dbcd 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/init.sql +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/init.sql @@ -83,5 +83,5 @@ INSERT INTO publishment_type(id, content) VALUES ('Kafka', '{"type":"Kafka","className":"org.apache.eagle.alert.engine.publisher.impl.AlertKafkaPublisher","description":null,"fields":[{"name":"kafka_broker","value":"sandbox.hortonworks.com:6667"},{"name":"topic"}]}'), ('Email', '{"type":"Email","className":"org.apache.eagle.alert.engine.publisher.impl.AlertEmailPublisher","description":null,"fields":[{"name":"subject"},{"name":"sender"}, {"name":"recipients"}]}'), ('Slack', '{"type":"Slack","className":"org.apache.eagle.alert.engine.publisher.impl.AlertSlackPublisher","description":null,"fields":[{"name":"token"},{"name":"channels"}, {"name":"severitys"}, {"name":"urltemplate"}]}'), -('Storage', '{"type":"Storage","className":"org.apache.eagle.alert.app.AlertEagleStorePlugin","description":null,"fields":[]}'); +('Storage', '{"type":"Storage","className":"org.apache.eagle.alert.engine.publisher.impl.AlertEagleStorePlugin","description":null,"fields":[]}'); diff --git a/eagle-server-assembly/src/main/bin/metadata-ddl.sql b/eagle-server-assembly/src/main/bin/metadata-ddl.sql index 4bed927f7d..d24038b521 100644 --- a/eagle-server-assembly/src/main/bin/metadata-ddl.sql +++ b/eagle-server-assembly/src/main/bin/metadata-ddl.sql @@ -134,4 +134,4 @@ INSERT INTO publishment_type(id, content) VALUES ('Kafka', '{"name":"Kafka","type":"org.apache.eagle.alert.engine.publisher.impl.AlertKafkaPublisher","description":null,"fields":[{"name":"kafka_broker","value":"sandbox.hortonworks.com:6667"},{"name":"topic"}]}'), ('Email', '{"name":"Email","type":"org.apache.eagle.alert.engine.publisher.impl.AlertEmailPublisher","description":null,"fields":[{"name":"subject"},{"name":"sender"}, {"name":"recipients"}]}'), ('Slack', '{"name":"Slack","type":"org.apache.eagle.alert.engine.publisher.impl.AlertSlackPublisher","description":null,"fields":[{"name":"token"},{"name":"channels"}, {"name":"severitys"}, {"name":"urltemplate"}]}'), -('Storage', '{"name":"Storage","type":"org.apache.eagle.alert.app.AlertEagleStorePlugin","description":null,"fields":[]}'); +('Storage', '{"name":"Storage","type":"org.apache.eagle.alert.engine.publisher.impl.AlertEagleStorePlugin","description":null,"fields":[]}'); From 21df4f4fdf7f3ee8fda164361cdcd39abb729d78 Mon Sep 17 00:00:00 2001 From: r7raul1984 Date: Fri, 13 Jan 2017 13:28:42 +0800 Subject: [PATCH 2/4] Modify sql file. --- .../alert-metadata/src/test/resources/init.sql | 9 +++++---- eagle-server-assembly/src/main/bin/metadata-ddl.sql | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/init.sql b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/init.sql index 2b1786dbcd..4c5ee9a3da 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/init.sql +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/init.sql @@ -80,8 +80,9 @@ CREATE TABLE IF NOT EXISTS alert_event ( ); INSERT INTO publishment_type(id, content) VALUES -('Kafka', '{"type":"Kafka","className":"org.apache.eagle.alert.engine.publisher.impl.AlertKafkaPublisher","description":null,"fields":[{"name":"kafka_broker","value":"sandbox.hortonworks.com:6667"},{"name":"topic"}]}'), -('Email', '{"type":"Email","className":"org.apache.eagle.alert.engine.publisher.impl.AlertEmailPublisher","description":null,"fields":[{"name":"subject"},{"name":"sender"}, {"name":"recipients"}]}'), -('Slack', '{"type":"Slack","className":"org.apache.eagle.alert.engine.publisher.impl.AlertSlackPublisher","description":null,"fields":[{"name":"token"},{"name":"channels"}, {"name":"severitys"}, {"name":"urltemplate"}]}'), -('Storage', '{"type":"Storage","className":"org.apache.eagle.alert.engine.publisher.impl.AlertEagleStorePlugin","description":null,"fields":[]}'); +('Kafka', '{"name":"Kafka","type":"org.apache.eagle.alert.engine.publisher.impl.AlertKafkaPublisher","description":null,"fields":[{"name":"kafka_broker","value":"sandbox.hortonworks.com:6667"},{"name":"topic"}]}'), +('Email', '{"name":"Email","type":"org.apache.eagle.alert.engine.publisher.impl.AlertEmailPublisher","description":null,"fields":[{"name":"subject"},{"name":"sender"}, {"name":"recipients"}]}'), +('Slack', '{"name":"Slack","type":"org.apache.eagle.alert.engine.publisher.impl.AlertSlackPublisher","description":null,"fields":[{"name":"token"},{"name":"channels"}, {"name":"severitys"}, {"name":"urltemplate"}]}'), +('HbaseStorage', '{"name":"HbaseStorage","type":"org.apache.eagle.alert.app.AlertEagleStorePlugin","description":null,"fields":[]}'), +('JDBCStorage', '{"name":"JDBCStorage","type":"org.apache.eagle.alert.engine.publisher.impl.AlertEagleStorePlugin","description":null,"fields":[]}'); diff --git a/eagle-server-assembly/src/main/bin/metadata-ddl.sql b/eagle-server-assembly/src/main/bin/metadata-ddl.sql index d24038b521..dbd4066ed6 100644 --- a/eagle-server-assembly/src/main/bin/metadata-ddl.sql +++ b/eagle-server-assembly/src/main/bin/metadata-ddl.sql @@ -134,4 +134,5 @@ INSERT INTO publishment_type(id, content) VALUES ('Kafka', '{"name":"Kafka","type":"org.apache.eagle.alert.engine.publisher.impl.AlertKafkaPublisher","description":null,"fields":[{"name":"kafka_broker","value":"sandbox.hortonworks.com:6667"},{"name":"topic"}]}'), ('Email', '{"name":"Email","type":"org.apache.eagle.alert.engine.publisher.impl.AlertEmailPublisher","description":null,"fields":[{"name":"subject"},{"name":"sender"}, {"name":"recipients"}]}'), ('Slack', '{"name":"Slack","type":"org.apache.eagle.alert.engine.publisher.impl.AlertSlackPublisher","description":null,"fields":[{"name":"token"},{"name":"channels"}, {"name":"severitys"}, {"name":"urltemplate"}]}'), -('Storage', '{"name":"Storage","type":"org.apache.eagle.alert.engine.publisher.impl.AlertEagleStorePlugin","description":null,"fields":[]}'); +('HbaseStorage', '{"name":"HbaseStorage","type":"org.apache.eagle.alert.app.AlertEagleStorePlugin","description":null,"fields":[]}'), +('JDBCStorage', '{"name":"JDBCStorage","type":"org.apache.eagle.alert.engine.publisher.impl.AlertEagleStorePlugin","description":null,"fields":[]}'); From aa8ef2088c09f0a64820eabf584734d37762bfe1 Mon Sep 17 00:00:00 2001 From: r7raul1984 Date: Fri, 13 Jan 2017 14:26:03 +0800 Subject: [PATCH 3/4] Fix ut problem. --- .../org/apache/eagle/alert/metadata/impl/JdbcImplTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/java/org/apache/eagle/alert/metadata/impl/JdbcImplTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/java/org/apache/eagle/alert/metadata/impl/JdbcImplTest.java index d718632dc9..566525e49b 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/java/org/apache/eagle/alert/metadata/impl/JdbcImplTest.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/java/org/apache/eagle/alert/metadata/impl/JdbcImplTest.java @@ -148,11 +148,11 @@ public void test_apis() { OpResult result = dao.addPublishmentType(publishmentType); Assert.assertEquals(200, result.code); List types = dao.listPublishmentType(); - Assert.assertEquals(5, types.size()); + Assert.assertEquals(6, types.size()); dao.removePublishmentType("KAFKA"); types = dao.listPublishmentType(); - Assert.assertTrue(types.size() == 4); + Assert.assertTrue(types.size() == 5); } } From fb24d9e9553f5b891052883b7af9c84ca3c650aa Mon Sep 17 00:00:00 2001 From: r7raul1984 Date: Fri, 13 Jan 2017 17:21:56 +0800 Subject: [PATCH 4/4] "HbaseStorage" -> "HBaseStorage" --- .../alert-metadata/src/test/resources/init.sql | 2 +- eagle-server-assembly/src/main/bin/metadata-ddl.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/init.sql b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/init.sql index 4c5ee9a3da..71ffa6e9a5 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/init.sql +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/init.sql @@ -83,6 +83,6 @@ INSERT INTO publishment_type(id, content) VALUES ('Kafka', '{"name":"Kafka","type":"org.apache.eagle.alert.engine.publisher.impl.AlertKafkaPublisher","description":null,"fields":[{"name":"kafka_broker","value":"sandbox.hortonworks.com:6667"},{"name":"topic"}]}'), ('Email', '{"name":"Email","type":"org.apache.eagle.alert.engine.publisher.impl.AlertEmailPublisher","description":null,"fields":[{"name":"subject"},{"name":"sender"}, {"name":"recipients"}]}'), ('Slack', '{"name":"Slack","type":"org.apache.eagle.alert.engine.publisher.impl.AlertSlackPublisher","description":null,"fields":[{"name":"token"},{"name":"channels"}, {"name":"severitys"}, {"name":"urltemplate"}]}'), -('HbaseStorage', '{"name":"HbaseStorage","type":"org.apache.eagle.alert.app.AlertEagleStorePlugin","description":null,"fields":[]}'), +('HBaseStorage', '{"name":"HBaseStorage","type":"org.apache.eagle.alert.app.AlertEagleStorePlugin","description":null,"fields":[]}'), ('JDBCStorage', '{"name":"JDBCStorage","type":"org.apache.eagle.alert.engine.publisher.impl.AlertEagleStorePlugin","description":null,"fields":[]}'); diff --git a/eagle-server-assembly/src/main/bin/metadata-ddl.sql b/eagle-server-assembly/src/main/bin/metadata-ddl.sql index dbd4066ed6..c24e592dc5 100644 --- a/eagle-server-assembly/src/main/bin/metadata-ddl.sql +++ b/eagle-server-assembly/src/main/bin/metadata-ddl.sql @@ -134,5 +134,5 @@ INSERT INTO publishment_type(id, content) VALUES ('Kafka', '{"name":"Kafka","type":"org.apache.eagle.alert.engine.publisher.impl.AlertKafkaPublisher","description":null,"fields":[{"name":"kafka_broker","value":"sandbox.hortonworks.com:6667"},{"name":"topic"}]}'), ('Email', '{"name":"Email","type":"org.apache.eagle.alert.engine.publisher.impl.AlertEmailPublisher","description":null,"fields":[{"name":"subject"},{"name":"sender"}, {"name":"recipients"}]}'), ('Slack', '{"name":"Slack","type":"org.apache.eagle.alert.engine.publisher.impl.AlertSlackPublisher","description":null,"fields":[{"name":"token"},{"name":"channels"}, {"name":"severitys"}, {"name":"urltemplate"}]}'), -('HbaseStorage', '{"name":"HbaseStorage","type":"org.apache.eagle.alert.app.AlertEagleStorePlugin","description":null,"fields":[]}'), +('HBaseStorage', '{"name":"HBaseStorage","type":"org.apache.eagle.alert.app.AlertEagleStorePlugin","description":null,"fields":[]}'), ('JDBCStorage', '{"name":"JDBCStorage","type":"org.apache.eagle.alert.engine.publisher.impl.AlertEagleStorePlugin","description":null,"fields":[]}');