HWKALERTS-133 migrate CommandEventListener to Hawkular

- remove listener - remove deps on inventory and cmdgw - also, quiet some logging
hawkular · Feb 15, 2016 · 9c29c91 · 9c29c91
1 parent 1cdbb2f
commit 9c29c91
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 119 deletions.
diff --git a/hawkular-alerts-bus/pom.xml b/hawkular-alerts-bus/pom.xml
@@ -33,13 +33,6 @@
 
   <dependencies>
 
-    <!-- Hawkular Command Gateway dependencies -->
-    <dependency>
-      <groupId>org.hawkular.cmdgw</groupId>
-      <artifactId>hawkular-command-gateway-api</artifactId>
-      <version>${version.org.hawkular.cmdgw}</version>
-    </dependency>
-
     <!-- Hawkular Alerts dependencies -->
     <dependency>
       <groupId>org.hawkular.alerts</groupId>
@@ -59,13 +52,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <!-- Hawkular dependencies -->
-    <dependency>
-      <groupId>org.hawkular.inventory</groupId>
-      <artifactId>hawkular-inventory-api</artifactId>
-      <version>${version.org.hawkular.inventory}</version>
-    </dependency>
-
     <!-- Hawkular Nest dependencies -->
     <dependency>
       <groupId>org.hawkular.commons</groupId>
@@ -74,13 +60,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>${version.com.google.guava}</version>
-      <scope>provided</scope>
-    </dependency>
-
     <!-- Wildfly dependencies -->
     <dependency>
       <groupId>javax</groupId>

diff --git a/hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/CommandEventListener.java b/hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/CommandEventListener.java
diff --git a/hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.java b/hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.java
@@ -82,11 +82,16 @@ protected void onBasicMessage(MetricDataMessage msg) {
         Set<String> activeMetricIds = cacheManager.getActiveDataIds();
         for (SingleMetric m : data) {
             if (isNeeded(activeMetricIds, m.getSource())) {
+                if (log.isTraceEnabled()) {
+                    log.tracef("KEEPING METRIC [%s:%s]", m.getSource(), String.valueOf(m.getValue()));
+                }
                 if (null == alertData) {
                     alertData = new ArrayList<>(data.size());
                 }
                 alertData.add(Data.forNumeric(metricData.getTenantId(), m.getSource(), m.getTimestamp(),
                         m.getValue()));
+            } else if (log.isTraceEnabled()) {
+                log.tracef("TOSSING METRIC [%s]", m.getSource());
             }
         }
         if (null == alertData) {

diff --git a/pom.xml b/pom.xml
@@ -92,10 +92,8 @@
     <version.org.drools>6.3.0.Final</version.org.drools>
     <version.org.freemarker>2.3.17</version.org.freemarker>
     <version.org.hawkular.accounts>2.0.21.Final</version.org.hawkular.accounts>
-    <version.org.hawkular.cmdgw>0.10.11.Final-SRC-revision-6858e69c9543587bcc15da618c6cec80b08dd108</version.org.hawkular.cmdgw>
     <version.org.hawkular.commons>0.3.5.Final</version.org.hawkular.commons>
-    <version.org.hawkular.inventory>0.13.0.Final-SRC-revision-8030a5aa969e3ff5bab534112ea2b5b91c8088d7</version.org.hawkular.inventory>
-    <version.org.hawkular.metrics>0.13.0-SRC-revision-c9260099383bcaab020b9623dff7baa1a421e73e</version.org.hawkular.metrics>
+    <version.org.hawkular.metrics>0.12.0.Final</version.org.hawkular.metrics>
     <version.org.infinispan.wildfly>8.0.1.Final</version.org.infinispan.wildfly>
     <version.org.infinispan.eap64>5.2.9.Final</version.org.infinispan.eap64>
     <version.org.jboss.jboss-vfs>3.2.10.Final</version.org.jboss.jboss-vfs>