Repository: eagle Updated Branches: refs/heads/master 798c2e840 -> dc38466c6
[EAGLE-1017] New further: support for query alert of a specific machine. New further: support for query alert of a specific machine. modified: - eagle-core/eagle-alert-parent/eagle-alert-app/src/main/java/org/apache/eagle/alert/app/AlertEagleStorePlugin.java - eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/engine/model/AlertPublishEvent.java Involved modules: eagle-core The jira ticket link is: https://issues.apache.org/jira/browse/EAGLE-1017 Author: It_Ds_N.cpp <[email protected]> Closes #930 from 6591812/master. Project: http://git-wip-us.apache.org/repos/asf/eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/dc38466c Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/dc38466c Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/dc38466c Branch: refs/heads/master Commit: dc38466c6415eec3876a19ede84d4f8b6e1ce5b2 Parents: 798c2e8 Author: It_Ds_N.cpp <[email protected]> Authored: Sun Oct 22 11:17:21 2017 +0800 Committer: Hao Chen <[email protected]> Committed: Sun Oct 22 11:17:21 2017 +0800 ---------------------------------------------------------------------- .../org/apache/eagle/alert/app/AlertEagleStorePlugin.java | 10 ++++++++++ .../eagle/alert/engine/model/AlertPublishEvent.java | 1 + 2 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/eagle/blob/dc38466c/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/java/org/apache/eagle/alert/app/AlertEagleStorePlugin.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/java/org/apache/eagle/alert/app/AlertEagleStorePlugin.java b/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/java/org/apache/eagle/alert/app/AlertEagleStorePlugin.java index 0b58bf7..d0e1382 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/java/org/apache/eagle/alert/app/AlertEagleStorePlugin.java +++ b/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/java/org/apache/eagle/alert/app/AlertEagleStorePlugin.java @@ -83,6 +83,16 @@ public class AlertEagleStorePlugin extends AbstractPublishPlugin implements Aler tags.put(ALERT_ID_KEY, event.getAlertId()); tags.put(ALERT_CATEGORY, event.getCategory()); tags.put(ALERT_SEVERITY, event.getSeverity().toString()); + + String host = event.getDataMap().getOrDefault("host", "null").toString(); + String hostname = event.getDataMap().getOrDefault("hostname", "null").toString(); + + if (host != "null") { + tags.put(ALERT_HOST, host); + } else { + tags.put(ALERT_HOST, hostname); + } + if (event.getContext() != null && !event.getContext().isEmpty()) { tags.put(SITE_ID_KEY, event.getContext().get(SITE_ID_KEY).toString()); alertEvent.setPolicyValue(event.getContext().get(POLICY_VALUE_KEY).toString()); http://git-wip-us.apache.org/repos/asf/eagle/blob/dc38466c/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/engine/model/AlertPublishEvent.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/engine/model/AlertPublishEvent.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/engine/model/AlertPublishEvent.java index a794e49..eee98ec 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/engine/model/AlertPublishEvent.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/engine/model/AlertPublishEvent.java @@ -48,6 +48,7 @@ public class AlertPublishEvent { public static final String POLICY_VALUE_KEY = "policyValue"; public static final String ALERT_CATEGORY = "category"; public static final String ALERT_SEVERITY = "severity"; + public static final String ALERT_HOST = "host"; public String getAlertId() { return alertId;
