incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1377741 - in /incubator/ambari/trunk: CHANGES.txt mon_dashboard/src/ui/js/common.js
Date Mon, 27 Aug 2012 16:49:04 GMT
Author: yusaku
Date: Mon Aug 27 16:49:04 2012
New Revision: 1377741

URL: http://svn.apache.org/viewvc?rev=1377741&view=rev
Log:
AMBARI-687. Monitoring Dashboard is not showing alerts for Templeton (Contributed by yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/mon_dashboard/src/ui/js/common.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1377741&r1=1377740&r2=1377741&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Aug 27 16:49:04 2012
@@ -95,6 +95,9 @@ Trunk (unreleased changes)
 
   BUG FIXES
 
+    AMBARI-687. Monitoring Dashboard is not showing alerts for Templeton 
+    (yusaku)
+
     AMBARI-674. Nagios uninstall should cleanup temporary directories. (jitendra)
 
     AMBARI-673. Going back to step 3 from step 5 in UI breaks DB

Modified: incubator/ambari/trunk/mon_dashboard/src/ui/js/common.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/mon_dashboard/src/ui/js/common.js?rev=1377741&r1=1377740&r2=1377741&view=diff
==============================================================================
--- incubator/ambari/trunk/mon_dashboard/src/ui/js/common.js (original)
+++ incubator/ambari/trunk/mon_dashboard/src/ui/js/common.js Mon Aug 27 16:49:04 2012
@@ -513,7 +513,7 @@
       a.hideGraphPopup();
     } else if(target.parentNode){
       var targetParentId = target.parentNode.id;
-      if (targetParentId == "HDFS" || targetParentId == "MAPREDUCE" || targetParentId ==
"HBASE" || targetParentId == "ZOOKEEPER" || targetParentId == "HIVE-METASTORE" || targetParentId
== "OOZIE" || targetParentId == "PUPPET") {
+      if (targetParentId == "HDFS" || targetParentId == "MAPREDUCE" || targetParentId ==
"HBASE" || targetParentId == "ZOOKEEPER" || targetParentId == "HIVE-METASTORE" || targetParentId
== "OOZIE" || targetParentId == "TEMPLETON" || targetParentId == "PUPPET") {
         a.showAlerts(target);
       }
     }
@@ -685,7 +685,7 @@
       var hdfsCritCount = 0, hdfsWarnCount = 0, mrCritCount = 0, mrWarnCount = 0, 
       hbaseCritCount = 0, hbaseWarnCount = 0, zkCritCount = 0, zkWarnCount = 0, 
       hcatCritCount = 0, hcatWarnCount = 0, oozieWarnCount = 0, oozieCritCount = 0,
-                        puppetWarnCount = 0, puppetCritCount = 0;
+      templetonWarnCount = 0, templetonCritCount = 0, puppetWarnCount = 0, puppetCritCount
= 0;
       
       //Set firstService in the table
       var servicestates = response.servicestates;
@@ -765,6 +765,8 @@
                 hcatWarnCount++;
               } else if(alerts[i].service_type == "OOZIE"){
                 oozieWarnCount++;
+              } else if(alerts[i].service_type == "TEMPLETON"){
+                templetonWarnCount++;
               } else if(alerts[i].service_type == "PUPPET"){
                 puppetWarnCount++;
               }
@@ -781,6 +783,8 @@
                 hcatCritCount++;
               } else if(alerts[i].service_type == "OOZIE"){
                 oozieCritCount++;
+              } else if(alerts[i].service_type == "TEMPLETON"){
+                templetonCritCount++;
               } else if(alerts[i].service_type == "PUPPET"){
                 puppetCritCount++;
               }
@@ -928,6 +932,13 @@
               } else {
                 criticalAlerts.className = "critical";
               }
+            } else if(key == "TEMPLETON"){
+              criticalAlerts.innerHTML = templetonCritCount;
+              if(templetonCritCount > 0) {
+                criticalAlerts.className = "highlighted-red critical";
+              } else {
+                criticalAlerts.className = "critical";
+              }
             } else if(key == "PUPPET"){
               criticalAlerts.innerHTML = puppetCritCount;
               if(puppetCritCount > 0) {
@@ -982,6 +993,13 @@
               } else {
                 warnAlerts.className = "warning";
               }
+            } else if(key == "TEMPLETON"){
+              warnAlerts.innerHTML = templetonWarnCount;
+              if(templetonWarnCount > 0) {
+                warnAlerts.className = "highlighted-orage warning";
+              } else {
+                warnAlerts.className = "warning";
+              }
             } else if(key == "PUPPET"){
               warnAlerts.innerHTML = puppetWarnCount;
               if(puppetWarnCount > 0) {



Mime
View raw message