You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/07/07 14:49:49 UTC
[2/2] ambari git commit: AMBARI-12306. Some alerts report cluster
name to be null (aonishuk)
AMBARI-12306. Some alerts report cluster name to be null (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6f097c93
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6f097c93
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6f097c93
Branch: refs/heads/branch-2.1
Commit: 6f097c93a38d6573c4713ed420c1a8d6e85c878f
Parents: ef71690
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Jul 7 15:49:39 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Jul 7 15:49:39 2015 +0300
----------------------------------------------------------------------
.../listeners/alerts/AlertAggregateListener.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f097c93/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
index ac2f907..0bcfa2f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
@@ -22,6 +22,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import com.google.inject.Provider;
+import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.EagerSingleton;
import org.apache.ambari.server.events.AggregateAlertRecalculateEvent;
import org.apache.ambari.server.events.AlertReceivedEvent;
@@ -32,6 +34,7 @@ import org.apache.ambari.server.orm.dao.AlertSummaryDTO;
import org.apache.ambari.server.orm.dao.AlertsDAO;
import org.apache.ambari.server.state.Alert;
import org.apache.ambari.server.state.AlertState;
+import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.alert.AggregateDefinitionMapping;
import org.apache.ambari.server.state.alert.AggregateSource;
import org.apache.ambari.server.state.alert.AlertDefinition;
@@ -68,6 +71,12 @@ public class AlertAggregateListener {
private AlertsDAO m_alertsDao = null;
/**
+ * Used for looking cluster name by cluster id
+ */
+ @Inject
+ Provider<Clusters> m_clusters;
+
+ /**
* The event publisher used to receive incoming events and publish new events
* when an aggregate alert is run.
*/
@@ -168,6 +177,11 @@ public class AlertAggregateListener {
aggregateAlert.setLabel(aggregateDefinition.getLabel());
aggregateAlert.setTimestamp(System.currentTimeMillis());
+ try {
+ aggregateAlert.setCluster(m_clusters.get().getClusterById(clusterId).getClusterName());
+ } catch (AmbariException exception) {
+ LOG.error("Unable to lookup cluster with ID {}", clusterId, exception);
+ }
if (0 == totalCount) {
aggregateAlert.setText("There are no instances of the aggregated alert.");