[23/50] [abbrv] git commit: AMBARI-7316 - Alerts: Create Alert Notices For Incoming Alert State Changes (jonathanhurley)

2014-10-06 Thread jonathanhurley 
AMBARI-7316 - Alerts: Create Alert Notices For Incoming Alert State Changes 
(jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/760bedfe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/760bedfe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/760bedfe

Branch: refs/heads/trunk
Commit: 760bedfe32f2a673a14cc14e7f2d41794ca3db98
Parents: aaf0513
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Mon Sep 15 14:04:42 2014 -0400
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Mon Sep 15 14:04:42 2014 -0400

--
 .../ambari/server/agent/HeartBeatHandler.java   |  20 ++-
 .../server/controller/ControllerModule.java |  15 ++
 .../apache/ambari/server/events/AlertEvent.java |  58 +++
 .../server/events/AlertReceivedEvent.java   |  50 +++
 .../server/events/AlertStateChangeEvent.java|  85 +++
 .../events/listeners/AlertReceivedListener.java | 150 +++
 .../listeners/AlertStateChangedListener.java|  98 
 .../events/publishers/AlertEventPublisher.java  | 100 +
 .../ambari/server/orm/dao/AlertDispatchDAO.java |  22 +++
 .../server/orm/entities/AlertGroupEntity.java   |   7 +-
 .../org/apache/ambari/server/state/Alert.java   |  55 ---
 .../server/state/cluster/AlertDataManager.java  | 111 --
 .../server/orm/dao/AlertDispatchDAOTest.java|  29 
 .../state/cluster/AlertDataManagerTest.java | 129 
 14 files changed, 753 insertions(+), 176 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/760bedfe/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index 492d832..a366301 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@ -39,6 +39,9 @@ import org.apache.ambari.server.actionmanager.HostRoleStatus;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.MaintenanceStateHelper;
+import org.apache.ambari.server.events.AlertEvent;
+import org.apache.ambari.server.events.AlertReceivedEvent;
+import org.apache.ambari.server.events.publishers.AlertEventPublisher;
 import org.apache.ambari.server.metadata.ActionMetadata;
 import org.apache.ambari.server.state.AgentVersion;
 import org.apache.ambari.server.state.Alert;
@@ -60,7 +63,6 @@ import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.State;
 import org.apache.ambari.server.state.alert.AlertDefinition;
 import org.apache.ambari.server.state.alert.AlertDefinitionHash;
-import org.apache.ambari.server.state.cluster.AlertDataManager;
 import org.apache.ambari.server.state.fsm.InvalidStateTransitionException;
 import org.apache.ambari.server.state.host.HostHealthyHeartbeatEvent;
 import org.apache.ambari.server.state.host.HostRegistrationRequestEvent;
@@ -115,9 +117,12 @@ public class HeartBeatHandler {
 
   @Inject
   private AlertDefinitionHash alertDefinitionHash;
-  
+
+  /**
+   * Publishes {@link AlertEvent} instances.
+   */
   @Inject
-  private AlertDataManager alertManager;
+  private AlertEventPublisher alertEventPublisher;
 
   private MapString, Long hostResponseIds = new ConcurrentHashMapString, 
Long();
 
@@ -236,13 +241,16 @@ public class HeartBeatHandler {
 if (null == hostname || null == heartbeat) {
   return;
 }
-
+
 if (null != heartbeat.getAlerts()) {
   for (Alert alert : heartbeat.getAlerts()) {
-if (null == alert.getHost())
+if (null == alert.getHost()) {
   alert.setHost(hostname);
+}
+
 Cluster cluster = clusterFsm.getCluster(alert.getCluster());
-alertManager.add(cluster.getClusterId(), alert);
+AlertEvent event = new AlertReceivedEvent(cluster.getClusterId(), 
alert);
+alertEventPublisher.publish(event);
   }
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/760bedfe/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
index c395df6..8413762 100644
---

git commit: AMBARI-7316 - Alerts: Create Alert Notices For Incoming Alert State Changes (jonathanhurley)

2014-09-16 Thread jonathanhurley 
Repository: ambari
Updated Branches:
  refs/heads/branch-alerts-dev aaf051357 - 760bedfe3


AMBARI-7316 - Alerts: Create Alert Notices For Incoming Alert State Changes 
(jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/760bedfe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/760bedfe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/760bedfe

Branch: refs/heads/branch-alerts-dev
Commit: 760bedfe32f2a673a14cc14e7f2d41794ca3db98
Parents: aaf0513
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Mon Sep 15 14:04:42 2014 -0400
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Mon Sep 15 14:04:42 2014 -0400

--
 .../ambari/server/agent/HeartBeatHandler.java   |  20 ++-
 .../server/controller/ControllerModule.java |  15 ++
 .../apache/ambari/server/events/AlertEvent.java |  58 +++
 .../server/events/AlertReceivedEvent.java   |  50 +++
 .../server/events/AlertStateChangeEvent.java|  85 +++
 .../events/listeners/AlertReceivedListener.java | 150 +++
 .../listeners/AlertStateChangedListener.java|  98 
 .../events/publishers/AlertEventPublisher.java  | 100 +
 .../ambari/server/orm/dao/AlertDispatchDAO.java |  22 +++
 .../server/orm/entities/AlertGroupEntity.java   |   7 +-
 .../org/apache/ambari/server/state/Alert.java   |  55 ---
 .../server/state/cluster/AlertDataManager.java  | 111 --
 .../server/orm/dao/AlertDispatchDAOTest.java|  29 
 .../state/cluster/AlertDataManagerTest.java | 129 
 14 files changed, 753 insertions(+), 176 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/760bedfe/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index 492d832..a366301 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@ -39,6 +39,9 @@ import org.apache.ambari.server.actionmanager.HostRoleStatus;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.MaintenanceStateHelper;
+import org.apache.ambari.server.events.AlertEvent;
+import org.apache.ambari.server.events.AlertReceivedEvent;
+import org.apache.ambari.server.events.publishers.AlertEventPublisher;
 import org.apache.ambari.server.metadata.ActionMetadata;
 import org.apache.ambari.server.state.AgentVersion;
 import org.apache.ambari.server.state.Alert;
@@ -60,7 +63,6 @@ import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.State;
 import org.apache.ambari.server.state.alert.AlertDefinition;
 import org.apache.ambari.server.state.alert.AlertDefinitionHash;
-import org.apache.ambari.server.state.cluster.AlertDataManager;
 import org.apache.ambari.server.state.fsm.InvalidStateTransitionException;
 import org.apache.ambari.server.state.host.HostHealthyHeartbeatEvent;
 import org.apache.ambari.server.state.host.HostRegistrationRequestEvent;
@@ -115,9 +117,12 @@ public class HeartBeatHandler {
 
   @Inject
   private AlertDefinitionHash alertDefinitionHash;
-  
+
+  /**
+   * Publishes {@link AlertEvent} instances.
+   */
   @Inject
-  private AlertDataManager alertManager;
+  private AlertEventPublisher alertEventPublisher;
 
   private MapString, Long hostResponseIds = new ConcurrentHashMapString, 
Long();
 
@@ -236,13 +241,16 @@ public class HeartBeatHandler {
 if (null == hostname || null == heartbeat) {
   return;
 }
-
+
 if (null != heartbeat.getAlerts()) {
   for (Alert alert : heartbeat.getAlerts()) {
-if (null == alert.getHost())
+if (null == alert.getHost()) {
   alert.setHost(hostname);
+}
+
 Cluster cluster = clusterFsm.getCluster(alert.getCluster());
-alertManager.add(cluster.getClusterId(), alert);
+AlertEvent event = new AlertReceivedEvent(cluster.getClusterId(), 
alert);
+alertEventPublisher.publish(event);
   }
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/760bedfe/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
index