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 7e3050f5f8..5d0f23b1e3 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 @@ -127,5 +127,21 @@ export default DS.Model.extend({ } return "label label-" + style; - }.property("finalStatus") + }.property("finalStatus"), + + logAggregationStatusStyle: function() { + const logAggregationStatus = this.get("logAggregationStatus"); + var style = ""; + if (logAggregationStatus === "FAILED" || + logAggregationStatus === "TIME_OUT") { + style = "danger"; + } else if (logAggregationStatus === "RUNNING_WITH_FAILURE") { + style = "warning"; + } else if (logAggregationStatus === "SUCCEEDED") { + style = "success"; + } else { + style = "default"; + } + return "label label-" + style; + }.property("logAggregationStatus") }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js index 883750366f..99e4cff093 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js @@ -30,7 +30,8 @@ export default AbstractRoute.extend(AppAttemptMixin, { serviceName: service, attempts: this.fetchAttemptListFromRMorATS(app_id, this.store).catch(function() { return []; - }) + }), + app: this.fetchAppInfoFromRMorATS(app_id, this.store) }); }, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs index 53173b4fab..a190def7e9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs @@ -23,6 +23,10 @@ Logs {{collapsible-panel targetId="logFilesCollapsablePanel"}}