You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2015/06/21 10:17:14 UTC
[1/2] ambari git commit: AMBARI-12046. Aggregate alerts not working.
(mpapirkovskyy)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 5e8e94cb5 -> 60412db3a
refs/heads/trunk 968e35025 -> 71617d03d
AMBARI-12046. Aggregate alerts not working. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/71617d03
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/71617d03
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/71617d03
Branch: refs/heads/trunk
Commit: 71617d03db094fd152cc478cf1a8d526a6e8d1fb
Parents: 968e350
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Sun Jun 21 11:15:08 2015 +0300
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Sun Jun 21 11:15:08 2015 +0300
----------------------------------------------------------------------
.../apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java | 1 +
.../java/org/apache/ambari/server/alerts/StaleAlertRunnable.java | 1 +
.../server/events/listeners/alerts/AlertReceivedListener.java | 4 ++--
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/71617d03/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java b/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java
index da4a0c1..0611e23 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java
@@ -170,6 +170,7 @@ public class AgentHeartbeatAlertRunnable implements Runnable {
alert.setLabel(entity.getLabel());
alert.setText(alertText);
alert.setTimestamp(alertTimestamp);
+ alert.setCluster(cluster.getClusterName());
AlertReceivedEvent event = new AlertReceivedEvent(
cluster.getClusterId(), alert);
http://git-wip-us.apache.org/repos/asf/ambari/blob/71617d03/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java b/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java
index e23dd62..206b2ca 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java
@@ -197,6 +197,7 @@ public class StaleAlertRunnable implements Runnable {
alert.setLabel(entity.getLabel());
alert.setText(alertText);
alert.setTimestamp(now);
+ alert.setCluster(cluster.getClusterName());
AlertReceivedEvent event = new AlertReceivedEvent(
cluster.getClusterId(), alert);
http://git-wip-us.apache.org/repos/asf/ambari/blob/71617d03/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
index 0dd14cb..b4d4302 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
@@ -123,8 +123,8 @@ public class AlertReceivedListener {
Long clusterId = getClusterIdByName(alert.getCluster());
if (clusterId == null) {
- LOG.warn("Null cluster id is not supported for alerts as of now"); //based on listener implementation
- continue;
+ //check event
+ clusterId = event.getClusterId();
}
AlertDefinitionEntity definition = m_definitionDao.findByName(clusterId,
[2/2] ambari git commit: AMBARI-12046. Aggregate alerts not working.
(mpapirkovskyy)
Posted by mp...@apache.org.
AMBARI-12046. Aggregate alerts not working. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/60412db3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/60412db3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/60412db3
Branch: refs/heads/branch-2.1
Commit: 60412db3a99f9b59e5e4259916b36b6721150713
Parents: 5e8e94c
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Sun Jun 21 11:15:08 2015 +0300
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Sun Jun 21 11:16:02 2015 +0300
----------------------------------------------------------------------
.../apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java | 1 +
.../java/org/apache/ambari/server/alerts/StaleAlertRunnable.java | 1 +
.../server/events/listeners/alerts/AlertReceivedListener.java | 4 ++--
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/60412db3/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java b/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java
index da4a0c1..0611e23 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/alerts/AgentHeartbeatAlertRunnable.java
@@ -170,6 +170,7 @@ public class AgentHeartbeatAlertRunnable implements Runnable {
alert.setLabel(entity.getLabel());
alert.setText(alertText);
alert.setTimestamp(alertTimestamp);
+ alert.setCluster(cluster.getClusterName());
AlertReceivedEvent event = new AlertReceivedEvent(
cluster.getClusterId(), alert);
http://git-wip-us.apache.org/repos/asf/ambari/blob/60412db3/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java b/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java
index e23dd62..206b2ca 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java
@@ -197,6 +197,7 @@ public class StaleAlertRunnable implements Runnable {
alert.setLabel(entity.getLabel());
alert.setText(alertText);
alert.setTimestamp(now);
+ alert.setCluster(cluster.getClusterName());
AlertReceivedEvent event = new AlertReceivedEvent(
cluster.getClusterId(), alert);
http://git-wip-us.apache.org/repos/asf/ambari/blob/60412db3/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
index 0dd14cb..b4d4302 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
@@ -123,8 +123,8 @@ public class AlertReceivedListener {
Long clusterId = getClusterIdByName(alert.getCluster());
if (clusterId == null) {
- LOG.warn("Null cluster id is not supported for alerts as of now"); //based on listener implementation
- continue;
+ //check event
+ clusterId = event.getClusterId();
}
AlertDefinitionEntity definition = m_definitionDao.findByName(clusterId,