Mailing-List: contact commits-help@eagle.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@eagle.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ralphsu@apache.org
To: commits@eagle.incubator.apache.org
Date: Fri, 09 Sep 2016 11:45:34 -0000
Message-Id: <113e4d0cc4b24326a6cf3439f4167040@git.apache.org>
Subject: [1/2] incubator-eagle git commit: EAGLE-531: Dedup alerts according
 to state change
archived-at: Fri, 09 Sep 2016 11:45:40 -0000

Repository: incubator-eagle
Updated Branches:
  refs/heads/master 4e7c5f2b7 -> 7f41d4278


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/7f41d427/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/application-mongo-statestore.conf
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/application-mongo-statestore.conf b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/application-mongo-statestore.conf
new file mode 100644
index 0000000..8504b35
--- /dev/null
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/application-mongo-statestore.conf
@@ -0,0 +1,17 @@
+# 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.
+{
+	"connection": "mongodb://localhost:27017"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/7f41d427/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/application-test.conf
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/application-test.conf b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/application-test.conf
index 61b6b49..dc016f4 100755
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/application-test.conf
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/application-test.conf
@@ -64,5 +64,6 @@
         "index": "alert_metric_test"
       }
     }
-  }
+  },
+  "connection": "mongodb://localhost:27017"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/7f41d427/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/router/publishments-empty-dedup-field.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/router/publishments-empty-dedup-field.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/router/publishments-empty-dedup-field.json
index f573034..56c4686 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/router/publishments-empty-dedup-field.json
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/router/publishments-empty-dedup-field.json
@@ -16,6 +16,8 @@
       "smtp.port": "25"
     },
     "dedupIntervalMin": "PT1M",
+    "dedupStateField": "state",
+  	"dedupStateCloseValue": "CLOSE",
     "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/7f41d427/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/router/publishments.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/router/publishments.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/router/publishments.json
index 82a338d..d93b8e2 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/router/publishments.json
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/router/publishments.json
@@ -19,6 +19,8 @@
     "dedupFields": [
       "appname"
     ],
+    "dedupStateField": "state",
+  	"dedupStateCloseValue": "CLOSE",
     "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/7f41d427/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 c5ed464..2ad8576 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
@@ -33,6 +33,10 @@
         <module>alert-service</module>
     </modules>
 
+	<properties>
+		<embed.mongo.version>1.50.5</embed.mongo.version>
+	</properties>
+	
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -291,6 +295,17 @@
                 <artifactId>commons-cli</artifactId>
                 <version>${common.cli.version}</version>
             </dependency>
+            <dependency>
+            	<groupId>org.mongodb</groupId>
+	            <artifactId>mongo-java-driver</artifactId>
+	            <version>${mongodb.version}</version>
+	        </dependency>
+			<dependency>
+	 			<groupId>de.flapdoodle.embed</groupId>
+	 			<artifactId>de.flapdoodle.embed.mongo</artifactId>
+	 			<version>${embed.mongo.version}</version>
+	 			<scope>test</scope>
+	 		</dependency>
         </dependencies>
     </dependencyManagement>
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/7f41d427/eagle-dev/checkstyle.xml
----------------------------------------------------------------------
diff --git a/eagle-dev/checkstyle.xml b/eagle-dev/checkstyle.xml
index b292542..1ff1d87 100644
--- a/eagle-dev/checkstyle.xml
+++ b/eagle-dev/checkstyle.xml
@@ -197,12 +197,14 @@
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>
 
+        <!--
         <module name="CustomImportOrder">
             <property name="specialImportsRegExp" value="org.apache.eagle"/>
             <property name="sortImportsInGroupAlphabetically" value="true"/>
             <property name="separateLineBetweenGroups" value="false"/>
             <property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
         </module>
+        -->
 
         <module name="MethodParamPad"/>
         <module name="OperatorWrap">

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/7f41d427/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0b9eeac..55f617b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
         <version>14</version>
-    </parent>
+    </parent> 
     <groupId>org.apache.eagle</groupId>
     <artifactId>eagle-parent</artifactId>
     <version>0.5.0-incubating-SNAPSHOT</version>