AMBARI-1347. Expose host-level alerts via nagios_alerts.php with associated service component names. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1442834 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -40,6 +40,9 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-1347. Expose host-level alerts via nagios_alerts.php with associated
+ service component names. (yusaku)
+   
  AMBARI-1348. Externalize strings to messages.js. (yusaku)
 
  AMBARI-1342. Hive client is not installed on Nagios server host.

contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php

@@ -301,7 +301,16 @@ function hdp_mon_generate_response( $response_data )
           }
           $servicestatus['service_type'] = get_service_type($servicestatus['service_description']);
           $srv_desc = explode ("::",$servicestatus['service_description'],2);
-          $servicestatus['service_description'] = $srv_desc[1];
+
+          switch ($srv_desc[0]) {
+            case "DATANODE":
+            case "TASKTRACKER":
+            case "REGIONSERVER":
+              $servicestatus['service_description'] = $srv_desc[0] . ' ' . $srv_desc[1];
+              break;
+            default:
+              $servicestatus['service_description'] = $srv_desc[1];
+          }
         }
         break;
       case "nok":
@@ -362,18 +371,25 @@ function hdp_mon_generate_response( $response_data )
   {
     $pieces = explode("::", $service_description);
     switch ($pieces[0]) {
+	  case "DATANODE":
       case "NAMENODE":
         $pieces[0] = "HDFS";
         break;
       case "JOBTRACKER":
+	  case "TASKTRACKER":
         $pieces[0] = "MAPREDUCE";
         break;
       case "HBASEMASTER":
+      case "REGIONSERVER":
         $pieces[0] = "HBASE";
         break;
       case "HIVE-METASTORE":
         $pieces[0] = "HIVE";
         break;
+      case "ZKSERVERS":
+	    $pieces[0] = "ZOOKEEPER";
+        break;
+      case "NAGIOS":
       case "HDFS":
       case "MAPREDUCE":
       case "HBASE":