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

3 files changed, 12 insertions, 5 deletions

diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index b145e3b58f..9a746ef2e6 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -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',
diff --git a/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs b/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs
index 1af5df1952..b1b7306505 100644
--- a/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs
+++ b/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs
@@ -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}}
\ No newline at end of file
diff --git a/ambari-web/app/views/main/charts/heatmap/heatmap_host.js b/ambari-web/app/views/main/charts/heatmap/heatmap_host.js
index 24a2962570..eae2f9173a 100644
--- a/ambari-web/app/views/main/charts/heatmap/heatmap_host.js
+++ b/ambari-web/app/views/main/charts/heatmap/heatmap_host.js
@@ -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')
         }