diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js index 3d72b2f..bfb7bed 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js @@ -18,7 +18,7 @@ import Ember from 'ember'; -const INBETWEEN_HEIGHT = 130; +const INBETWEEN_HEIGHT = 70; export default Ember.Component.extend({ // Map: @@ -134,7 +134,9 @@ export default Ember.Component.extend({ Ember.run.later(this, function () { var treeWidth = this.maxDepth * 200; var treeHeight = this.numOfLeafQueue * INBETWEEN_HEIGHT; - var tree = d3.layout.tree().size([treeHeight, treeWidth]); + var tree = d3.layout.tree().size([treeHeight, treeWidth]).separation(function() { + return 0.50; + }); var diagonal = d3.svg.diagonal() .projection(function(d) { return [d.y, d.x]; }); @@ -178,7 +180,7 @@ export default Ember.Component.extend({ // append queue name nodeEnter.append("text") .attr("x", "0px") - .attr("dy", "45px") + .attr("dy", "35px") .attr("text-anchor", "middle") .text(function(d) { return d.name; }) .style("fill-opacity", 1e-6); @@ -189,16 +191,16 @@ export default Ember.Component.extend({ .attr("transform", function(d) { return "translate(" + d.y + "," + d.x + ")"; }); nodeUpdate.select("circle") - .attr("r", 30) + .attr("r", 24) .attr("href", function(d) { return "#/yarn-queues/" + d.queueData.get("name"); }) .style("stroke-width", function(d) { if (d.queueData.get("name") === this.get("selected")) { - return 7; + return 5; } else { - return 2; + return 1; } }.bind(this)) .style("stroke", function(d) { @@ -260,7 +262,7 @@ export default Ember.Component.extend({ reDraw: function() { this.initData(); - var margin = {top: 20, right: 120, bottom: 20, left: 120}; + var margin = {top: 20, right: 60, bottom: 20, left: 60}; var treeWidth = this.maxDepth * 200; var treeHeight = this.numOfLeafQueue * INBETWEEN_HEIGHT; var width = treeWidth + margin.left + margin.right; @@ -277,7 +279,9 @@ export default Ember.Component.extend({ .append("g") .attr("transform", "translate(" + margin.left + "," + margin.top + ")"); - var tree = d3.layout.tree().size([treeHeight, treeWidth]); + var tree = d3.layout.tree().size([treeHeight, treeWidth]).separation(function() { + return 0.50; + }); var diagonal = d3.svg.diagonal() .projection(function(d) { return [d.y, d.x]; }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js index 08ca5a6..986b1fd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js @@ -50,6 +50,13 @@ export default Ember.Controller.extend({ html = html + '>Nodes' + '(current)'; return Ember.String.htmlSafe(html); + }.property('currentPath'), + + isQueuesTabActive: function() { + var path = this.get('currentPath'); + if (path === 'yarn-queues') { + return true; + } + return false; }.property('currentPath') }); - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js index 27c48f7..9e7b98a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js @@ -44,19 +44,23 @@ export default DS.Model.extend({ return len <= 0; }.property("children"), + getFormattedCapacity: function(capacity) { + return parseFloat(capacity.toFixed(2)); + }, + capacitiesBarChartData: function() { return [ { label: "Absolute Capacity", - value: this.get("name") === "root" ? 100 : this.get("absCapacity") + value: this.get("name") === "root" ? 100 : this.getFormattedCapacity(this.get("absCapacity")) }, { label: "Absolute Used", - value: this.get("name") === "root" ? this.get("usedCapacity") : this.get("absUsedCapacity") + value: this.get("name") === "root" ? this.getFormattedCapacity(this.get("usedCapacity")) : this.getFormattedCapacity(this.get("absUsedCapacity")) }, { label: "Absolute Max Capacity", - value: this.get("name") === "root" ? 100 : this.get("absMaxCapacity") + value: this.get("name") === "root" ? 100 : this.getFormattedCapacity(this.get("absMaxCapacity")) } ]; }.property("absCapacity", "absUsedCapacity", "absMaxCapacity"), diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs index 4a2ba38..46f9b7f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs @@ -41,18 +41,18 @@ (current) {{/link-to}} {{/link-to}} - {{#link-to 'yarn-queues' 'root' tagName="li"}} + {{#link-to 'yarn-queues' 'root' tagName="li" classNameBindings="isQueuesTabActive:active"}} {{#link-to 'yarn-queues' 'root' class="navigation-link"}}Queues (current) {{/link-to}} {{/link-to}} - {{#link-to 'yarn-apps.apps' tagName="li" currentWhen="yarn-apps.apps yarn-apps.services"}} - {{#link-to 'yarn-apps.apps' class="navigation-link" currentWhen="yarn-apps.apps yarn-apps.services"}}Applications + {{#link-to 'yarn-apps.apps' tagName="li" current-when="yarn-apps.apps yarn-apps.services"}} + {{#link-to 'yarn-apps.apps' class="navigation-link" current-when="yarn-apps.apps yarn-apps.services"}}Applications (current) {{/link-to}} {{/link-to}} - {{#link-to 'yarn-nodes.table' tagName="li" currentWhen="yarn-nodes.table yarn-nodes.heatmap"}} - {{#link-to 'yarn-nodes.table' class="navigation-link" currentWhen="yarn-nodes.table yarn-nodes.heatmap"}}Nodes + {{#link-to 'yarn-nodes.table' tagName="li" current-when="yarn-nodes.table yarn-nodes.heatmap"}} + {{#link-to 'yarn-nodes.table' class="navigation-link" current-when="yarn-nodes.table yarn-nodes.heatmap"}}Nodes (current) {{/link-to}} {{/link-to}} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-configuration-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-configuration-table.hbs index 17a1e1a..a04a26d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-configuration-table.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-configuration-table.hbs @@ -20,7 +20,7 @@ Configurations - Value + Value @@ -32,10 +32,12 @@ Configured Max Capacity {{queue.maxCapacity}} + {{#if queue.state}} State {{queue.state}} + {{/if}} {{#if queue.isLeafQueue}} User Limit Percent @@ -51,4 +53,4 @@ {{/if}} - \ No newline at end of file + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs index 8ce8e8b..2339a09 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs @@ -171,8 +171,8 @@ Master Container Log - Master Node - Master Node Label Expression + Master Node + Master Node Label Expression diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs index d5f6347..801f9aa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs @@ -24,7 +24,7 @@
-

Application

+

Applications

- \ No newline at end of file + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs index 6dfb220..cec4552 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs @@ -42,7 +42,7 @@ {{bar-chart data=model.selectedQueue.capacitiesBarChartData title="" parentId="capacity-bar-chart" - textWidth=150 + textWidth=170 ratio=0.55 maxHeight=350}}