Updated Branches: refs/heads/trunk d1c13d53c -> 69331db5c
AMBARI-2877. YARN memory heatmap metric should be renamed. (xiwang via yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/69331db5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/69331db5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/69331db5 Branch: refs/heads/trunk Commit: 69331db5c2d53f89e43799f2364308d68203b8eb Parents: d1c13d5 Author: Yusaku Sako <[email protected]> Authored: Tue Aug 13 15:51:26 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Tue Aug 13 15:51:26 2013 -0700 ---------------------------------------------------------------------- .../charts/heatmap_metrics/heatmap_metric_yarn_ResourceUsed.js | 2 +- ambari-web/app/messages.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/69331db5/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_yarn_ResourceUsed.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_yarn_ResourceUsed.js b/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_yarn_ResourceUsed.js index e40282a..3c2865d 100644 --- a/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_yarn_ResourceUsed.js +++ b/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_yarn_ResourceUsed.js @@ -22,7 +22,7 @@ var App = require('app'); */ App.MainChartHeatmapYarnResourceUsedMetric = App.MainChartHeatmapYarnMetrics.extend({ metricUrlTemplate: '/clusters/{clusterName}/services/YARN/components/RESOURCEMANAGER?fields=ServiceComponentInfo/rm_metrics', - name: Em.I18n.t('charts.heatmap.metrics.YarnResourceUsed'), + name: Em.I18n.t('charts.heatmap.metrics.YarnMemoryUsed'), maximumValue: 100, defaultMetric: 'ServiceComponentInfo.rm_metrics.cluster.nodeManagers', units: ' %', http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/69331db5/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 1e3cc72..0990035 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1160,11 +1160,9 @@ Em.I18n.translations = { 'charts.heatmap.metrics.YarnMemHeapUsed' :'YARN JVM Heap Memory Used', 'charts.heatmap.metrics.reducesRunning' :'MapReduce Reduces Running', - 'charts.heatmap.metrics.YarnResourceUsed' :'YARN Resource used %', - 'charts.heatmap.metrics.memoryUsed' :'Host Memory Used %', 'charts.heatmap.metrics.processRun' :'Total Running Processes', - 'charts.heatmap.metrics.YarnResourceUsed' :'YARN Resource used %', + 'charts.heatmap.metrics.YarnMemoryUsed' :'YARN Memory used %', 'charts.heatmap.metrics.cpuWaitIO':'Host CPU Wait I/O %', 'charts.heatmap.metrics.HbaseRegionServerReadCount': 'HBase Read Request Count', 'charts.heatmap.metrics.HbaseRegionServerWriteCount': 'HBase Write Request Count',
