AMBARI-1088. HDFS capacity chart numbers are incorrect. (Srimanth Gunturi via yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1431643 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -654,6 +654,9 @@ AMBARI-666 branch (unreleased changes)
 
   BUG FIXES
 
+  AMBARI-1088. HDFS capacity chart numbers are incorrect. (Srimanth Gunturi
+  via yusaku)
+
   AMBARI-1084. Heatmap displays NaN. (Srimanth Gunturi via yusaku)
 
   AMBARI-1081. HDFS disk capacity on dashboard is seen as negative number.

ambari-web/app/views/common/chart/linear_time.js

@@ -494,7 +494,7 @@ App.ChartLinearTimeView = Ember.View.extend({
               return self.yAxisFormatter(y);
             },
             xFormatter:function (x) {
-              return (new Date(x)).toLocaleTimeString();
+              return (new Date(x * 1000)).toLocaleTimeString();
             },
             formatter:function (series, x, y, formattedX, formattedY, d) {
               return formattedY + '<br />' + formattedX;
@@ -607,7 +607,9 @@ App.ChartLinearTimeView.BytesFormatter = function (y) {
       value = String(value);
     }
     if ("string" == typeof value) {
-      value = value.replace(/\.\d+/, ''); // Remove decimal part
+      value = value.replace(/\.\d(\d+)/, function($0, $1){ // Remove only 1-digit after decimal part
+        return $0.replace($1, '');
+      }); 
       // Either it ends with digit or ends with character
       value = value.replace(/(\d$)/, '$1 '); // Ends with digit like '120'
       value = value.replace(/([a-zA-Z]$)/, ' $1'); // Ends with character like

ambari-web/app/views/main/host/metrics/disk.js

@@ -63,13 +63,14 @@ App.ChartHostMetricsDisk = App.ChartLinearTimeView.extend({
             seriesData = JSON.parse(seriesData);
           }
           // We have valid data
+          var GB = Math.pow(2, 30);
           var series = {};
           series.name = displayName;
           series.data = [];
           for ( var index = 0; index < seriesData.length; index++) {
             series.data.push({
               x: seriesData[index][1],
-              y: seriesData[index][0] * 1000000000
+              y: seriesData[index][0] * GB
             });
           }
           seriesArray.push(series);

ambari-web/app/views/main/host/metrics/memory.js

@@ -69,13 +69,14 @@ App.ChartHostMetricsMemory = App.ChartLinearTimeView.extend({
             seriesData = JSON.parse(seriesData);
           }
           // We have valid data
+          var KB = Math.pow(2,10);
           var series = {};
           series.name = displayName;
           series.data = [];
           for ( var index = 0; index < seriesData.length; index++) {
             series.data.push({
               x: seriesData[index][1],
-              y: seriesData[index][0] * 1000
+              y: seriesData[index][0] * KB
             });
           }
           seriesArray.push(series);

ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js

@@ -68,13 +68,14 @@ App.ChartServiceMetricsHDFS_JVMHeap = App.ChartLinearTimeView.extend({
             seriesData = JSON.parse(seriesData);
           }
           // We have valid data
+          var MB = Math.pow(2,20);
           var series = {};
           series.name = displayName;
           series.data = [];
           for ( var index = 0; index < seriesData.length; index++) {
             series.data.push({
               x: seriesData[index][1],
-              y: seriesData[index][0] * 1000000
+              y: seriesData[index][0] * MB
             // Data is in MB
             });
           }

ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js

@@ -65,13 +65,14 @@ App.ChartServiceMetricsHDFS_SpaceUtilization = App.ChartLinearTimeView.extend({
             seriesData = JSON.parse(seriesData);
           }
           // We have valid data
+          var GB = Math.pow(2,30);
           var series = {};
           series.name = displayName;
           series.data = [];
           for ( var index = 0; index < seriesData.length; index++) {
             series.data.push({
               x: seriesData[index][1],
-              y: seriesData[index][0]*1000000000
+              y: seriesData[index][0]*GB
             });
           }
           seriesArray.push(series);

ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js

@@ -68,13 +68,14 @@ App.ChartServiceMetricsMapReduce_JVMHeap = App.ChartLinearTimeView.extend({
             seriesData = JSON.parse(seriesData);
           }
           // We have valid data
+          var MB = Math.pow(2, 20);
           var series = {};
           series.name = displayName;
           series.data = [];
           for ( var index = 0; index < seriesData.length; index++) {
             series.data.push({
               x: seriesData[index][1],
-              y: seriesData[index][0] * 1000000
+              y: seriesData[index][0] * MB
             // Data is in MB
             });
           }