Repository: eagle Updated Branches: refs/heads/master 71c1f95a4 -> 74d722406
[MINOR] Change AlertEagleStorePlugin in sql file - Change to org.apache.eagle.alert.engine.publisher.impl.AlertEagleStorePlugin Author: r7raul1984 <tangji...@yhd.com> Closes #769 from r7raul1984/MINOR-AlertStore. Project: http://git-wip-us.apache.org/repos/asf/eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/74d72240 Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/74d72240 Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/74d72240 Branch: refs/heads/master Commit: 74d722406dd776c0d1a3c1065ad80b0c6637236e Parents: 71c1f95 Author: r7raul1984 <tangji...@yhd.com> Authored: Fri Jan 13 17:34:25 2017 +0800 Committer: Hao Chen <h...@apache.org> Committed: Fri Jan 13 17:34:25 2017 +0800 ---------------------------------------------------------------------- .../org/apache/eagle/alert/metadata/impl/JdbcImplTest.java | 4 ++-- .../alert-metadata/src/test/resources/init.sql | 9 +++++---- eagle-server-assembly/src/main/bin/metadata-ddl.sql | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/eagle/blob/74d72240/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/java/org/apache/eagle/alert/metadata/impl/JdbcImplTest.java ---------------------------------------------------------------------- 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 d718632..566525e 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 class JdbcImplTest { OpResult result = dao.addPublishmentType(publishmentType); Assert.assertEquals(200, result.code); List<PublishmentType> 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); } } http://git-wip-us.apache.org/repos/asf/eagle/blob/74d72240/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/init.sql ---------------------------------------------------------------------- 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 caa107c..71ffa6e 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.app.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":[]}'); http://git-wip-us.apache.org/repos/asf/eagle/blob/74d72240/eagle-server-assembly/src/main/bin/metadata-ddl.sql ---------------------------------------------------------------------- diff --git a/eagle-server-assembly/src/main/bin/metadata-ddl.sql b/eagle-server-assembly/src/main/bin/metadata-ddl.sql index 4bed927..c24e592 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.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":[]}');