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; + }) +}); 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') + }) }); 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'), 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, 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}} AM Node Web UI - {{attempt.nodeHttpAddress}} + {{nodeHttpAddressFormatted}} {{/if}} @@ -43,7 +43,7 @@ {{#if attempt.IsLinkAvailable}} Log - link + Link {{/if}} {{#if attempt.attemptState}} @@ -59,4 +59,4 @@ {{/if}} - \ No newline at end of file + 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 @@ Log - link + Link Exit Status @@ -48,7 +48,7 @@ NodeManager UI - {{container.nodeHttpAddress}} + {{container.nodeHttpAddress}} - \ 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 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 @@
-
App Master Info
+
Application Master Info
- + - - + +
Master Container Log Master NodeMaster Node Label ExprMaster Node Label Expression
LinkLinkLinkLink {{model.app.amNodeLabelExpression}}