Merge pull request #691 from jshaughn/alerts-1.3.2

HWKMETRICS-540 Update to Alerting 1.3.2
hawkular · Nov 8, 2016 · 196052a · 196052a
2 parents 397841c + d70d711
commit 196052a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/alerting/alerter-war/src/main/java/org/hawkular/metrics/alerter/ExpressionManager.java b/alerting/alerter-war/src/main/java/org/hawkular/metrics/alerter/ExpressionManager.java
@@ -17,6 +17,7 @@
 package org.hawkular.metrics.alerter;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -409,7 +410,7 @@ public void evaluate(Double value) {
                 if (log.isDebugEnabled()) {
                     log.debug("Sending External Condition Data to Alerts! " + externalData);
                 }
-                alerts.sendData(externalData);
+                alerts.sendData(Collections.singleton(externalData));
 
             } catch (Exception e) {
                 log.error("Failed to send external data to alerts system.", e);

diff --git a/alerting/alerting-jar/src/test/java/org/hawkular/alerts/api/services/AlertsServiceMock.java b/alerting/alerting-jar/src/test/java/org/hawkular/alerts/api/services/AlertsServiceMock.java
@@ -134,21 +134,11 @@ public void resolveAlertsForTrigger(String tenantId, String triggerId, String re
 
     }
 
-    @Override
-    public void sendData(Data data) throws Exception {
-        DATA.add(data);
-    }
-
     @Override
     public void sendData(Collection<Data> data) throws Exception {
         DATA.addAll(data);
     }
 
-    @Override
-    public void sendEvent(Event event) throws Exception {
-
-    }
-
     @Override
     public void sendEvents(Collection<Event> events) throws Exception {
 

diff --git a/dist/component/component-war/src/main/webapp/WEB-INF/web.xml b/dist/component/component-war/src/main/webapp/WEB-INF/web.xml
@@ -21,6 +21,16 @@
          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
          version="3.1">
 
+  <resource-env-ref>
+    <resource-env-ref-name>container/hawkular-metrics</resource-env-ref-name>
+    <lookup-name>java:jboss/infinispan/container/hawkular-metrics</lookup-name>
+  </resource-env-ref>
+
+  <resource-env-ref>
+    <resource-env-ref-name>cache/locks</resource-env-ref-name>
+    <lookup-name>java:jboss/infinispan/cache/hawkular-metrics/locks</lookup-name>
+  </resource-env-ref>
+
   <servlet>
     <servlet-name>staticContent</servlet-name>
     <servlet-class>io.undertow.servlet.handlers.DefaultServlet</servlet-class>

diff --git a/pom.xml b/pom.xml
@@ -99,7 +99,7 @@
     <!-- Dependencies versions -->
     <version.org.cassalog>0.4.1</version.org.cassalog>
     <version.org.hawkular.accounts>2.0.26.Final</version.org.hawkular.accounts>
-    <version.org.hawkular.alerts>1.3.1.Final</version.org.hawkular.alerts>
+    <version.org.hawkular.alerts>1.3.2.Final</version.org.hawkular.alerts>
     <version.org.hawkular.commons>0.7.10.Final</version.org.hawkular.commons>
     <version.javax.enterprise.cdi-api>1.2</version.javax.enterprise.cdi-api>
     <version.joda-time>2.7</version.joda-time>