Author: yusaku
Date: Tue Jan 22 21:13:20 2013
New Revision: 1437177
URL: http://svn.apache.org/viewvc?rev=1437177&view=rev
Log:
AMBARI-1234. On Heatmap host hover, including list of components running.
(yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/styles/application.less
incubator/ambari/trunk/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs
incubator/ambari/trunk/ambari-web/app/views/main/charts/heatmap/heatmap_host.js
incubator/ambari/trunk/ambari-web/app/views/main/charts/heatmap/heatmap_host_detail.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1437177&r1=1437176&r2=1437177&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Jan 22 21:13:20 2013
@@ -16,6 +16,9 @@ Trunk (unreleased changes):
various hadoop artifacts back to Ambari. (Nate Cole via mahadev)
IMPROVEMENTS
+
+ AMBARI-1234. On Heatmap host hover, including list of components running.
+ (yusaku)
AMBARI-1229. Dashboard - make disk usage pie chart in HDFS summary easier
to understand. (yusaku)
Modified: incubator/ambari/trunk/ambari-web/app/styles/application.less
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/styles/application.less?rev=1437177&r1=1437176&r2=1437177&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/styles/application.less (original)
+++ incubator/ambari/trunk/ambari-web/app/styles/application.less Tue Jan 22
21:13:20 2013
@@ -1832,18 +1832,6 @@ ul.filter {
}
}
-.heatmap_host_details {
- font-size: 10px;
- line-height: 1.6em;
- border: 1px solid #006F9F;
- background: #fff;
- width: 73px;
- height: 79px;
- padding: 10px 10px;
- position: absolute;
- z-index: 1000;
-}
-
/*Start Heatmap*/
.heatmap {
#heatmap-metric-title{
@@ -1880,7 +1868,6 @@ ul.filter {
border: 1px solid #D9D9D9;
background: #f9f9f9;
width: 280px;
- height: 170px;
padding: 10px 10px;
position: absolute;
z-index: 1000;
Modified:
incubator/ambari/trunk/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs?rev=1437177&r1=1437176&r2=1437177&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs
(original)
+++
incubator/ambari/trunk/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs
Tue Jan 22 21:13:20 2013
@@ -30,4 +30,7 @@ IP: {{view.details.ip}}<br/>
{{/if}}
{{#if view.details.memoryUsage}}
Memory: {{view.details.memoryUsage}}%<br/>
+{{/if}}
+{{#if view.details.hostComponents}}
+ Components: {{view.details.hostComponents}}<br/>
{{/if}}
\ No newline at end of file
Modified:
incubator/ambari/trunk/ambari-web/app/views/main/charts/heatmap/heatmap_host.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/charts/heatmap/heatmap_host.js?rev=1437177&r1=1437176&r2=1437177&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/views/main/charts/heatmap/heatmap_host.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/views/main/charts/heatmap/heatmap_host.js
Tue Jan 22 21:13:20 2013
@@ -54,6 +54,12 @@ App.MainChartsHeatmapHostView = Em.View.
} else {
val = val.toFixed(1);
}
+ } else if (i == 'hostComponents') {
+ if (val == undefined) {
+ val = null;
+ } else {
+ val =
val.filterProperty('isMaster').concat(val.filterProperty('isSlave')).mapProperty('displayName').join(',
');
+ }
}
view.set('details.' + i, val);
});
Modified:
incubator/ambari/trunk/ambari-web/app/views/main/charts/heatmap/heatmap_host_detail.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/charts/heatmap/heatmap_host_detail.js?rev=1437177&r1=1437176&r2=1437177&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/views/main/charts/heatmap/heatmap_host_detail.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/views/main/charts/heatmap/heatmap_host_detail.js
Tue Jan 22 21:13:20 2013
@@ -31,6 +31,7 @@ App.MainChartsHeatmapHostDetailView = Em
metricValue: 'metric-value',
diskUsage: '10',
cpuUsage: '10',
- memoryUsage: '10'
+ memoryUsage: '10',
+ hostComponents: 'host components'
}
});
\ No newline at end of file
