AMBARI-1040. Cluster heatmap: green should always mean good. (Srimant…

…h Gunturi via yusaku) git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1418984 13f79535-47bb-0310-9956-ffa450edef68
apache · Dec 9, 2012 · 5ed4c1c · 5ed4c1c
1 parent 7ab2fbf
commit 5ed4c1c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/AMBARI-666-CHANGES.txt b/AMBARI-666-CHANGES.txt
@@ -424,6 +424,9 @@ AMBARI-666 branch (unreleased changes)
 
   IMPROVEMENTS
 
+  AMBARI-1040. Cluster heatmap: green should always mean "good". (Srimanth
+  Gunturi via yusaku)
+
   AMBARI-1039. Improve Nagios alerts time display. (Srimanth Gunturi via yusaku)
 
   AMBARI-1036. Service Info/Quick Links do not display external hostnames.

diff --git a/ambari-web/app/controllers.js b/ambari-web/app/controllers.js
@@ -46,7 +46,7 @@ require('controllers/main/charts');
 require('controllers/main/charts/heatmap_metrics/heatmap_metric');
 require('controllers/main/charts/heatmap_metrics/heatmap_metric_processrun');
 require('controllers/main/charts/heatmap_metrics/heatmap_metric_diskspaceused');
-require('controllers/main/charts/heatmap_metrics/heatmap_metric_memoryfree');
+require('controllers/main/charts/heatmap_metrics/heatmap_metric_memoryused');
 require('controllers/main/charts/heatmap');
 require('controllers/main/charts/horizon_chart');
 require('controllers/main/rack');

diff --git a/ambari-web/app/controllers/main/charts/heatmap.js b/ambari-web/app/controllers/main/charts/heatmap.js
@@ -23,7 +23,7 @@ App.MainChartsHeatmapController = Em.Controller.extend({
   allMetrics: [ Em.Object.create({
     label: Em.I18n.t('charts.heatmap.category.host'),
     category: 'host',
-    items: [ App.MainChartHeatmapProcessRunMetric.create(), App.MainChartHeatmapDiskSpaceUsedMetric.create(), App.MainChartHeatmapMemoryFreeMetric.create() ]
+    items: [ App.MainChartHeatmapDiskSpaceUsedMetric.create(), App.MainChartHeatmapMemoryUsedMetric.create() /*, App.MainChartHeatmapProcessRunMetric.create()*/ ]
   }) ],
 
   selectedMetric: null,
@@ -67,4 +67,4 @@ App.MainChartsHeatmapController = Em.Controller.extend({
       return "span4";
     }
   }.property('cluster')
-})
+});
diff --git a/...tmap_metrics/heatmap_metric_memoryfree.js → ...tmap_metrics/heatmap_metric_memoryused.js b/...tmap_metrics/heatmap_metric_memoryfree.js → ...tmap_metrics/heatmap_metric_memoryused.js
@@ -29,8 +29,8 @@ var App = require('app');
  * </ul>
  * 
  */
-App.MainChartHeatmapMemoryFreeMetric = App.MainChartHeatmapMetric.extend({
-  name: 'Memory Free %',
+App.MainChartHeatmapMemoryUsedMetric = App.MainChartHeatmapMetric.extend({
+  name: 'Memory Used %',
   maximumValue: 100,
   defaultMetric: 'metrics.memory',
   units: '%',
@@ -47,13 +47,13 @@ App.MainChartHeatmapMemoryFreeMetric = App.MainChartHeatmapMetric.extend({
         });
 
         var total = value.mem_total;
-        var free = value.mem_free;
-        value = ((free * 100) / total).toFixed(1);
+        var used = value.mem_total - value.mem_free;
+        value = ((used * 100) / total).toFixed(1);
 
         var hostName = item.Hosts.host_name;
         hostToValueMap[hostName] = value;
       });
     }
     return hostToValueMap;
   }
-})
+});