AMBARI-2245. Fix for nagios showing UNKNOWN for YARN and MR2

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/branch-1.4.0@1488273 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -23,6 +23,8 @@ Branch 1.4.0:
 
  BUG FIXES
 
+ AMBARI-2245. Fix for nagios showing UNKNOWN for YARN and MR2. (ncole)
+
  AMBARI-2242. Add 2.0.1 stack definition as a test resources. (smohanty)
 
  AMBARI-2241. OOZIE support in hadoop 2.0. (smohanty)

ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb

@@ -440,7 +440,7 @@ define service {
 define service {
         hostgroup_name          historyserver2
         use                     hadoop-service
-        service_description     HISTORYSERVER2::History Server 2 Web UI down
+        service_description     HISTORYSERVER::History Server 2 Web UI down
         servicegroups           MAPREDUCE
         check_command           check_webui!historyserver2!<%=scope.function_hdp_template_var("hs_port")%>
         normal_check_interval   1

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

@@ -386,6 +386,13 @@ function hdp_mon_generate_response( $response_data )
       case "AMBARI":
 	    $pieces[0] = "AMBARI";
       break;      
+      case "JOBHISTORY":
+        $pieces[0] = "MAPREDUCE2";
+        break;
+      case "RESOURCEMANAGER":
+      case "NODEMANAGER":
+        $pieces[0] = "YARN";
+        break;
       case "NAGIOS":
       case "HDFS":
       case "MAPREDUCE":