YARN-6183. Few missing informations in Application and Application Attempt pages for new YARN UI. Contributed by Akhil PB.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ff751323 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ff751323 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ff751323 Branch: refs/heads/YARN-5734 Commit: ff7513235579bd9ff48d59127864ceb8eda3c509 Parents: b7613e0 Author: Sunil G <sun...@apache.org> Authored: Wed Feb 15 15:52:57 2017 +0530 Committer: Sunil G <sun...@apache.org> Committed: Wed Feb 15 15:52:57 2017 +0530 ---------------------------------------------------------------------- .../webapp/app/components/app-attempt-table.js | 9 ++++++++- .../src/main/webapp/app/controllers/yarn-app.js | 6 +++--- .../src/main/webapp/app/models/yarn-app.js | 2 +- .../src/main/webapp/app/serializers/yarn-app.js | 6 +++--- .../src/main/webapp/app/styles/app.css | 20 ++++++++++++++------ .../webapp/app/templates/cluster-overview.hbs | 10 +++++----- .../templates/components/app-attempt-table.hbs | 6 +++--- .../templates/components/container-table.hbs | 6 +++--- .../src/main/webapp/app/templates/yarn-app.hbs | 8 ++++---- 9 files changed, 44 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js index 4b741b8..3c43037 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js @@ -19,4 +19,11 @@ import Ember from 'ember'; export default Ember.Component.extend({ -}); \ No newline at end of file + nodeHttpAddressFormatted: Ember.computed('attempt.nodeHttpAddress', function() { + var nodeHttpAddress = this.get('attempt.nodeHttpAddress'); + if (nodeHttpAddress && nodeHttpAddress.indexOf('://') < 0) { + nodeHttpAddress = 'http://' + nodeHttpAddress; + } + return nodeHttpAddress; + }) +}); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js index 9c1cb5d..f699a22 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js @@ -35,11 +35,11 @@ export default Ember.Controller.extend({ }]; }), - amHostHttpAddressFormatted: function() { + amHostHttpAddressFormatted: Ember.computed('model.app.amHostHttpAddress', function() { var amHostAddress = this.get('model.app.amHostHttpAddress'); - if (amHostAddress.indexOf('http://') < 0) { + if (amHostAddress && amHostAddress.indexOf('://') < 0) { amHostAddress = 'http://' + amHostAddress; } return amHostAddress; - }.property('model.app.amHostHttpAddress') + }) }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js index 1366357..638e5b0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js @@ -37,7 +37,7 @@ export default DS.Model.extend({ amNodeLabelExpression: DS.attr('string'), applicationTags: DS.attr('string'), applicationType: DS.attr('string'), - priority: DS.attr('number'), + priority: DS.attr('string'), allocatedMB: DS.attr('number'), allocatedVCores: DS.attr('number'), runningContainers: DS.attr('number'), http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js index 7c82ec2..83d1e32 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js @@ -48,13 +48,13 @@ export default DS.JSONAPISerializer.extend({ finalStatus: payload.finalStatus, progress: payload.progress, applicationType: payload.applicationType, - diagnostics: payload.diagnostics, + diagnostics: (payload.diagnostics && payload.diagnostics !== 'null')? payload.diagnostics : '', amContainerLogs: payload.amContainerLogs, amHostHttpAddress: payload.amHostHttpAddress, logAggregationStatus: payload.logAggregationStatus, - unmanagedApplication: payload.unmanagedApplication, + unmanagedApplication: payload.unmanagedApplication || 'N/A', amNodeLabelExpression: payload.amNodeLabelExpression, - priority: payload.priority, + priority: payload.priority || 'N/A', allocatedMB: payload.allocatedMB, allocatedVCores: payload.allocatedVCores, runningContainers: payload.runningContainers, http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css index da5b4bf..eb5fe61 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css @@ -126,15 +126,15 @@ text.bar-chart-text { fill: Gray;; } -div.tooltip { - position: absolute; +div.tooltip { + position: absolute; text-align: center; padding: 2px; font: 24px sans-serif; - background: lightsteelblue; - border: 0px; + background: lightsteelblue; + border: 0px; border-radius: 8px; - pointer-events: none; + pointer-events: none; } /* @@ -189,7 +189,7 @@ table.dataTable thead .sorting_desc_disabled { .link { fill: none; - stroke: #ccc; + stroke: #ccc; stroke-width: 2px; } @@ -277,3 +277,11 @@ li a.navigation-link.ember-view { .x-scroll { overflow-x: scroll; } + +.donut-chart { + padding: 0px !important; +} + +.donut-chart svg { + width: 100%; +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs index 3bf0f37..ac8f20a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs @@ -27,11 +27,11 @@ <div class="panel-heading"> Cluster Resource Usage By Applications </div> - <div class="container-fluid" id="appusage-donut-chart"> + <div class="container-fluid donut-chart" id="appusage-donut-chart"> {{app-usage-donut-chart data=model.apps showLabels=true parentId="appusage-donut-chart" - ratio=0.6 + ratio=0.5 maxHeight=400}} </div> </div> @@ -42,11 +42,11 @@ <div class="panel-heading"> Cluster Resource Usage By Leaf Queues </div> - <div class="container-fluid" id="queueusage-donut-chart"> + <div class="container-fluid donut-chart" id="queueusage-donut-chart"> {{queue-usage-donut-chart data=model.queues showLabels=true parentId="queueusage-donut-chart" - ratio=0.6 + ratio=0.5 maxHeight=400}} </div> </div> @@ -147,4 +147,4 @@ {{/if}} -{{outlet}} \ No newline at end of file +{{outlet}} http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs index 2b16f86..fcd076b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs @@ -33,7 +33,7 @@ {{#if attempt.IsAmNodeUrl}} <tr> <td>AM Node Web UI</td> - <td><a href={{attempt.nodeHttpAddress}}>{{attempt.nodeHttpAddress}}</a></td> + <td><a href="{{nodeHttpAddressFormatted}}" target="_blank">{{nodeHttpAddressFormatted}}</a></td> </tr> {{/if}} <tr> @@ -43,7 +43,7 @@ {{#if attempt.IsLinkAvailable}} <tr> <td>Log</td> - <td><a href={{attempt.logsLink}}>link</a></td> + <td><a href="{{attempt.logsLink}}" target="_blank">Link</a></td> </tr> {{/if}} {{#if attempt.attemptState}} @@ -59,4 +59,4 @@ </tr> {{/if}} </tbody> -</table> \ No newline at end of file +</table> http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs index 0736a69..586f128 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs @@ -36,7 +36,7 @@ </tr> <tr> <td>Log</td> - <td><a href={{container.logUrl}}>link</a></td> + <td><a href="{{container.logUrl}}" target="_blank">Link</a></td> </tr> <tr> <td>Exit Status</td> @@ -48,7 +48,7 @@ </tr> <tr> <td>NodeManager UI</td> - <td><a href={{container.nodeHttpAddress}}>{{container.nodeHttpAddress}}</a></td> + <td><a href="{{container.nodeHttpAddress}}" target="_blank">{{container.nodeHttpAddress}}</a></td> </tr> </tbody> -</table> \ No newline at end of file +</table> http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs ---------------------------------------------------------------------- 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 578cc95..8ce8e8b 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 @@ -165,21 +165,21 @@ <div class="col-md-4 container-fluid"> <div class="panel panel-default"> - <div class="panel-heading">App Master Info</div> + <div class="panel-heading">Application Master Info</div> <table class="display table table-striped table-bordered" cellspacing="0" width="100%"> <thead> <tr> <th>Master Container Log</th> <td>Master Node</td> - <td>Master Node Label Expr</td> + <td>Master Node Label Expression</td> </tr> </thead> <tbody> <tr> - <td><a href={{model.app.amContainerLogs}} target="_blank">Link</a></td> - <td><a href={{amHostHttpAddressFormatted}} target="_blank">Link</a></td> + <td><a href="{{model.app.amContainerLogs}}" target="_blank">Link</a></td> + <td><a href="{{amHostHttpAddressFormatted}}" target="_blank">Link</a></td> <td>{{model.app.amNodeLabelExpression}}</td> </tr> </tbody> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
