svn commit: r1443245 - in /incubator/ambari/trunk: CHANGES.txt contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php

[ja...@apache.org]

Author: jaimin
Date: Wed Feb  6 22:29:03 2013
New Revision: 1443245

URL: http://svn.apache.org/viewvc?rev=1443245&view=rev
Log:
AMBARI-1355. Inconsistent casing and component name for alert title. (jaimin)

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=1443245&r1=1443244&r2=1443245&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Feb  6 22:29:03 2013
@@ -255,6 +255,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1355. Inconsistent casing and component name for alert title. (jaimin)
+
  AMBARI-1354. "No alerts" badge on the Host Detail page should be green, not red. (jaimin)
 
  AMBARI-1353. "Missing translation" shown in Job Browser. (jaimin)

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=1443245&r1=1443244&r2=1443245&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 22:29:03 2013
@@ -311,6 +311,7 @@ function hdp_mon_generate_response( $res
             default:
               $servicestatus['service_description'] = $srv_desc[1];
           }
+            $servicestatus['service_description'] = format_description($servicestatus['service_description']);
         }
         break;
       case "nok":
@@ -367,6 +368,43 @@ function hdp_mon_generate_response( $res
     return $services_objects;
   }
 
+  function format_description ($service_description)
+  {
+      $patterns[0] = "/tasktracker/i";
+      $patterns[1] = "/datanode/i";
+      $patterns[2] = "/namenode/i";
+      $patterns[3] = "/jobtracker/i";
+      $patterns[4] = "/hbaseMaster/i";
+      $patterns[5] = "/hive-metastore/i";
+      $patterns[6] = "/webhcat/i";
+      $patterns[7] = "/zookeeper/i";
+      $patterns[8] = "/zkserver/i";
+      $patterns[9] = "/oozie/i";
+      $patterns[10] = "/region server/i";
+      $patterns[11] = "/region/i";
+      $patterns[12] = "/server/i";
+      $patterns[13] = "/servers/i";
+
+      $replacements[0] = "TaskTracker";
+      $replacements[1] = "DataNode";
+      $replacements[2] = "NameNode";
+      $replacements[3] = "JobTracker";
+      $replacements[4] = "HBase Master";
+      $replacements[5] = "Hive Metastore";
+      $replacements[6] = "WebHCat Server";
+      $replacements[7] = "ZooKeeper";
+      $replacements[8] = "ZooKeeper Server";
+      $replacements[9] = "Oozie Server";
+      $replacements[10] = "RegionServer";
+      $replacements[11] = "Region";
+      $replacements[12] = "Server";
+      $replacements[13] = "Servers";
+
+      $result =  preg_replace($patterns, $replacements, $service_description);
+
+    return $result;
+  }
+
   function get_service_type($service_description)
   {
     $pieces = explode("::", $service_description);