You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/07/22 11:14:09 UTC

[3/3] karaf-decanter git commit: Add alert attribute and pattern in the SLA alert event

Add alert attribute and pattern in the SLA alert event


Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/3ecde07d
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/3ecde07d
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/3ecde07d

Branch: refs/heads/master
Commit: 3ecde07db11c205f8d4b3df605572ddfce1d254a
Parents: c8aca49
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jul 22 11:13:43 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jul 22 11:13:43 2015 +0200

----------------------------------------------------------------------
 .../java/org/apache/karaf/decanter/sla/checker/Checker.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/3ecde07d/sla/checker/src/main/java/org/apache/karaf/decanter/sla/checker/Checker.java
----------------------------------------------------------------------
diff --git a/sla/checker/src/main/java/org/apache/karaf/decanter/sla/checker/Checker.java b/sla/checker/src/main/java/org/apache/karaf/decanter/sla/checker/Checker.java
index 057fe78..3b8ea75 100644
--- a/sla/checker/src/main/java/org/apache/karaf/decanter/sla/checker/Checker.java
+++ b/sla/checker/src/main/java/org/apache/karaf/decanter/sla/checker/Checker.java
@@ -52,7 +52,7 @@ public class Checker implements EventHandler {
                 String pattern = (String) config.get(name + ".error");
                 Object value = collectEvent.getProperty(name);
                 if (!validate(pattern, value)) {
-                    Event alertEvent = populateAlertEvent("error", collectEvent);
+                    Event alertEvent = populateAlertEvent("error", collectEvent, name, pattern);
                     eventAdmin.postEvent(alertEvent);
                 }
             }
@@ -62,16 +62,18 @@ public class Checker implements EventHandler {
                 String pattern = (String) config.get(name + ".warn");
                 Object value = collectEvent.getProperty(name);
                 if (!validate(pattern, value)) {
-                    Event alertEvent = populateAlertEvent("warn", collectEvent);
+                    Event alertEvent = populateAlertEvent("warn", collectEvent, name, pattern);
                     eventAdmin.postEvent(alertEvent);
                 }
             }
         }
     }
 
-    private Event populateAlertEvent(String level, Event collectEvent) {
+    private Event populateAlertEvent(String level, Event collectEvent, String attribute, String pattern) {
         Map<String, Object> data = new HashMap<>();
         data.put("alertLevel", level);
+        data.put("alertAttribute", attribute);
+        data.put("alertPattern", pattern);
         for (String name : collectEvent.getPropertyNames()) {
             data.put(name, collectEvent.getProperty(name));
         }