You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2013/05/31 17:26:36 UTC
svn commit: r1488273 - in /incubator/ambari/branches/branch-1.4.0:
CHANGES.txt
ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb
contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
Author: ncole
Date: Fri May 31 15:26:36 2013
New Revision: 1488273
URL: http://svn.apache.org/r1488273
Log:
AMBARI-2245. Fix for nagios showing UNKNOWN for YARN and MR2
Modified:
incubator/ambari/branches/branch-1.4.0/CHANGES.txt
incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb
incubator/ambari/branches/branch-1.4.0/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
Modified: incubator/ambari/branches/branch-1.4.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/CHANGES.txt?rev=1488273&r1=1488272&r2=1488273&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/CHANGES.txt (original)
+++ incubator/ambari/branches/branch-1.4.0/CHANGES.txt Fri May 31 15:26:36 2013
@@ -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)
Modified: incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb?rev=1488273&r1=1488272&r2=1488273&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb Fri May 31 15:26:36 2013
@@ -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
Modified: incubator/ambari/branches/branch-1.4.0/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php?rev=1488273&r1=1488272&r2=1488273&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php (original)
+++ incubator/ambari/branches/branch-1.4.0/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php Fri May 31 15:26:36 2013
@@ -386,6 +386,13 @@ function hdp_mon_generate_response( $res
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":