diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
index 8a2b3de..a4d20a9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
@@ -273,5 +273,5 @@ export default Ember.Component.extend({
if (this.modelArr.length > 0) {
this.setSelected(this.modelArr[0]);
}
- },
+ }
});
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempt.js
index a8f27f5..7809d69 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempt.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempt.js
@@ -39,5 +39,5 @@ export default Ember.Route.extend({
return [];
})
});
- }
+ },
});
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempts-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempts-table.hbs
new file mode 100644
index 0000000..a6c2ab2
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempts-table.hbs
@@ -0,0 +1,77 @@
+{{!
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+}}
+
+
+
+
+
+ | Application Attempt Id |
+ Start Time |
+ AM Container Id |
+ AM Node Web UI |
+ AM Node Id |
+ Log |
+ Attempt State |
+ Elapsed Time |
+
+
+
+
+{{#if arr1}}
+ {{#each arr1 as |attempt|}}
+
+ |
+ {{#if attempt.link}}
+ {{#link-to attempt.linkname attempt.id}}{{attempt.id}}{{/link-to}}
+ {{else}}
+ {{attempt.id}}
+ {{/if}}
+ |
+ {{attempt.attemptStartedTime}} |
+ {{attempt.appMasterContainerId}} |
+ {{attempt.nodeHttpAddress}} |
+ {{attempt.amNodeId}} |
+ link |
+ {{attempt.attemptState}} |
+ {{attempt.elapsedTime}} |
+
+ {{/each}}
+{{/if}}
+
+{{#if arr2}}
+ {{#each arr2 as |attempt|}}
+
+ |
+ {{#if attempt.link}}
+ {{#link-to attempt.linkname attempt.id}}{{attempt.id}}{{/link-to}}
+ {{else}}
+ {{attempt.id}}
+ {{/if}}
+ |
+ {{attempt.attemptStartedTime}} |
+ {{attempt.appMasterContainerId}} |
+ {{attempt.nodeHttpAddress}} |
+ {{attempt.amNodeId}} |
+ link |
+ {{attempt.attemptState}} |
+ {{attempt.elapsedTime}} |
+
+ {{/each}}
+{{/if}}
+
+
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/containers-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/containers-table.hbs
new file mode 100644
index 0000000..28b84cf
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/containers-table.hbs
@@ -0,0 +1,78 @@
+{{!
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+}}
+
+
+
+
+ | Container Id |
+ Start Time |
+ Finished Time |
+ Elapsed Time |
+ Priority |
+ Log |
+ Exit Status |
+ State |
+ NodeManager UI |
+
+
+
+
+{{#if arr1}}
+ {{#each arr1 as |container|}}
+
+ |
+ {{#if container.link}}
+ {{#link-to container.linkname container.id}}{{container.id}}{{/link-to}}
+ {{else}}
+ {{container.id}}
+ {{/if}}
+ |
+ {{container.startedTime}} |
+ {{container.validatedFinishedTs}} |
+ {{container.elapsedTime}} |
+ {{container.priority}} |
+ link |
+ {{container.containerExitStatus}} |
+ {{container.containerState}} |
+ {{container.nodeHttpAddress}} |
+
+ {{/each}}
+{{/if}}
+{{#if arr2}}
+ {{#each arr2 as |container|}}
+
+ |
+ {{#if container.link}}
+ {{#link-to container.linkname container.id}}{{container.id}}{{/link-to}}
+ {{else}}
+ {{container.id}}
+ {{/if}}
+ |
+ {{container.startedTime}} |
+ {{container.validatedFinishedTs}} |
+ {{container.elapsedTime}} |
+ {{container.priority}} |
+ link |
+ {{container.containerExitStatus}} |
+ {{container.containerState}} |
+ {{container.nodeHttpAddress}} |
+
+ {{/each}}
+{{/if}}
+
+
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs
index 6f529ba..56740d7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs
@@ -39,6 +39,7 @@
{{selected.id}}
{{/if}}
+
{{#if attemptModel}}
{{app-attempt-table attempt=selected}}
{{else}}
@@ -46,6 +47,16 @@
{{/if}}
+
+
+ {{#if attemptModel}}
+ {{containers-table arr1=rmModel arr2=tsModel table-id="app-attempts-table"}}
+ {{simple-table table-id="app-attempts-table" bFilter=true colsOrder="0,desc" colTypes="natural elapsed-time" colTargets="0 7"}}
+ {{else}}
+ {{containers-table arr1=rmModel arr2=tsModel table-id="containers-table"}}
+ {{simple-table table-id="containers-table" bFilter=true colsOrder="0,desc" colTypes="natural elapsed-time" colTargets="0 7"}}
+ {{/if}}
+
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs
index b01eceb..40e5751 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs
@@ -24,10 +24,11 @@
-
- {{#if (or model.rmContainers model.tsContainers)}}
- {{timeline-view parent-id="containers-timeline-div" my-id="timeline-view" height="400" rmModel=model.rmContainers tsModel=model.tsContainers label="shortAppAttemptId" attemptModel=false}}
- {{/if}}
+
+ {{#if (or model.rmContainers model.tsContainers)}}
+ {{timeline-view parent-id="containers-timeline-div" my-id="timeline-view" height="400" rmModel=model.rmContainers tsModel=model.tsContainers
+ label="shortAppAttemptId" attemptModel=false timelineView=isTimelineView}}
+ {{/if}}