eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ralp...@apache.org
Subject [1/2] incubator-eagle git commit: [EAGLE-384] Alert Engine BugFix and Improvements
Date Thu, 21 Jul 2016 06:39:59 GMT
Repository: incubator-eagle
Updated Branches:
  refs/heads/develop 04468a9f8 -> f0af3e5dc


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient3.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient3.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient3.java
new file mode 100644
index 0000000..3f16d1b
--- /dev/null
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient3.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.eagle.alert.engine.e2e;
+
+import java.util.Properties;
+
+import org.apache.kafka.clients.producer.KafkaProducer;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+
+/**
+ * @since Jun 12, 2016
+ *
+ */
+public class SampleClient3 {
+    
+    
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public static void main(String[] args) throws Exception {
+        System.setProperty("config.resource", "/e2e/application-e2e.conf");
+        ConfigFactory.invalidateCaches();
+        
+        Config config = ConfigFactory.load();
+        KafkaProducer producer = createByteProceduer(config);
+
+//        TimeSeriesDataSchemaManager manager = TimeSeriesDataSchemaUtils
+//                .createManagerFromCGMJSONStream(SherlockEventScheme.class.getResourceAsStream("/e2e/sherlock.json"));
+//        Serializer serializer = ProtobufSerializer.newInstance(manager);
+//
+//        while (true) {
+//            SherlockEvent event = createEvent(manager);
+//            ProducerRecord record = new ProducerRecord("syslog_events", serializer.writeValueAsBytes(event));
+//            producer.send(record);
+//
+//            Utils.sleep(3000);
+//        }
+    }
+
+//    private static SherlockEvent createEvent(TimeSeriesDataSchemaManager manager) throws Exception {
+//
+//        SherlockEventBuilder builder = SherlockEvent.newBuilder();
+//        builder.setEpochMillis(System.currentTimeMillis());
+//        builder.setSchema(manager.getSchema("syslog", "parsed"));
+//        // dim
+//        DimTagsBuilder dimBuilder = DimTags.newBuilder();
+//        dimBuilder.add("facility", "USER");
+//        dimBuilder.add("severity", "NOTICE");
+//        dimBuilder.add("hostname", "LM-SJC-11000548");
+//        dimBuilder.add("msgid", "-");
+//        builder.setDimTagsBuilder(dimBuilder);
+//
+//        MapdataValueBuilder mvBuilder = MapdataValue.newBuilder();
+//        mvBuilder.put("timestamp", StringValue.newBuilder().setValue("04/Dec/2015:11:54:23 -0700").build());
+//        mvBuilder.put("conn", StringValue.newBuilder().setValue("293578221").build());
+//        mvBuilder.put("op", StringValue.newBuilder().setValue("1").build());
+//        mvBuilder.put("msgId", StringValue.newBuilder().setValue("2").build());
+//        mvBuilder.put(
+//                "command",
+//                StringValue.newBuilder()
+//                        .setValue("RESULT err=0 tag=101 nentries=1 etime=0 additional alert line ha ha ha").build());
+//
+//        builder.setValueBuilder(mvBuilder);
+//
+//        return builder.build();
+//    }
+//    
+    public static KafkaProducer<String, String> createByteProceduer(Config config) {
+        String servers = config.getString("kafkaProducer.bootstrapServers");
+        Properties configMap = new Properties();
+        configMap.put("bootstrap.servers", servers);
+        configMap.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer");
+        configMap.put("value.serializer", "org.apache.kafka.common.serialization.ByteArraySerializer");
+        configMap.put("request.required.acks", "1");
+        configMap.put("key.deserializer", "org.apache.kafka.common.serialization.StringDeserializer");
+        configMap.put("value.deserializer", "org.apache.kafka.common.serialization.ByteArrayDeserializer");
+        KafkaProducer<String, String> proceduer = new KafkaProducer<String, String>(configMap);
+        return proceduer;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestBolt.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestBolt.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestBolt.java
index 2dc37df..0ad6924 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestBolt.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestBolt.java
@@ -20,16 +20,17 @@
 package org.apache.eagle.alert.engine.topology;
 
 
+import java.util.Map;
+
+import org.junit.Ignore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import backtype.storm.task.OutputCollector;
 import backtype.storm.task.TopologyContext;
 import backtype.storm.topology.OutputFieldsDeclarer;
 import backtype.storm.topology.base.BaseRichBolt;
 import backtype.storm.tuple.Tuple;
-import org.junit.Ignore;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Map;
 
 /**
  * Created by yonzhang on 4/7/16.

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/application-absence.conf
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/application-absence.conf b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/application-absence.conf
index 82e3f15..7094820 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/application-absence.conf
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/application-absence.conf
@@ -45,16 +45,16 @@
     "delayMillis" : 10000
   },
   "metadataService": {
-    "context" : "/rest",
-    "host" : "localhost",
-    "port" : 8080
+	"context" : "/rest",
+	"host" : "localhost",
+	"port" : 8080
   },
   "coordinatorService": {
-    "host": "localhost",
-    "port": "8080",
-    "context" : "/rest"
+  	"host": "localhost",
+  	"port": "8080",
+  	"context" : "/rest"
   },
   "kafkaProducer": {
-    "bootstrapServers": "sandbox.hortonworks.com:6667"
+  	"bootstrapServers": "sandbox.hortonworks.com:6667"
   }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/datasources.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/datasources.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/datasources.json
index ed4d638..7c2f8d8 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/datasources.json
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/datasources.json
@@ -1,17 +1,17 @@
 [
-  {
-    "name": "absenceAlertDataSource",
-    "type": "KAFKA",
-    "properties": {},
-    "topic": "absenceAlertTopic",
-    "schemeCls": "org.apache.eagle.alert.engine.scheme.JsonScheme",
-    "codec": {
-      "streamNameSelectorProp": {
-        "userProvidedStreamName": "noDataAlertStream"
-      },
-      "streamNameSelectorCls": "org.apache.eagle.alert.engine.scheme.JsonStringStreamNameSelector",
-      "timestampColumn": "timestamp",
-      "timestampFormat": ""
-    }
-  }
+	{
+		"name": "absenceAlertDataSource",
+		"type": "KAFKA",
+		"properties": {},
+		"topic": "absenceAlertTopic",
+		"schemeCls": "org.apache.eagle.alert.engine.scheme.JsonScheme",
+		"codec": {
+			"streamNameSelectorProp": {
+				"userProvidedStreamName": "noDataAlertStream"
+			},
+			"streamNameSelectorCls": "org.apache.eagle.alert.engine.scheme.JsonStringStreamNameSelector",
+			"timestampColumn": "timestamp",
+			"timestampFormat": ""
+		}
+	}
 ]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/policies.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/policies.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/policies.json
index a7ce7dc..df04e79 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/policies.json
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/policies.json
@@ -1,24 +1,24 @@
 [
-  {
-    "name": "absenceAlertPolicy",
-    "description": "absenceAlertPolicy",
-    "inputStreams": [
-      "absenceAlertStream"
-    ],
-    "outputStreams": [
-      "absenceAlertStream_out"
-    ],
-    "definition": {
-      "type": "absencealert",
-      "value": "1,jobID,job1,daily_rule,14:00:00,15:00:00"
-    },
-    "partitionSpec": [
-      {
-        "streamId": "absenceAlertStream",
-        "type": "GROUPBY",
-        "columns" : ["jobID"]
-      }
-    ],
-    "parallelismHint": 2
-  }
+	{
+		"name": "absenceAlertPolicy",
+		"description": "absenceAlertPolicy",
+		"inputStreams": [
+			"absenceAlertStream"
+		],
+		"outputStreams": [
+			"absenceAlertStream_out"
+		],
+		"definition": {
+			"type": "absencealert",
+			"value": "1,jobID,job1,daily_rule,14:00:00,15:00:00"
+		},
+		"partitionSpec": [
+			{
+				"streamId": "absenceAlertStream",
+				"type": "GROUPBY",
+				"columns" : ["jobID"]
+			}
+		],
+		"parallelismHint": 2
+	}
 ]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/publishments.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/publishments.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/publishments.json
index 6e9260f..b199e19 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/publishments.json
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/publishments.json
@@ -1,20 +1,20 @@
 [
-  {
-    "name":"test-stream-output",
-    "type":"org.apache.eagle.alert.engine.publisher.impl.AlertEmailPublisher",
-    "policyIds": [
-      "absenceAlertPolicy"
-    ],
-    "properties": {
-      "subject":"UMP Test Alert",
-      "template":"",
-      "sender": "sender@corp.com",
-      "recipients": "yonzhang@ebay.com",
-      "smtp.server":"atom.corp.ebay.com",
-      "connection": "plaintext",
-      "smtp.port": "25"
-    },
-    "dedupIntervalMin" : "PT5M",
-    "serializer" : "org.apache.eagle.alert.engine.publisher.impl.StringEventSerializer"
-  }
+	{
+		"name":"test-stream-output",
+		"type":"org.apache.eagle.alert.engine.publisher.impl.AlertEmailPublisher",
+		"policyIds": [
+			"absenceAlertPolicy"
+		],
+		"properties": {
+			"subject":"Eagle Test Alert",
+			"template":"",
+			"sender": "sender@corp.com",
+			"recipients": "services@corp.com",
+			"smtp.server":"smtp.mailhost.com",
+			"connection": "plaintext",
+			"smtp.port": "25"
+		},
+		"dedupIntervalMin" : "PT5M",
+		"serializer" : "org.apache.eagle.alert.engine.publisher.impl.StringEventSerializer"
+	}
 ]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/streamdefinitions.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/streamdefinitions.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/streamdefinitions.json
index 4bd7319..c9cd7b1 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/streamdefinitions.json
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/streamdefinitions.json
@@ -1,29 +1,29 @@
 [
-  {
-    "streamId": "absenceAlertStream",
-    "dataSource": "absenceAlertDataSource",
-    "description": "the data stream for testing absence alert",
-    "validate": false,
-    "timeseries": false,
-    "columns": [
-      {
-        "name": "jobID",
-        "type": "STRING",
-        "defaultValue": "",
-        "required": true
-      },
-      {
-        "name": "timestamp",
-        "type": "LONG",
-        "defaultValue": 0,
-        "required": true
-      },
-      {
-        "name": "status",
-        "type": "STRING",
-        "defaultValue": "running",
-        "required": true
-      }
-    ]
-  }
+	{
+		"streamId": "absenceAlertStream",
+		"dataSource": "absenceAlertDataSource",
+		"description": "the data stream for testing absence alert",
+		"validate": false,
+		"timeseries": false,
+		"columns": [
+			{
+				"name": "jobID",
+				"type": "STRING",
+				"defaultValue": "",
+				"required": true
+			},
+			{
+				"name": "timestamp",
+				"type": "LONG",
+				"defaultValue": 0,
+				"required": true
+			},
+			{
+				"name": "status",
+				"type": "STRING",
+				"defaultValue": "running",
+				"required": true
+			}
+		]
+	}
 ]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/topologies.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/topologies.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/topologies.json
index 2726aff..afac207 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/topologies.json
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/absence/topologies.json
@@ -1,31 +1,31 @@
 [
-  {
-    "name": "alertUnitTopology_1",
-    "numOfSpout":1,
-    "numOfAlertBolt": 10,
-    "numOfGroupBolt": 4,
-    "spoutId": "alertEngineSpout",
-    "groupNodeIds" : [
-      "streamRouterBolt0",
-      "streamRouterBolt1",
-      "streamRouterBolt2",
-      "streamRouterBolt3"
-    ],
-    "alertBoltIds": [
-      "alertBolt0",
-      "alertBolt1",
-      "alertBolt2",
-      "alertBolt3",
-      "alertBolt4",
-      "alertBolt5",
-      "alertBolt6",
-      "alertBolt7",
-      "alertBolt8",
-      "alertBolt9"
-    ],
-    "pubBoltId" : "alertPublishBolt",
-    "spoutParallelism": 1,
-    "groupParallelism": 1,
-    "alertParallelism": 1
-  }
+{
+	"name": "alertUnitTopology_1",
+	"numOfSpout":1,
+	"numOfAlertBolt": 10,
+	"numOfGroupBolt": 4,
+	"spoutId": "alertEngineSpout",
+	"groupNodeIds" : [
+		"streamRouterBolt0",
+		"streamRouterBolt1",
+		"streamRouterBolt2",
+		"streamRouterBolt3"
+	],
+	"alertBoltIds": [
+		"alertBolt0",
+		"alertBolt1",
+		"alertBolt2",
+		"alertBolt3",
+		"alertBolt4",
+		"alertBolt5",
+		"alertBolt6",
+		"alertBolt7",
+		"alertBolt8",
+		"alertBolt9"
+	],
+	"pubBoltId" : "alertPublishBolt",
+	"spoutParallelism": 1,
+	"groupParallelism": 1,
+	"alertParallelism": 1
+}
 ]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/application-e2e.conf
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/application-e2e.conf b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/application-e2e.conf
new file mode 100644
index 0000000..80522fb
--- /dev/null
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/application-e2e.conf
@@ -0,0 +1,60 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{
+  "topology" : {
+    "name" : "alertUnitTopology_2",
+    "numOfSpoutTasks" : 1,
+    "numOfRouterBolts" : 4,
+    "numOfAlertBolts" : 10,
+    "numOfPublishTasks" : 1,
+    "numOfTotalWorkers": 20,
+    "localMode" : "true"
+  },
+  "spout" : {
+    "kafkaBrokerZkQuorum": "localhost:2181",
+    "kafkaBrokerZkBasePath": "/brokers",
+    "stormKafkaUseSameZkQuorumWithKafkaBroker": true,
+    "stormKafkaTransactionZkQuorum": "",
+    "stormKafkaTransactionZkPath": "/consumers",
+    "stormKafkaEagleConsumer": "eagle_consumer",
+    "stormKafkaStateUpdateIntervalMs": 2000,
+    "stormKafkaFetchSizeBytes": 1048586,
+  },
+  "zkConfig" : {
+    "zkQuorum" : "localhost:2181",
+    "zkRoot" : "/alert",
+    "zkSessionTimeoutMs" : 10000,
+    "connectionTimeoutMs" : 10000,
+    "zkRetryTimes" : 3,
+    "zkRetryInterval" : 3000
+  },
+  "dynamicConfigSource" : {
+    "initDelayMillis": 3000,
+    "delayMillis" : 10000
+  },
+  "metadataService": {
+	"context" : "/rest",
+	"host" : "localhost",
+	"port" : 8080
+  },
+  "coordinatorService": {
+  	"host": "localhost",
+  	"port": "8080",
+  	"context" : "/rest"
+  },
+  "kafkaProducer": {
+  	"bootstrapServers": "localhost:9092"
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/datasources.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/datasources.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/datasources.json
new file mode 100644
index 0000000..6d745a9
--- /dev/null
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/datasources.json
@@ -0,0 +1,21 @@
+[
+
+{
+	"name": "network_syslog_datasource",
+	"type": "KAFKA",
+	"properties": {
+	},
+	"topic": "syslog_events",
+	"schemeCls": "org.apache.eagle.alert.engine.extension.SherlockEventScheme",
+	"codec": {
+		"streamNameSelectorProp": {
+			"userProvidedStreamName" : "syslog_stream",
+			"streamNameFormat":"%s"
+		},
+		"streamNameSelectorCls":"org.apache.eagle.alert.engine.scheme.JsonStringStreamNameSelector",
+		"timestampColumn": "timestamp",
+		"timestampFormat":""
+	}
+}
+
+]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/policies.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/policies.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/policies.json
new file mode 100644
index 0000000..ba013b2
--- /dev/null
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/policies.json
@@ -0,0 +1,28 @@
+[
+
+{
+	"name": "syslog_severity_check",
+	"description" : "syslog.severity > 3 then error",
+	"inputStreams": [
+		"syslog_stream"
+	],
+	"outputStreams": [
+		"syslog_severity_check_output"
+	],
+	"definition": {
+		"type": "siddhi",
+		"value": "from syslog_stream[dims_severity == \"NOTICE\"] select * insert into syslog_severity_check_output;"
+	},
+	"partitionSpec": [
+		{
+			"streamId" : "syslog_stream",
+			"type" : "GROUPBY",
+			"columns" : [
+				"dims_hostname"
+			]
+		}
+	],
+	"parallelismHint": 10
+}
+
+]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/publishments.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/publishments.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/publishments.json
new file mode 100644
index 0000000..a9b85b8
--- /dev/null
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/publishments.json
@@ -0,0 +1,17 @@
+[
+
+{
+  "type": "org.apache.eagle.alert.engine.publisher.impl.AlertKafkaPublisher",
+  "name":"network-syslog-publish",
+  "policyIds": ["syslog_severity_check"],
+  "dedupIntervalMin": "PT0M",
+  "properties":{
+    "kafka_broker":"localhost:9092",
+    "topic":"syslog_alerts",
+    "value_deserializer": "org.apache.kafka.common.serialization.ByteArrayDeserializer",
+    "value_serializer": "org.apache.kafka.common.serialization.ByteArraySerializer"
+  },
+  "serializer" : "org.apache.eagle.alert.engine.extension.SherlockAlertSerializer"
+}
+
+]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/sherlock.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/sherlock.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/sherlock.json
new file mode 100644
index 0000000..a0eac01
--- /dev/null
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/sherlock.json
@@ -0,0 +1,52 @@
+{"SchemaCompModel": {
+    "syslog": {
+      "demo": {
+        "tsdType": "SherlockLog",
+        "dimTagsSchema": {
+          "mandatoryDimensions": [
+            "facility",
+            "severity",
+            "hostname",
+            "msgid"
+          ]
+        },
+        "valueSchema": {
+          "type": "Primitive",
+          "primitiveType": "StringValue"
+        }
+      },
+      "parsed": {
+        "tsdType": "SherlockEvent",
+        "dimTagsSchema": {
+          "mandatoryDimensions": [
+            "facility",
+            "severity",
+            "hostname",
+            "msgid"
+          ]
+        },
+        "valueSchema": {
+          "type": "Mapdata",
+          "typeName": "MapdataValue",
+          "subValueSchema": {
+            "timestamp": {
+              "primitiveType": "StringValue"
+            },
+            "conn": {
+              "primitiveType": "StringValue"
+            },
+            "op": {
+              "primitiveType": "StringValue"
+            },
+            "msgId": {
+              "primitiveType": "StringValue"
+            },
+            "command": {
+              "primitiveType": "StringValue"
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/streamdefinitions.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/streamdefinitions.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/streamdefinitions.json
new file mode 100644
index 0000000..fafa8aa
--- /dev/null
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/streamdefinitions.json
@@ -0,0 +1,76 @@
+[
+
+{
+	"streamId": "syslog_stream",
+	"dataSource" : "network_syslog_datasource",
+	"description":"the data stream for syslog events",
+	"validate": false,
+	"timeseries":false,
+	"columns": [
+		{
+			"name": "dims_facility",
+			"type" : "STRING",
+			"defaultValue": "",
+			"required":true
+		},{
+			"name": "dims_severity",
+			"type" : "STRING",
+			"defaultValue": "",
+			"required": true
+		},
+		{
+			"name": "dims_hostname",
+			"type" : "STRING",
+			"defaultValue": "",
+			"required": true
+		},
+		{
+			"name": "dims_msgid",
+			"type" : "STRING",
+			"defaultValue": "",
+			"required": true
+		},{
+			"name": "timestamp",
+			"type" : "STRING",
+			"defaultValue": "",
+			"required":true
+		},{
+			"name": "conn",
+			"type" : "STRING",
+			"defaultValue": "",
+			"required": true
+		},{
+			"name": "op",
+			"type" : "STRING",
+			"defaultValue": "",
+			"required":true
+		},{
+			"name": "msgId",
+			"type" : "STRING",
+			"defaultValue": "",
+			"required":true
+		},{
+			"name": "command",
+			"type" : "STRING",
+			"defaultValue": "",
+			"required": true
+		},{
+			"name": "name",
+			"type" : "STRING",
+			"defaultValue": "",
+			"required": true
+		},{
+			"name": "namespace",
+			"type" : "STRING",
+			"defaultValue": "",
+			"required": true
+		},{
+			"name": "epochMillis",
+			"type" : "LONG",
+			"defaultValue": 0,
+			"required": true
+		}
+	]
+}
+
+]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/topologies.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/topologies.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/topologies.json
new file mode 100644
index 0000000..9aa8716
--- /dev/null
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/topologies.json
@@ -0,0 +1,31 @@
+[
+{
+	"name": "alertUnitTopology_2",
+	"numOfSpout":1,
+	"numOfGroupBolt": 4,
+	"numOfAlertBolt": 10,
+	"spoutId": "alertEngineSpout",
+	"groupNodeIds" : [
+		"streamRouterBolt0",
+		"streamRouterBolt1",
+		"streamRouterBolt2",
+		"streamRouterBolt3"
+	],
+	"alertBoltIds": [
+		"alertBolt0",
+		"alertBolt1",
+		"alertBolt2",
+		"alertBolt3",
+		"alertBolt4",
+		"alertBolt5",
+		"alertBolt6",
+		"alertBolt7",
+		"alertBolt8",
+		"alertBolt9"
+	],
+	"pubBoltId" : "alertPublishBolt",
+	"spoutParallelism": 1,
+	"groupParallelism": 1,
+	"alertParallelism": 1
+}
+]

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/ump_demo_schema.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/ump_demo_schema.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/ump_demo_schema.json
new file mode 100644
index 0000000..053ac9c
--- /dev/null
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/e2e/ump_demo_schema.json
@@ -0,0 +1,170 @@
+{
+  "clusters": [],
+  "schemas": [
+	{
+		"streamId": "syslog_stream",
+		"dataSource" : "network_syslog_datasource",
+		"description":"the data stream for syslog events",
+		"validate": false,
+		"timeseries":false,
+		"columns": [
+			{
+				"name": "dims_facility",
+				"type" : "STRING",
+				"defaultValue": "",
+				"required":true
+			},{
+				"name": "dims_severity",
+				"type" : "STRING",
+				"defaultValue": "",
+				"required": true
+			},
+			{
+				"name": "dims_hostname",
+				"type" : "STRING",
+				"defaultValue": "",
+				"required": true
+			},
+			{
+				"name": "dims_msgid",
+				"type" : "STRING",
+				"defaultValue": "",
+				"required": true
+			},{
+				"name": "timestamp",
+				"type" : "STRING",
+				"defaultValue": "",
+				"required":true
+			},{
+				"name": "conn",
+				"type" : "STRING",
+				"defaultValue": "",
+				"required": true
+			},{
+				"name": "op",
+				"type" : "STRING",
+				"defaultValue": "",
+				"required":true
+			},{
+				"name": "msgId",
+				"type" : "STRING",
+				"defaultValue": "",
+				"required":true
+			},{
+				"name": "command",
+				"type" : "STRING",
+				"defaultValue": "",
+				"required": true
+			},{
+				"name": "name",
+				"type" : "STRING",
+				"defaultValue": "",
+				"required": true
+			},{
+				"name": "namespace",
+				"type" : "STRING",
+				"defaultValue": "",
+				"required": true
+			},{
+				"name": "epochMillis",
+				"type" : "LONG",
+				"defaultValue": 0,
+				"required": true
+			}
+		]
+	}
+  ],
+  "datasources": [
+	{
+		"name": "network_syslog_datasource",
+		"type": "KAFKA",
+		"properties": {
+		},
+		"topic": "logoutput",
+		"schemeCls": "org.apache.eagle.alert.engine.extension.SherlockEventScheme",
+		"codec": {
+			"streamNameSelectorProp": {
+				"userProvidedStreamName" : "syslog_stream",
+				"streamNameFormat":"%s"
+			},
+			"streamNameSelectorCls":"org.apache.eagle.alert.engine.scheme.JsonStringStreamNameSelector",
+			"timestampColumn": "timestamp",
+			"timestampFormat":""
+		}
+	}
+  ],
+  "policies": [
+	{
+		"name": "syslog_severity_check",
+		"description" : "syslog.severity > 3 then error",
+		"inputStreams": [
+			"syslog_stream"
+		],
+		"outputStreams": [
+			"syslog_severity_check_output"
+		],
+		"definition": {
+			"type": "siddhi",
+			"value": "from syslog_stream[dims_severity == \"NOTICE\"] select * insert into syslog_severity_check_output;"
+		},
+		"partitionSpec": [
+			{
+				"streamId" : "syslog_stream",
+				"type" : "GROUPBY",
+				"columns" : [
+					"dims_hostname"
+				]
+			}
+		],
+		"parallelismHint": 10
+	}
+  ],
+  "publishments": [
+	{
+	  "type": "org.apache.eagle.alert.engine.publisher.impl.AlertKafkaPublisher",
+	  "name":"network-syslog-publish",
+	  "policyIds": ["syslog_severity_check"],
+	  "dedupIntervalMin": "PT0M",
+	  "properties":{
+	    "kafka_broker":"localhost:9092",
+	    "topic":"syslog_alerts",
+	    "value.deserializer": "org.apache.kafka.common.serialization.ByteArrayDeserializer",
+	    "value.serializer": "org.apache.kafka.common.serialization.ByteArraySerializer"
+	  },
+	  "serializer" : "org.apache.eagle.alert.engine.extension.SherlockAlertSerializer"
+	}
+  ],
+  "scheduleStates": {},
+  "assignments": [],
+  "topologies": [
+	{
+		"name": "alertUnitTopology_1",
+		"numOfSpout":1,
+		"numOfGroupBolt": 4,
+		"numOfAlertBolt": 10,
+		"spoutId": "alertEngineSpout",
+		"groupNodeIds" : [
+			"streamRouterBolt0",
+			"streamRouterBolt1",
+			"streamRouterBolt2",
+			"streamRouterBolt3"
+		],
+		"alertBoltIds": [
+			"alertBolt0",
+			"alertBolt1",
+			"alertBolt2",
+			"alertBolt3",
+			"alertBolt4",
+			"alertBolt5",
+			"alertBolt6",
+			"alertBolt7",
+			"alertBolt8",
+			"alertBolt9"
+		],
+		"pubBoltId" : "alertPublishBolt",
+		"spoutParallelism": 1,
+		"groupParallelism": 1,
+		"alertParallelism": 1
+	}
+  ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/nodata/policies.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/nodata/policies.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/nodata/policies.json
index a8e4a9c..0c4df7e 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/nodata/policies.json
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/nodata/policies.json
@@ -10,7 +10,7 @@
 		],
 		"definition": {
 			"type": "nodataalert",
-			"value": "PT1M,dynamic,1,host",
+			"value": "PT1M,dynamic,1,host"
 		},
 		"partitionSpec": [
 			{

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/nodata/publishments.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/nodata/publishments.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/nodata/publishments.json
index 52208ee..362a03b 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/nodata/publishments.json
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/nodata/publishments.json
@@ -17,4 +17,4 @@
 		"dedupIntervalMin" : "PT5M",
 		"serializer" : "org.apache.eagle.alert.engine.publisher.impl.StringEventSerializer"
 	}
-]
\ No newline at end of file
+]

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/simple/application-integration.conf
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/simple/application-integration.conf b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/simple/application-integration.conf
index 09db673..73e5b30 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/simple/application-integration.conf
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/simple/application-integration.conf
@@ -57,4 +57,4 @@
   "kafkaProducer": {
   	"bootstrapServers": "localhost:9092"
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/simple/publishments.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/simple/publishments.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/simple/publishments.json
index ab9a98e..cd05622 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/simple/publishments.json
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/simple/publishments.json
@@ -28,4 +28,4 @@
   },
   "serializer" : "org.apache.eagle.alert.engine.publisher.impl.StringEventSerializer"
 }
-]
\ No newline at end of file
+]

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/main/java/org/apache/eagle/alert/metadata/impl/MongoMetadataDaoImpl.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/main/java/org/apache/eagle/alert/metadata/impl/MongoMetadataDaoImpl.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/main/java/org/apache/eagle/alert/metadata/impl/MongoMetadataDaoImpl.java
index f5794d4..4e2beab 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/main/java/org/apache/eagle/alert/metadata/impl/MongoMetadataDaoImpl.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/main/java/org/apache/eagle/alert/metadata/impl/MongoMetadataDaoImpl.java
@@ -44,6 +44,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mongodb.Function;
 import com.mongodb.MongoClient;
+import com.mongodb.MongoClientURI;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.IndexOptions;
@@ -81,7 +82,7 @@ public class MongoMetadataDaoImpl implements IMetadataDao {
 
     public MongoMetadataDaoImpl(Config config) {
         this.connection = config.getString("connection");
-        this.client = new MongoClient(connection);
+        this.client = new MongoClient(new MongoClientURI(this.connection));
         init();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/java/org/apache/eagle/service/alert/resource/impl/MongoImplTest.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/java/org/apache/eagle/service/alert/resource/impl/MongoImplTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/java/org/apache/eagle/service/alert/resource/impl/MongoImplTest.java
index e63353b..5b38776 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/java/org/apache/eagle/service/alert/resource/impl/MongoImplTest.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/java/org/apache/eagle/service/alert/resource/impl/MongoImplTest.java
@@ -27,8 +27,8 @@ import org.apache.eagle.alert.engine.coordinator.PolicyDefinition;
 import org.apache.eagle.alert.engine.coordinator.Publishment;
 import org.apache.eagle.alert.engine.coordinator.PublishmentType;
 import org.apache.eagle.alert.engine.coordinator.StreamingCluster;
-import org.apache.eagle.alert.metadata.impl.MongoMetadataDaoImpl;
 import org.apache.eagle.alert.metadata.IMetadataDao;
+import org.apache.eagle.alert.metadata.impl.MongoMetadataDaoImpl;
 import org.apache.eagle.alert.metadata.resource.OpResult;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -92,7 +92,7 @@ public class MongoImplTest {
     private String TOPO_NAME = "topoName";
 
     @Test
-    public void test_apis() {
+    public void test_apis() throws Exception {
         // topology
         {
             OpResult result = dao.addTopology(new Topology(TOPO_NAME, 3, 5));
@@ -165,6 +165,28 @@ public class MongoImplTest {
             List<PublishmentType> assigns = dao.listPublishmentType();
             Assert.assertEquals(1, assigns.size());
         }
+
+        // schedule state
+        {
+            ScheduleState state = new ScheduleState();
+            state.setVersion("001");
+            state.setScheduleTimeMillis(3000);
+            state.setCode(200);
+            OpResult result = dao.addScheduleState(state);
+            Assert.assertEquals(200, result.code);
+
+            Thread.sleep(1000);
+
+            state = new ScheduleState();
+            state.setScheduleTimeMillis(3000);
+            state.setVersion("002");
+            state.setCode(201);
+            result = dao.addScheduleState(state);
+            Assert.assertEquals(200, result.code);
+            
+            ScheduleState getState = dao.getScheduleState();
+            Assert.assertEquals(201, getState.getCode());
+        }
     }
 
     private void test_addstate() {

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/application-mongo.conf
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/application-mongo.conf b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/application-mongo.conf
index 54dabf4..f9b2597 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/application-mongo.conf
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/test/resources/application-mongo.conf
@@ -16,6 +16,6 @@
 {
 	"datastore": {
         "metadataDao": "org.apache.eagle.alert.metadata.impl.InMemMetadataDaoImpl",
-		"connection": "localhost:27017"
+		"connection": "mongodb://localhost:27017"
 	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/java/org/apache/eagle/service/app/AlertDropWizardConfiguration.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/java/org/apache/eagle/service/app/AlertDropWizardConfiguration.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/java/org/apache/eagle/service/app/AlertDropWizardConfiguration.java
index 1d7a70d..adb55c5 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/java/org/apache/eagle/service/app/AlertDropWizardConfiguration.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/java/org/apache/eagle/service/app/AlertDropWizardConfiguration.java
@@ -18,10 +18,23 @@ package org.apache.eagle.service.app;
 
 import io.dropwizard.Configuration;
 
+import javax.validation.Valid;
+
 /**
  * @since Jun 27, 2016
  *
  */
 public class AlertDropWizardConfiguration extends Configuration {
 
+    @Valid
+    private String applicationConfPath;
+
+    public String getApplicationConfPath() {
+        return applicationConfPath;
+    }
+
+    public void setApplicationConfPath(String applicationConfPath) {
+        this.applicationConfPath = applicationConfPath;
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/java/org/apache/eagle/service/app/ServiceApp.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/java/org/apache/eagle/service/app/ServiceApp.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/java/org/apache/eagle/service/app/ServiceApp.java
index f89ff68..e4c1a42 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/java/org/apache/eagle/service/app/ServiceApp.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/java/org/apache/eagle/service/app/ServiceApp.java
@@ -26,12 +26,14 @@ import java.util.EnumSet;
 
 import javax.servlet.DispatcherType;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.eagle.alert.coordinator.CoordinatorListener;
 import org.apache.eagle.alert.coordinator.resource.CoordinatorResource;
 import org.apache.eagle.alert.resource.SimpleCORSFiler;
 import org.apache.eagle.service.metadata.resource.MetadataResource;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.typesafe.config.ConfigFactory;
 
 /**
  * @since Jun 27, 2016
@@ -54,6 +56,13 @@ public class ServiceApp extends Application<AlertDropWizardConfiguration> {
 
     @Override
     public void run(AlertDropWizardConfiguration configuration, Environment environment) throws Exception {
+        if (StringUtils.isNotEmpty(configuration.getApplicationConfPath())) {
+            // setup config if given
+            System.setProperty("config.resource", configuration.getApplicationConfPath());
+            ConfigFactory.invalidateCaches();
+            ConfigFactory.load();
+        }
+
         environment.getApplicationContext().setContextPath("/rest");
         environment.getObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/resources/application.conf
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/resources/application.conf b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/resources/application.conf
index c04a4ab..97edc5a 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/resources/application.conf
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/resources/application.conf
@@ -15,7 +15,7 @@
 
 {
 	"coordinator" : {
-		"policiesPerBolt" : 5,
+		"policiesPerBolt" : 30,
 		"boltParallelism" : 5,
 		"policyDefaultParallelism" : 5,
 		"boltLoadUpbound": 0.8,

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/resources/log4j.properties b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/resources/log4j.properties
index d4bc126..dd4407b 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/resources/log4j.properties
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/main/resources/log4j.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-log4j.rootLogger=INFO, stdout
+log4j.rootLogger=ERROR, stdout
 
 # standard output
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
index 2985600..4c143ec 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
@@ -352,6 +352,7 @@
 								<exclude>**/*.project</exclude>
 								<exclude>**/*.prefs</exclude>
 								<exclude>**/*.iml</exclude>
+								<exclude>**/*.orig</exclude>
 								<exclude>**/MANIFEST.MF</exclude>
 								<exclude>**/dependency-reduced-pom.xml</exclude>
                                                                 <exclude>**/target/**</exclude>`

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/TestHBaseBase.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/TestHBaseBase.java b/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/TestHBaseBase.java
index ef8a9c9..1612eed 100644
--- a/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/TestHBaseBase.java
+++ b/eagle-core/eagle-embed/eagle-embed-hbase/src/test/java/org/apache/eagle/service/hbase/TestHBaseBase.java
@@ -20,6 +20,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.Ignore;
 
+@Ignore
 public class TestHBaseBase {
     protected static EmbeddedHbase hbase;
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java b/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java
index 7384c70..0f5a049 100755
--- a/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java
+++ b/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java
@@ -38,6 +38,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+@Ignore
 public class TestListQueryResource extends TestHBaseBase {
 
 	HTableInterface table;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/TestHBaseStatement.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/TestHBaseStatement.java b/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/TestHBaseStatement.java
index f8e6c23..9b6dfe7 100644
--- a/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/TestHBaseStatement.java
+++ b/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/TestHBaseStatement.java
@@ -40,6 +40,7 @@ import org.apache.eagle.common.DateTimeUtil;
 /**
  * @since 3/23/15
  */
+@Ignore
 public class TestHBaseStatement extends TestHBaseBase {
 
     EntityDefinition entityDefinition;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/aggregate/coprocessor/TestGroupAggregateClient.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/aggregate/coprocessor/TestGroupAggregateClient.java b/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/aggregate/coprocessor/TestGroupAggregateClient.java
index 71c1110..2a9ed0d 100755
--- a/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/aggregate/coprocessor/TestGroupAggregateClient.java
+++ b/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/aggregate/coprocessor/TestGroupAggregateClient.java
@@ -53,6 +53,7 @@ import org.apache.eagle.service.hbase.TestHBaseBase;
 /**
  * @since : 10/30/14,2014
  */
+@Ignore
 public class TestGroupAggregateClient extends TestHBaseBase {
 	HTableInterface table;
 	long startTime;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f0af3e5d/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/aggregate/coprocessor/TestGroupAggregateTimeSeriesClient.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/aggregate/coprocessor/TestGroupAggregateTimeSeriesClient.java b/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/aggregate/coprocessor/TestGroupAggregateTimeSeriesClient.java
index e7c7b3b..d61c974 100755
--- a/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/aggregate/coprocessor/TestGroupAggregateTimeSeriesClient.java
+++ b/eagle-core/eagle-query/eagle-storage-hbase/src/test/java/org/apache/eagle/storage/hbase/aggregate/coprocessor/TestGroupAggregateTimeSeriesClient.java
@@ -49,6 +49,7 @@ import org.apache.eagle.storage.hbase.query.coprocessor.impl.AggregateClientImpl
 /**
  * @since : 11/10/14,2014
  */
+@Ignore
 public class TestGroupAggregateTimeSeriesClient extends TestHBaseBase {
 
 	private final static Logger LOG = LoggerFactory.getLogger(TestGroupAggregateTimeSeriesClient.class);


Mime
View raw message