Permalink
Browse files

AMBARI-1046. Heatmap with no numbers on the hover. (Srimanth Gunturi …

…via yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1418998 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 7c45596 commit b721857ca3dc4fe66dee0238ea87e8f5ea537cdb Yusaku Sako committed Dec 9, 2012
@@ -511,6 +511,9 @@ AMBARI-666 branch (unreleased changes)
OPTIMIZATIONS
BUG FIXES
+
+ AMBARI-1046. Heatmap with no numbers on the hover. (Srimanth Gunturi via
+ yusaku)
AMBARI-1045. Service summary sections have incorrect values displayed.
(Srimanth Gunturi via yusaku)
@@ -277,6 +277,7 @@ Em.I18n.translations = {
'charts.heatmap.item.host.process':'Total Running Processes',
'charts.heatmap.category.hdfs':'HDFS',
'charts.heatmap.category.mapreduce': 'MapReduce',
+ 'charts.heatmap.unknown': 'Unknown',
'metric.default':'combined',
'metric.cpu':'cpu',
@@ -20,8 +20,14 @@
OS: {{view.details.osType}}<br/>
IP: {{view.details.ip}}<br/>
{{#if view.details.metricName}}
-{{view.details.metricName}}: {{view.details.metricValue}}<br/>
+ {{view.details.metricName}}: {{view.details.metricValue}}<br/>
{{/if}}
-Disk: {{view.details.diskUsage}}% <br/>
-CPU: {{view.details.cpuUsage}}%<br/>
-Memory: {{view.details.memoryUsage}}%<br/>
+{{#if view.details.diskUsage}}
+ Disk: {{view.details.diskUsage}}% <br/>
+{{/if}}
+{{#if view.details.cpuUsage}}
+ CPU: {{view.details.cpuUsage}}%<br/>
+{{/if}}
+{{#if view.details.memoryUsage}}
+ Memory: {{view.details.memoryUsage}}%<br/>
+{{/if}}
@@ -42,7 +42,7 @@ App.MainChartsHeatmapHostView = Em.View.extend({
if (h2vMap && metricName) {
var value = h2vMap[host.get('hostName')];
if (value == undefined || value == null) {
- value = "Unknown";
+ value = this.t('charts.heatmap.unknown');
} else {
value = value + selectedMetric.get('units')
}

0 comments on commit b721857

Please sign in to comment.