You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/02/06 03:14:49 UTC
svn commit: r1442834 - in /incubator/ambari/trunk: CHANGES.txt
contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
Author: yusaku
Date: Wed Feb 6 02:14:49 2013
New Revision: 1442834
URL: http://svn.apache.org/viewvc?rev=1442834&view=rev
Log:
AMBARI-1347. Expose host-level alerts via nagios_alerts.php with associated service component names. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1442834&r1=1442833&r2=1442834&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Feb 6 02:14:49 2013
@@ -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.
Modified: incubator/ambari/trunk/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php?rev=1442834&r1=1442833&r2=1442834&view=diff
==============================================================================
--- incubator/ambari/trunk/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php (original)
+++ incubator/ambari/trunk/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php Wed Feb 6 02:14:49 2013
@@ -301,7 +301,16 @@ function hdp_mon_generate_response( $res
}
$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( $res
{
$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":