AMBARI-8208 HBase Memstore Sizes Heatmap reports really large size (dsen)

ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/metrics.json

@@ -1904,11 +1904,11 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/hbase/regionserver/memstoreSizeMB": {
+          "metrics/hbase/regionserver/memstoreSize": {
             "metric": "regionserver.Server.memStoreSize",
             "pointInTime": false,
             "temporal": true
-          },
+          },          
           "metrics/hbase/regionserver/fsReadLatencyHistogram_median": {
             "metric": "hbase.regionserver.fsReadLatencyHistogram_median",
             "pointInTime": true,
@@ -2154,11 +2154,11 @@
             "pointInTime": true,
             "temporal": false
           },
-          "metrics/hbase/regionserver/memstoreSizeMB": {
+          "metrics/hbase/regionserver/memstoreSize": {
             "metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.memStoreSize",
             "pointInTime": true,
             "temporal": false
-          },
+          },          
           "metrics/hbase/regionserver/getRequestLatency_max": {
             "metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.Get_max",
             "pointInTime": true,
@@ -3956,11 +3956,11 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/hbase/regionserver/memstoreSizeMB": {
+          "metrics/hbase/regionserver/memstoreSize": {
             "metric": "regionserver.Server.memStoreSize",
             "pointInTime": false,
             "temporal": true
-          },
+          },          
           "metrics/hbase/regionserver/fsReadLatencyHistogram_median": {
             "metric": "hbase.regionserver.fsReadLatencyHistogram_median",
             "pointInTime": true,
@@ -4271,11 +4271,11 @@
             "pointInTime": true,
             "temporal": false
           },
-          "metrics/hbase/regionserver/memstoreSizeMB": {
+          "metrics/hbase/regionserver/memstoreSize": {
             "metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.memStoreSize",
             "pointInTime": true,
             "temporal": false
-          },
+          },          
           "metrics/hbase/regionserver/getRequestLatency_max": {
             "metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.Get_max",
             "pointInTime": true,
@@ -13632,4 +13632,4 @@
       }
     ]
   }
-}
+}

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metrics.json

@@ -1904,7 +1904,7 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/hbase/regionserver/memstoreSizeMB": {
+          "metrics/hbase/regionserver/memstoreSize": {
             "metric": "regionserver.Server.memStoreSize",
             "pointInTime": false,
             "temporal": true
@@ -2154,7 +2154,7 @@
             "pointInTime": true,
             "temporal": false
           },
-          "metrics/hbase/regionserver/memstoreSizeMB": {
+          "metrics/hbase/regionserver/memstoreSize": {
             "metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.memStoreSize",
             "pointInTime": true,
             "temporal": false
@@ -3956,7 +3956,7 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/hbase/regionserver/memstoreSizeMB": {
+          "metrics/hbase/regionserver/memstoreSize": {
             "metric": "regionserver.Server.memStoreSize",
             "pointInTime": false,
             "temporal": true
@@ -4271,11 +4271,11 @@
             "pointInTime": true,
             "temporal": false
           },
-          "metrics/hbase/regionserver/memstoreSizeMB": {
+          "metrics/hbase/regionserver/memstoreSize": {
             "metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.memStoreSize",
             "pointInTime": true,
             "temporal": false
-          },
+          },          
           "metrics/hbase/regionserver/getRequestLatency_max": {
             "metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.Get_max",
             "pointInTime": true,
@@ -13632,4 +13632,4 @@
       }
     ]
   }
-}
+}

ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_hbase_memstoresize.js

@@ -22,8 +22,16 @@ var App = require('app');
  */
 App.MainChartHeatmapHbaseMemStoreSize = App.MainChartHeatmapHbaseMetrics.extend({
   name: Em.I18n.t('charts.heatmap.metrics.HbaseRegionServerMemStoreSize'),
-  maximumValue: 100,
-  defaultMetric: 'metrics.hbase.regionserver.memstoreSizeMB',
-  units: 'MB',
-  slotDefinitionLabelSuffix: 'MB'
+  maximumValue: function() {
+    return App.get('isHadoop2Stack') ? 100*1024*1024 : 100;
+  }.property('App.isHadoop2Stack'),
+  defaultMetric: function() {
+    return App.get('isHadoop2Stack') ? 'metrics.hbase.regionserver.memstoreSize' : 'metrics.hbase.regionserver.memstoreSizeMB';
+  }.property('App.isHadoop2Stack'),
+  units: function() {
+    return App.get('isHadoop2Stack') ? 'B' : 'MB';
+  }.property('App.isHadoop2Stack'),
+  slotDefinitionLabelSuffix: function() {
+    return App.get('isHadoop2Stack') ? 'B' : 'MB';
+  }.property('App.isHadoop2Stack')
 });