diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js index c2cb0bd075..db0074db1d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js @@ -48,6 +48,11 @@ export default Ember.Controller.extend({ headerTitle: 'Application Type', contentPath: 'applicationType', facetType: null, + }, { + id: 'appTag', + headerTitle: 'Application Tag', + contentPath: 'applicationTags', + facetType: null, }, { id: 'appName', headerTitle: 'Application Name', @@ -134,11 +139,16 @@ export default Ember.Controller.extend({ } }, { id: 'appId', - headerTitle: 'Application ID', + headerTitle: 'Application Tag', contentPath: 'id', facetType: null, cellComponentName: 'em-table-tooltip-text', minWidth: "250px" + }, { + id: 'appTag', + headerTitle: 'Application ID', + contentPath: 'applicationTags', + facetType: null, }, { id: 'state', headerTitle: 'State', 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 b3d9f192c7..5e83801030 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,6 +48,9 @@ export default DS.JSONAPISerializer.extend({ finalStatus: payload.finalStatus, progress: payload.progress, applicationType: payload.applicationType, + applicationTags: + (payload.applicationTags && payload.applicationTags !== 'null')? + payload.applicationTags : 'N/A', diagnostics: (payload.diagnostics && payload.diagnostics !== 'null')? payload.diagnostics : '', amHostHttpAddress: payload.amHostHttpAddress, masterNodeId: payload.masterNodeId,