AMBARI-2061. HBase Heatmaps: clean up labels and units. (yusaku)

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

CHANGES.txt

@@ -283,6 +283,8 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-2061. HBase Heatmaps: clean up labels and units. (yusaku)
+
  AMBARI-2042. Update Ambari logo. (yusaku)
 
  AMBARI-2040. Customize Services page: reduce padding to prevent tabs from

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

@@ -24,6 +24,6 @@ App.MainChartHeatmapHbaseCompactionQueueSize = App.MainChartHeatmapHbaseMetrics.
   name: Em.I18n.t('charts.heatmap.metrics.HbaseRegionServerCompactionQueueSize'),
   maximumValue: 10,
   defaultMetric: 'metrics.hbase.regionserver.compactionQueueSize',
-  units: ' ',
-  slotDefinitionLabelSuffix: ' '
+  units: '',
+  slotDefinitionLabelSuffix: ''
 });

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

@@ -25,5 +25,5 @@ App.MainChartHeatmapHbaseReadReqCount = App.MainChartHeatmapHbaseMetrics.extend(
   maximumValue: 200,
   defaultMetric: 'metrics.hbase.regionserver.readRequestsCount',
   units: '',
-  slotDefinitionLabelSuffix: ' '
+  slotDefinitionLabelSuffix: ''
 });

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

@@ -24,6 +24,6 @@ App.MainChartHeatmapHbaseRegions = App.MainChartHeatmapHbaseMetrics.extend({
   name: Em.I18n.t('charts.heatmap.metrics.HbaseRegionServerRegions'),
   maximumValue: 10,
   defaultMetric: 'metrics.hbase.regionserver.regions',
-  units: 'regions',
-  slotDefinitionLabelSuffix: 'region'
+  units: '',
+  slotDefinitionLabelSuffix: ''
 });

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

@@ -24,6 +24,6 @@ App.MainChartHeatmapHbaseWriteReqCount = App.MainChartHeatmapHbaseMetrics.extend
   name: Em.I18n.t('charts.heatmap.metrics.HbaseRegionServerWriteCount'),
   maximumValue: 200,
   defaultMetric: 'metrics.hbase.regionserver.writeRequestsCount',
-  units: 'counts',
-  slotDefinitionLabelSuffix: ' '
+  units: '',
+  slotDefinitionLabelSuffix: ''
 });

ambari-web/app/messages.js

@@ -909,11 +909,11 @@ Em.I18n.translations = {
   'charts.heatmap.metrics.memoryUsed' :'Memory Used %',
   'charts.heatmap.metrics.processRun' :'Total Running Processes',
   'charts.heatmap.metrics.cpuWaitIO':'CPU Wait I/O %',
-  'charts.heatmap.metrics.HbaseRegionServerReadCount': 'RegionServer read request count',
-  'charts.heatmap.metrics.HbaseRegionServerWriteCount': 'RegionServer write request count',
-  'charts.heatmap.metrics.HbaseRegionServerCompactionQueueSize': 'RegionServer compaction queue size',
-  'charts.heatmap.metrics.HbaseRegionServerRegions': 'RegionServer regions',
-  'charts.heatmap.metrics.HbaseRegionServerMemStoreSize': 'RegionServer memstore sizes',
+  'charts.heatmap.metrics.HbaseRegionServerReadCount': 'Read Request Count',
+  'charts.heatmap.metrics.HbaseRegionServerWriteCount': 'Write Request Count',
+  'charts.heatmap.metrics.HbaseRegionServerCompactionQueueSize': 'Compaction Queue Size',
+  'charts.heatmap.metrics.HbaseRegionServerRegions': 'Regions',
+  'charts.heatmap.metrics.HbaseRegionServerMemStoreSize': 'Memstore Sizes',
   'metric.notFound':'no items found',
   'metric.default':'combined',
   'metric.cpu':'cpu',