You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by va...@apache.org on 2017/10/17 20:37:43 UTC
[01/50] [abbrv] hadoop git commit: YARN-5500. [YARN-3368] ‘Master node' link under application tab is broken. (Akhil P B Tan via Sunil G)
Repository: hadoop
Updated Branches:
refs/heads/YARN-3368_branch2 [created] 3a5f1a6c2
YARN-5500. [YARN-3368] ‘Master node' link under application tab is broken. (Akhil P B Tan via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/94c53e79
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/94c53e79
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/94c53e79
Branch: refs/heads/YARN-3368_branch2
Commit: 94c53e7985fffd68bad056275447028c3d53f5dc
Parents: addc399
Author: sunilg <su...@apache.org>
Authored: Thu Oct 27 14:19:44 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/controllers/yarn-app.js | 9 ++++++++-
.../src/main/webapp/app/templates/yarn-app.hbs | 4 ++--
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/94c53e79/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 f6b9404..309c895 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
@@ -33,6 +33,13 @@ export default Ember.Controller.extend({
routeName: 'yarn-app',
model: appId
}];
- })
+ }),
+ amHostHttpAddressFormatted: function() {
+ var amHostAddress = this.get('model.app.amHostHttpAddress');
+ if (amHostAddress.indexOf('http://') < 0) {
+ amHostAddress = 'http://' + amHostAddress;
+ }
+ return amHostAddress;
+ }.property('model.app.amHostHttpAddress')
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/94c53e79/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 9e92fc1..acf00d1 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
@@ -172,8 +172,8 @@
<tbody>
<tr>
- <td><a href={{model.app.amContainerLogs}}>Link</a></td>
- <td><a href={{model.app.amHostHttpAddress}}>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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[07/50] [abbrv] hadoop git commit: Updating pom to be 2.9.0-SNAPSHOT
instead of 3.0
Posted by va...@apache.org.
Updating pom to be 2.9.0-SNAPSHOT instead of 3.0
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1510fea0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1510fea0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1510fea0
Branch: refs/heads/YARN-3368_branch2
Commit: 1510fea0622f90ae4b7c288d661e6f2520bec72b
Parents: 62aedbf
Author: vrushali <vr...@apache.org>
Authored: Wed Sep 6 21:59:10 2017 -0700
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1510fea0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 2933a76..7dcc42e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -20,12 +20,12 @@
<parent>
<artifactId>hadoop-yarn</artifactId>
<groupId>org.apache.hadoop</groupId>
- <version>3.0.0-alpha2-SNAPSHOT</version>
+ <version>2.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-ui</artifactId>
- <version>3.0.0-alpha2-SNAPSHOT</version>
+ <version>2.9.0-SNAPSHOT</version>
<name>Apache Hadoop YARN UI</name>
<packaging>${packaging.type}</packaging>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[09/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to fix
ASF warnings. (Wangda Tan via Sunil G)
Posted by va...@apache.org.
YARN-4849. Addendum patch to fix ASF warnings. (Wangda Tan via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/542f661c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/542f661c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/542f661c
Branch: refs/heads/YARN-3368_branch2
Commit: 542f661cc1dfd210cac5818e3cc96c1af34beb02
Parents: dd8ad34
Author: sunilg <su...@apache.org>
Authored: Wed Aug 31 23:43:02 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
.../assets/images/datatables/Sorting icons.psd | Bin 27490 -> 0 bytes
.../public/assets/images/datatables/favicon.ico | Bin 894 -> 0 bytes
.../public/assets/images/datatables/sort_asc.png | Bin 160 -> 0 bytes
.../assets/images/datatables/sort_asc_disabled.png | Bin 148 -> 0 bytes
.../public/assets/images/datatables/sort_both.png | Bin 201 -> 0 bytes
.../public/assets/images/datatables/sort_desc.png | Bin 158 -> 0 bytes
.../images/datatables/sort_desc_disabled.png | Bin 146 -> 0 bytes
7 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/542f661c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/Sorting icons.psd
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/Sorting icons.psd b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/Sorting icons.psd
deleted file mode 100644
index 53b2e06..0000000
Binary files a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/Sorting icons.psd and /dev/null differ
http://git-wip-us.apache.org/repos/asf/hadoop/blob/542f661c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/favicon.ico
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/favicon.ico b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/favicon.ico
deleted file mode 100644
index 6eeaa2a..0000000
Binary files a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/favicon.ico and /dev/null differ
http://git-wip-us.apache.org/repos/asf/hadoop/blob/542f661c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc.png
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc.png
deleted file mode 100644
index e1ba61a..0000000
Binary files a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/hadoop/blob/542f661c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc_disabled.png
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc_disabled.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc_disabled.png
deleted file mode 100644
index fb11dfe..0000000
Binary files a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc_disabled.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/hadoop/blob/542f661c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_both.png
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_both.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_both.png
deleted file mode 100644
index af5bc7c..0000000
Binary files a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_both.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/hadoop/blob/542f661c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_desc.png
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_desc.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_desc.png
deleted file mode 100644
index 0e156de..0000000
Binary files a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_desc.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/hadoop/blob/542f661c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_desc_disabled.png
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_desc_disabled.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_desc_disabled.png
deleted file mode 100644
index c9fdd8a..0000000
Binary files a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_desc_disabled.png and /dev/null differ
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[17/50] [abbrv] hadoop git commit: YARN-5145. [YARN-3368] Move new
YARN UI configuration to HADOOP_CONF_DIR. (Sunil G and Kai Sasaki via wangda)
Posted by va...@apache.org.
YARN-5145. [YARN-3368] Move new YARN UI configuration to HADOOP_CONF_DIR. (Sunil G and Kai Sasaki via wangda)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/75133157
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/75133157
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/75133157
Branch: refs/heads/YARN-3368_branch2
Commit: 751331575847339aa8735d81eabe93cc71d2c51e
Parents: f1de967
Author: Wangda Tan <wa...@apache.org>
Authored: Mon Oct 17 11:30:16 2016 -0700
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/initializers/loader.js | 86 ++++++++++++++++++++
.../tests/unit/initializers/loader-test.js | 40 +++++++++
2 files changed, 126 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/75133157/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
new file mode 100644
index 0000000..08e4dbd
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
@@ -0,0 +1,86 @@
+/**
+ * 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.
+ */
+
+
+function getTimeLineURL(parameters) {
+ return '/conf?name=yarn.timeline-service.webapp.address';
+}
+
+function updateConfigs(application) {
+ var hostname = window.location.hostname;
+ var rmhost = hostname +
+ (window.location.port ? ':' + window.location.port: '');
+
+ Ember.Logger.log("RM Address:" + rmhost);
+
+ if(!ENV.hosts.rmWebAddress) {
+ ENV = {
+ hosts: {
+ rmWebAddress: rmhost,
+ },
+ };
+ }
+
+ if(!ENV.hosts.timelineWebAddress) {
+ var result = [];
+ var timelinehost = "";
+ $.ajax({
+ type: 'GET',
+ dataType: 'json',
+ async: true,
+ context: this,
+ url: getTimeLineURL(),
+ success: function(data) {
+ timelinehost = data.property.value;
+ ENV.hosts.timelineWebAddress = timelinehost;
+
+ var address = timelinehost.split(":")[0];
+ var port = timelinehost.split(":")[1];
+
+ Ember.Logger.log("Timeline Address from RM:" + address + ":" + port);
+
+ if(address == "0.0.0.0" || address == "localhost") {
+ var updatedAddress = hostname + ":" + port;
+
+ /* Timeline v2 is not supporting CORS, so make as default*/
+ ENV = {
+ hosts: {
+ rmWebAddress: rmhost,
+ timelineWebAddress: updatedAddress,
+ },
+ };
+ Ember.Logger.log("Timeline Updated Address:" + updatedAddress);
+ }
+ application.advanceReadiness();
+ },
+ });
+ } else {
+ application.advanceReadiness();
+ }
+}
+
+export function initialize( application ) {
+ application.deferReadiness();
+ updateConfigs(application);
+}
+
+export default {
+ name: 'loader',
+ before: 'env',
+ initialize
+};
http://git-wip-us.apache.org/repos/asf/hadoop/blob/75133157/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/loader-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/loader-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/loader-test.js
new file mode 100644
index 0000000..cc32e92
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/loader-test.js
@@ -0,0 +1,40 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import LoaderInitializer from '../../../initializers/loader';
+import { module, test } from 'qunit';
+
+let application;
+
+module('Unit | Initializer | loader', {
+ beforeEach() {
+ Ember.run(function() {
+ application = Ember.Application.create();
+ application.deferReadiness();
+ });
+ }
+});
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+ LoaderInitializer.initialize(application);
+
+ // you would normally confirm the results of the initializer here
+ assert.ok(true);
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[22/50] [abbrv] hadoop git commit: YARN-5490. [YARN-3368] Fix various
alignment issues and broken breadcrumb link in Node page. (Akhil P B Tan via
Sunil G)
Posted by va...@apache.org.
YARN-5490. [YARN-3368] Fix various alignment issues and broken breadcrumb link in Node page. (Akhil P B Tan via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9ebb57df
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9ebb57df
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9ebb57df
Branch: refs/heads/YARN-3368_branch2
Commit: 9ebb57dfc8b54bd0a31c6f0adf71c4fa28e5b396
Parents: 36f5091
Author: sunilg <su...@apache.org>
Authored: Thu Oct 27 21:04:56 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/controllers/yarn-node-apps.js | 2 +-
.../src/main/webapp/app/controllers/yarn-node-containers.js | 2 +-
.../hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js | 2 +-
.../src/main/webapp/app/controllers/yarn-nodes-heatmap.js | 2 +-
.../hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes.js | 2 +-
.../hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs | 4 ++--
.../hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ebb57df/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
index 4bfe9d0..6e67ab0 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
routeName: 'application'
},{
text: "Nodes",
- routeName: 'yarn-nodes'
+ routeName: 'yarn-nodes.table'
}, {
text: `Node [ ${nodeInfo.id} ]`,
href: `/#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ebb57df/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
index 59c8591..abe4098 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
routeName: 'application'
},{
text: "Nodes",
- routeName: 'yarn-nodes'
+ routeName: 'yarn-nodes.table'
}, {
text: `Node [ ${nodeInfo.id} ]`,
href: `/#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ebb57df/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
index e505022..0661415 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
routeName: 'application'
},{
text: "Nodes",
- routeName: 'yarn-nodes'
+ routeName: 'yarn-nodes.table'
}, {
text: `Node [ ${nodeInfo.id} ]`,
href: `/#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ebb57df/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-heatmap.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-heatmap.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-heatmap.js
index fbe77fa..a38d8c5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-heatmap.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-heatmap.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
routeName: 'application'
}, {
text: "Nodes",
- routeName: 'yarn-nodes',
+ routeName: 'yarn-nodes.table',
}, {
text: "Heatmap",
routeName: 'yarn-nodes-heatmap',
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ebb57df/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes.js
index b4bf0f0..24f9550 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
routeName: 'application'
}, {
text: "Nodes",
- routeName: 'yarn-nodes',
+ routeName: 'yarn-nodes.table',
}]
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ebb57df/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs
index 2d6b3a3..b7f727a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs
@@ -82,7 +82,7 @@
</div>
<div class="row">
- <div class="col-lg-4 container-fluid">
+ <div class="col-lg-5 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
Resource - Memory (in MB)
@@ -97,7 +97,7 @@
</div>
</div>
- <div class="col-lg-4 container-fluid">
+ <div class="col-lg-5 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
Resource - VCores
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ebb57df/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
index ed5522e..874b3c4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
@@ -47,7 +47,7 @@
<div class="col-md-10 container-fluid">
{{#if model.clusterMetrics}}
<div class="row">
- <div class="col-lg-4 container-fluid">
+ <div class="col-lg-5 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
Node Managers
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[11/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to fix
javadocs. (Sunil G via wangda)
Posted by va...@apache.org.
YARN-4849. Addendum patch to fix javadocs. (Sunil G via wangda)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e5c02192
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e5c02192
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e5c02192
Branch: refs/heads/YARN-3368_branch2
Commit: e5c021922863308c274564548fad7e3398515699
Parents: b428cf8
Author: Wangda Tan <wa...@apache.org>
Authored: Fri Sep 9 10:54:37 2016 -0700
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
.../hadoop/yarn/server/resourcemanager/ResourceManager.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5c02192/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
index 077cc1b..a26bc0c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
@@ -1013,6 +1013,12 @@ public class ResourceManager extends CompositeService implements Recoverable {
* Return a HttpServer.Builder that the journalnode / namenode / secondary
* namenode can use to initialize their HTTP / HTTPS server.
*
+ * @param conf configuration object
+ * @param httpAddr HTTP address
+ * @param httpsAddr HTTPS address
+ * @param name Name of the server
+ * @throws IOException from Builder
+ * @return builder object
*/
public static HttpServer2.Builder httpServerTemplateForRM(Configuration conf,
final InetSocketAddress httpAddr, final InetSocketAddress httpsAddr,
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[13/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to
remove unwanted files from rat exclusions. (Wangda Tan via Sunil G)
Posted by va...@apache.org.
YARN-4849. Addendum patch to remove unwanted files from rat exclusions. (Wangda Tan via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f1de967c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f1de967c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f1de967c
Branch: refs/heads/YARN-3368_branch2
Commit: f1de967c6731d7a697c97040d55fdc7ed1cc2d76
Parents: c0c124c
Author: sunilg <su...@apache.org>
Authored: Fri Oct 14 18:23:04 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
.../hadoop-yarn/hadoop-yarn-ui/pom.xml | 14 --------
.../src/main/webapp/.editorconfig | 34 --------------------
2 files changed, 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1de967c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index e59e9bf..54bfe3f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -46,32 +46,18 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
- <exclude>src/main/webapp/node_modules/**/*</exclude>
- <exclude>src/main/webapp/bower_components/**/*</exclude>
<exclude>src/main/webapp/jsconfig.json</exclude>
<exclude>src/main/webapp/bower.json</exclude>
<exclude>src/main/webapp/package.json</exclude>
<exclude>src/main/webapp/testem.json</exclude>
-
- <exclude>src/main/webapp/dist/**/*</exclude>
- <exclude>src/main/webapp/tmp/**/*</exclude>
<exclude>src/main/webapp/public/assets/images/**/*</exclude>
<exclude>src/main/webapp/public/assets/images/*</exclude>
<exclude>src/main/webapp/public/robots.txt</exclude>
-
- <exclude>public/assets/images/**/*</exclude>
<exclude>public/crossdomain.xml</exclude>
-
- <exclude>src/main/webapp/.tmp/**/*</exclude>
<exclude>src/main/webapp/.bowerrc</exclude>
- <exclude>src/main/webapp/.editorconfig</exclude>
<exclude>src/main/webapp/.ember-cli</exclude>
- <exclude>src/main/webapp/.gitignore</exclude>
<exclude>src/main/webapp/.jshintrc</exclude>
- <exclude>src/main/webapp/.travis.yml</exclude>
<exclude>src/main/webapp/.watchmanconfig</exclude>
- <exclude>src/main/webapp/tests/.jshintrc</exclude>
- <exclude>src/main/webapp/blueprints/.jshintrc</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1de967c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
deleted file mode 100644
index 47c5438..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
+++ /dev/null
@@ -1,34 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.js]
-indent_style = space
-indent_size = 2
-
-[*.hbs]
-insert_final_newline = false
-indent_style = space
-indent_size = 2
-
-[*.css]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[37/50] [abbrv] hadoop git commit: YARN-5705. Show timeline data from
ATS v2 in new web UI. Contributed by Akhil PB.
Posted by va...@apache.org.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs
new file mode 100644
index 0000000..b700464
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs
@@ -0,0 +1,53 @@
+{{!--
+ 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.
+--}}
+
+<h3>Flow Information</h3>
+<div class="panel panel-default">
+ <div class="panel-body">
+ <table class="table table-striped table-bordered">
+ <tbody>
+ <tr>
+ <td>Flow Name</td>
+ <td>{{flowInfo.flowName}}</td>
+ </tr>
+ <tr>
+ <td>User</td>
+ <td>{{flowInfo.user}}</td>
+ </tr>
+ <tr>
+ <td>Flow ID</td>
+ <td>{{flowInfo.flowUid}}</td>
+ </tr>
+ <tr>
+ <td>First Run Started</td>
+ <td>{{flowInfo.firstRunStarted}}</td>
+ </tr>
+ <tr>
+ <td>Last Run Finished</td>
+ <td>{{flowInfo.lastRunFinished}}</td>
+ </tr>
+ {{#if flowInfo.lastExecutionDate}}
+ <tr>
+ <td>Last Execution Date</td>
+ <td>{{flowInfo.lastExecutionDate}}</td>
+ </tr>
+ {{/if}}
+ </tbody>
+ </table>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs
new file mode 100644
index 0000000..96d9e63
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs
@@ -0,0 +1,131 @@
+{{!--
+ 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.
+--}}
+
+<div class="yarn-flow-runs">
+
+ {{#if (or (or elapsedTimeVizData.length cpuVCoresVizData.length) memoryVizData.length)}}
+ <div class="dropdown pull-right">
+ <button class="btn btn-sm btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
+ Add Metrics Widget <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ {{#if elapsedTimeVizData.length}}
+ <li>
+ <a href="#" {{action "addVizWidget" "runDuration"}}>
+ <div class="item-icon">
+ {{#if vizWidgets.runDuration}}
+ <i class="glyphicon glyphicon-ok text-success"></i>
+ {{/if}}
+ </div>
+ <div class="item-text">Flow Run Vs Run Duration</div>
+ </a>
+ </li>
+ {{/if}}
+ {{#if cpuVCoresVizData.length}}
+ <li>
+ <a href="#" {{action "addVizWidget" "cpuVcores"}}>
+ <div class="item-icon">
+ {{#if vizWidgets.cpuVcores}}
+ <i class="glyphicon glyphicon-ok text-success"></i>
+ {{/if}}
+ </div>
+ <div class="item-text">Flow Run Vs Cpu Vcores</div>
+ </a>
+ </li>
+ {{/if}}
+ {{#if memoryVizData.length}}
+ <li>
+ <a href="#" {{action "addVizWidget" "memoryUsed"}}>
+ <div class="item-icon">
+ {{#if vizWidgets.memoryUsed}}
+ <i class="glyphicon glyphicon-ok text-success"></i>
+ {{/if}}
+ </div>
+ <div class="item-text">Flow Run Vs Memory Used</div>
+ </a>
+ </li>
+ {{/if}}
+ </ul>
+ </div>
+ {{/if}}
+
+ <h3>Flow Runs</h3>
+ {{em-table columns=columns rows=model.flowRuns definition=tableDefinition}}
+
+ <div class="col-md-12">
+ {{#if (and elapsedTimeVizData.length vizWidgets.runDuration)}}
+ <div class="row">
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div class="glyphicon glyphicon-remove pull-right" {{action "removeVizWidget" "runDuration"}}></div>
+ <h4 class="text-center">Flow Run Vs Run Duration</h4>
+ {{simple-bar-chart
+ class="chart-panel"
+ data=elapsedTimeVizData
+ xAxisTickFormatter=flowrunIdFormatter
+ yAxisTickFormatter=elapsedTimeFormatter
+ xAxisText="Flow Run"
+ yAxisText="Run Duration"
+ onBarChartClickCallback=onBarChartClick
+ }}
+ </div>
+ </div>
+ </div>
+ {{/if}}
+
+ {{#if (and cpuVCoresVizData.length vizWidgets.cpuVcores)}}
+ <div class="row">
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div class="glyphicon glyphicon-remove pull-right" {{action "removeVizWidget" "cpuVcores"}}></div>
+ <h4 class="text-center">Flow Run Vs CPU VCores</h4>
+ {{simple-bar-chart
+ class="chart-panel"
+ data=cpuVCoresVizData
+ xAxisTickFormatter=flowrunIdFormatter
+ xAxisText="Flow Run"
+ yAxisText="CPU VCores"
+ onBarChartClickCallback=onBarChartClick
+ }}
+ </div>
+ </div>
+ </div>
+ {{/if}}
+
+ {{#if (and memoryVizData.length vizWidgets.memoryUsed)}}
+ <div class="row">
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div class="glyphicon glyphicon-remove pull-right" {{action "removeVizWidget" "memoryUsed"}}></div>
+ <h4 class="text-center">Flow Run Vs Memory Used</h4>
+ {{simple-bar-chart
+ class="chart-panel"
+ data=memoryVizData
+ xAxisTickFormatter=flowrunIdFormatter
+ yAxisTickFormatter=memoryFormatter
+ xAxisText="Flow Run"
+ yAxisText="Memory Used"
+ onBarChartClickCallback=onBarChartClick
+ }}
+ </div>
+ </div>
+ </div>
+ {{/if}}
+ </div>
+
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun-metric.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun-metric.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun-metric.hbs
new file mode 100644
index 0000000..832b47a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun-metric.hbs
@@ -0,0 +1,34 @@
+{{!--
+ * 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.
+--}}
+
+<div class="container">
+ <div class="row">
+ <h4>Sunburst chart for Metric "{{metric_id}}"</h4>
+ <h4>(Flowrun: {{flowrun.id}})</h4>
+ <div id="main">
+ <div id="sequence"></div>
+ <div id="chart">
+ <div id="explanation" style="visibility: hidden;">
+ <span id="percentage"></span>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+{{sunburst-chart arr=arr}}
+{{outlet}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun.hbs
new file mode 100644
index 0000000..eb0b4bd
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun.hbs
@@ -0,0 +1,49 @@
+{{!--
+ 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.
+--}}
+
+<div class="col-md-12 container-fluid">
+ <div class="row">
+ {{breadcrumb-bar breadcrumbs=breadcrumbs}}
+ </div>
+ <div class="row">
+ <div class="col-md-2">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <div class="panel-title">
+ Flow Run Information
+ </div>
+ </div>
+ <div class="panel-body">
+ <ul class="nav nav-pills nav-stacked" id="stacked-menu">
+ <ul class="nav nav-pills nav-stacked collapse in">
+ {{#link-to 'yarn-flowrun.info' tagName="li"}}
+ {{#link-to 'yarn-flowrun.info' model.flowrun_uid}}Information{{/link-to}}
+ {{/link-to}}
+ {{#link-to 'yarn-flowrun.metrics' tagName="li"}}
+ {{#link-to 'yarn-flowrun.metrics' model.flowrun_uid}}Metrics{{/link-to}}
+ {{/link-to}}
+ </ul>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-10">
+ {{outlet}}
+ </div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/info.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/info.hbs
new file mode 100644
index 0000000..f7e726c
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/info.hbs
@@ -0,0 +1,128 @@
+{{!--
+ 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.
+--}}
+
+<div class="yarn-flow-runinfo">
+ <h3>Flow Run Info</h3>
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <table class="table table-striped table-bordered">
+ <tbody>
+ <tr>
+ <td>Flow Name</td>
+ <td>{{model.flowrun.flowName}}</td>
+ </tr>
+ <tr>
+ <td>Run ID</td>
+ <td>{{model.flowrun.shownid}}</td>
+ </tr>
+ <tr>
+ <td>Launched By</td>
+ <td>{{model.flowrun.user}}</td>
+ </tr>
+ <tr>
+ <td>Run Sequence ID</td>
+ <td>{{model.flowrun.runid}}</td>
+ </tr>
+ <tr>
+ <td>Start Time</td>
+ <td>{{model.flowrun.createTime}}</td>
+ </tr>
+ <tr>
+ <td>End Time</td>
+ <td>{{model.flowrun.endTime}}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+
+ {{#if (or cpuVCoresVizData.length memoryVizData.length)}}
+ <div class="dropdown pull-right">
+ <button class="btn btn-sm btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
+ Add Metrics Widget <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ {{#if cpuVCoresVizData.length}}
+ <li>
+ <a href="#" {{action "addVizWidget" "cpuVcores"}}>
+ <div class="item-icon">
+ {{#if vizWidgets.cpuVcores}}
+ <i class="glyphicon glyphicon-ok text-success"></i>
+ {{/if}}
+ </div>
+ <div class="item-text">Application Vs Cpu Vcores</div>
+ </a>
+ </li>
+ {{/if}}
+ {{#if memoryVizData.length}}
+ <li>
+ <a href="#" {{action "addVizWidget" "memoryUsed"}}>
+ <div class="item-icon">
+ {{#if vizWidgets.memoryUsed}}
+ <i class="glyphicon glyphicon-ok text-success"></i>
+ {{/if}}
+ </div>
+ <div class="item-text">Application Vs Memory Used</div>
+ </a>
+ </li>
+ {{/if}}
+ </ul>
+ </div>
+ {{/if}}
+
+ <!-- Flowrun aggregated data -->
+ <h3>Applications</h3>
+ {{em-table columns=columns rows=model.apps}}
+
+ {{#if (and cpuVCoresVizData.length vizWidgets.cpuVcores)}}
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div class="glyphicon glyphicon-remove pull-right" {{action "removeVizWidget" "cpuVcores"}}>
+ </div>
+ <h4 class="text-center">Application Vs CPU VCores</h4>
+ {{simple-bar-chart
+ class="chart-panel"
+ data=cpuVCoresVizData
+ xAxisTickFormatter=appIdFormatter
+ xAxisText="Application"
+ yAxisText="CPU VCores"
+ onBarChartClickCallback=onBarChartClick
+ }}
+ </div>
+ </div>
+ {{/if}}
+
+ {{#if (and memoryVizData.length vizWidgets.memoryUsed)}}
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div class="glyphicon glyphicon-remove pull-right" {{action "removeVizWidget" "memoryUsed"}}>
+ </div>
+ <h4 class="text-center">Application Vs Memory Used</h4>
+ {{simple-bar-chart
+ class="chart-panel"
+ data=memoryVizData
+ xAxisTickFormatter=appIdFormatter
+ yAxisTickFormatter=memoryFormatter
+ xAxisText="Application"
+ yAxisText="Memory Used"
+ onBarChartClickCallback=onBarChartClick
+ }}
+ </div>
+ </div>
+ {{/if}}
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/metrics.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/metrics.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/metrics.hbs
new file mode 100644
index 0000000..1863237
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/metrics.hbs
@@ -0,0 +1,34 @@
+{{!--
+ 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.
+--}}
+
+<h3>Flow Run <small>{{model.flowrun_uid}}</small></h3>
+<hr>
+
+<h3>GENERAL Metrics</h3>
+{{em-table columns=columns rows=generalConfigRows}}
+
+{{#if mapMetrics}}
+ <hr>
+ <h3>MAP Metrics</h3>
+ {{em-table columns=columns rows=mapConfigRows}}
+{{/if}}
+
+{{#if reduceMetrics}}
+ <h3>REDUCER Metrics</h3>
+ {{em-table columns=columns rows=reduceConfigRows}}
+{{/if}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
index 649834a..9637a93 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
@@ -25,7 +25,7 @@
<div class="col-md-2 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
- <h4>Services</h4>
+ Services
</div>
<div class="panel-body">
<ul class="nav nav-pills nav-stacked" id="stacked-menu">
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
index 4f24651..7c9a1f8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
@@ -22,7 +22,7 @@ export default {
containerIdToAttemptId: function(containerId) {
if (containerId) {
var arr = containerId.split('_');
- var attemptId = ["appattempt", arr[1],
+ var attemptId = ["appattempt", arr[1],
arr[2], this.padding(arr[3], 6)];
return attemptId.join('_');
}
@@ -30,7 +30,7 @@ export default {
attemptIdToAppId: function(attemptId) {
if (attemptId) {
var arr = attemptId.split('_');
- var appId = ["application", arr[1],
+ var appId = ["application", arr[1],
arr[2]].join('_');
return appId;
}
@@ -85,6 +85,10 @@ export default {
var dateTimeString = moment(parseInt(timeStamp)).format("YYYY/MM/DD HH:mm:ss");
return dateTimeString;
},
+ timeStampToDateOnly: function(timeStamp) {
+ var dateTimeString = moment(parseInt(timeStamp)).format("YYYY/MM/DD");
+ return dateTimeString;
+ },
dateToTimeStamp: function(date) {
if (date) {
var ts = moment(date, "YYYY/MM/DD HH:mm:ss").valueOf();
@@ -126,7 +130,7 @@ export default {
}
return value.toFixed(1) + " " + unit;
},
- msToElapsedTimeUnit: function(millisecs) {
+ msToElapsedTimeUnit: function(millisecs, short) {
var seconds = Math.floor(millisecs / 1000);
var days = Math.floor(seconds / (3600 * 24));
var hours = Math.floor(seconds / 3600) - (days * 24);
@@ -148,6 +152,18 @@ export default {
}
pluralize = secs > 1? " Secs" : " Sec";
timeStrArr.push(secs + pluralize);
+ if (short) {
+ return timeStrArr[0] + (timeStrArr[1]? " : " + timeStrArr[1] : "");
+ }
return timeStrArr.join(" : ");
+ },
+ memoryBytesToMB: function(mem) {
+ var unit = "MB";
+ var value = mem / (1024 * 1024);
+ if (value / 1024 >= 0.9) {
+ value = value / 1024;
+ unit = "GB";
+ }
+ return value.toFixed(1) + " " + unit;
}
};
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/error-utils.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/error-utils.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/error-utils.js
new file mode 100644
index 0000000..463f61f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/error-utils.js
@@ -0,0 +1,58 @@
+/**
+ * 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.
+ */
+
+export default {
+ getErrorTypeByErrorCode: function(code) {
+ var errorType = '';
+ if (code) {
+ switch (code) {
+ case "500":
+ errorType = "Internal Server Error";
+ break;
+ case "502":
+ errorType = "Bad Gateway";
+ break;
+ case "503":
+ errorType = "Service Unavailable";
+ break;
+ case "400":
+ errorType = "Bad Request";
+ break;
+ case "403":
+ errorType = "Forbidden";
+ break;
+ case "404":
+ errorType = "Not Found";
+ break;
+ default:
+ errorType = "";
+ break;
+ }
+ }
+ return errorType;
+ },
+ stripErrorCodeAndMessageFromError: function(err) {
+ var obj = {};
+ if (err && err.errors && err.errors[0]) {
+ obj.errorCode = err.errors[0].status || "";
+ obj.title = err.errors[0].title || "";
+ obj.errorType = this.getErrorTypeByErrorCode(err.errors[0].status);
+ }
+ return obj;
+ }
+};
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
index 70d4ebc..8ab7ce1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
@@ -27,6 +27,7 @@ module.exports = { // Yarn UI App configurations
timeline: 'ws/v1/applicationhistory',
cluster: 'ws/v1/cluster',
metrics: 'ws/v1/cluster/metrics',
- node: '{nodeAddress}/ws/v1/node'
+ node: '{nodeAddress}/ws/v1/node',
+ timelineV2: 'ws/v2/timeline'
},
};
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
index 4cd0fdc..a5e9a2b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
@@ -41,6 +41,7 @@
"ember-data": "2.1.0",
"ember-disable-proxy-controllers": "1.0.1",
"ember-export-application-global": "1.0.5",
+ "ember-lodash": "0.0.10",
"ember-resolver": "2.0.3",
"ember-spin-spinner": "0.2.3",
"ember-truth-helpers": "1.2.0",
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/simple-bar-chart-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/simple-bar-chart-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/simple-bar-chart-test.js
new file mode 100644
index 0000000..7298e65
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/simple-bar-chart-test.js
@@ -0,0 +1,43 @@
+/**
+ * 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.
+ */
+
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+
+moduleForComponent('simple-bar-chart', 'Integration | Component | simple bar chart', {
+ integration: true
+});
+
+test('it renders', function(assert) {
+
+ // Set any properties with this.set('myProperty', 'value');
+ // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+
+ this.render(hbs`{{simple-bar-chart}}`);
+
+ assert.equal(this.$().text().trim(), '');
+
+ // Template block usage:" + EOL +
+ this.render(hbs`
+ {{#simple-bar-chart}}
+ template block text
+ {{/simple-bar-chart}}
+ `);
+
+ assert.equal(this.$().text().trim(), 'template block text');
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-timeline-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-timeline-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-timeline-test.js
new file mode 100644
index 0000000..e53d289
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-timeline-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('adapter:yarn-app-timeline', 'Unit | Adapter | yarn app timeline', {
+ // Specify the other units that are required for this test.
+ // needs: ['serializer:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let adapter = this.subject();
+ assert.ok(adapter);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-appattempt-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-appattempt-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-appattempt-test.js
new file mode 100644
index 0000000..013713f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-appattempt-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('adapter:yarn-timeline-appattempt', 'Unit | Adapter | yarn timeline appattempt', {
+ // Specify the other units that are required for this test.
+ // needs: ['serializer:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let adapter = this.subject();
+ assert.ok(adapter);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-container-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-container-test.js
new file mode 100644
index 0000000..9167268
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-container-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('adapter:yarn-timeline-container', 'Unit | Adapter | yarn timeline container', {
+ // Specify the other units that are required for this test.
+ // needs: ['serializer:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let adapter = this.subject();
+ assert.ok(adapter);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/info-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/info-test.js
new file mode 100644
index 0000000..6ca796e
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/info-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('controller:yarn-flow/info', 'Unit | Controller | yarn flow/info', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let controller = this.subject();
+ assert.ok(controller);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/runs-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/runs-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/runs-test.js
new file mode 100644
index 0000000..aa80a0f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/runs-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('controller:yarn-flow/runs', 'Unit | Controller | yarn flow/runs', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let controller = this.subject();
+ assert.ok(controller);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/info-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/info-test.js
new file mode 100644
index 0000000..94233ba
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/info-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('controller:yarn-flowrun/info', 'Unit | Controller | yarn flowrun/info', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let controller = this.subject();
+ assert.ok(controller);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/metrics-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/metrics-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/metrics-test.js
new file mode 100644
index 0000000..9f1650b
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/metrics-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('controller:yarn-flowrun/metrics', 'Unit | Controller | yarn flowrun/metrics', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let controller = this.subject();
+ assert.ok(controller);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/mixins/app-attempt-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/mixins/app-attempt-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/mixins/app-attempt-test.js
new file mode 100644
index 0000000..af7b3dc
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/mixins/app-attempt-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import AppAttemptMixin from '../../../mixins/app-attempt';
+import { module, test } from 'qunit';
+
+module('Unit | Mixin | app attempt');
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+ let AppAttemptObject = Ember.Object.extend(AppAttemptMixin);
+ let subject = AppAttemptObject.create();
+ assert.ok(subject);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/mixins/charts-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/mixins/charts-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/mixins/charts-test.js
deleted file mode 100644
index 1f5ab99..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/mixins/charts-test.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 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.
- */
-
-import Ember from 'ember';
-import ChartsMixin from '../../../mixins/charts';
-import { module, test } from 'qunit';
-
-module('Unit | Mixin | charts');
-
-// Replace this with your real tests.
-test('it works', function(assert) {
- var ChartsObject = Ember.Object.extend(ChartsMixin);
- var subject = ChartsObject.create();
- assert.ok(subject);
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-timeline-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-timeline-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-timeline-test.js
new file mode 100644
index 0000000..e2d7e2a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-timeline-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleForModel, test } from 'ember-qunit';
+
+moduleForModel('yarn-app-timeline', 'Unit | Model | yarn app timeline', {
+ // Specify the other units that are required for this test.
+ needs: []
+});
+
+test('it exists', function(assert) {
+ let model = this.subject();
+ // let store = this.store();
+ assert.ok(!!model);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-appattempt-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-appattempt-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-appattempt-test.js
new file mode 100644
index 0000000..854030d
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-appattempt-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleForModel, test } from 'ember-qunit';
+
+moduleForModel('yarn-timeline-appattempt', 'Unit | Model | yarn timeline appattempt', {
+ // Specify the other units that are required for this test.
+ needs: []
+});
+
+test('it exists', function(assert) {
+ let model = this.subject();
+ // let store = this.store();
+ assert.ok(!!model);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-container-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-container-test.js
new file mode 100644
index 0000000..bc9da86
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-container-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleForModel, test } from 'ember-qunit';
+
+moduleForModel('yarn-timeline-container', 'Unit | Model | yarn timeline container', {
+ // Specify the other units that are required for this test.
+ needs: []
+});
+
+test('it exists', function(assert) {
+ let model = this.subject();
+ // let store = this.store();
+ assert.ok(!!model);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/timeline-error-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/timeline-error-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/timeline-error-test.js
new file mode 100644
index 0000000..840b64b
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/timeline-error-test.js
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('route:timeline-error', 'Unit | Route | timeline error', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+test('it exists', function(assert) {
+ let route = this.subject();
+ assert.ok(route);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/info-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/info-test.js
new file mode 100644
index 0000000..4b5bd383
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/info-test.js
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('route:yarn-flow/info', 'Unit | Route | yarn flow/info', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+test('it exists', function(assert) {
+ let route = this.subject();
+ assert.ok(route);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/runs-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/runs-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/runs-test.js
new file mode 100644
index 0000000..f890b76
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/runs-test.js
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('route:yarn-flow/runs', 'Unit | Route | yarn flow/runs', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+test('it exists', function(assert) {
+ let route = this.subject();
+ assert.ok(route);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/info-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/info-test.js
new file mode 100644
index 0000000..5c24276
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/info-test.js
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('route:yarn-flowrun/info', 'Unit | Route | yarn flowrun/info', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+test('it exists', function(assert) {
+ let route = this.subject();
+ assert.ok(route);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/metrics-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/metrics-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/metrics-test.js
new file mode 100644
index 0000000..ad30840
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/metrics-test.js
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('route:yarn-flowrun/metrics', 'Unit | Route | yarn flowrun/metrics', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+test('it exists', function(assert) {
+ let route = this.subject();
+ assert.ok(route);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-timeline-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-timeline-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-timeline-test.js
new file mode 100644
index 0000000..11a21db
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-timeline-test.js
@@ -0,0 +1,33 @@
+/**
+ * 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.
+ */
+
+import { moduleForModel, test } from 'ember-qunit';
+
+moduleForModel('yarn-app-timeline', 'Unit | Serializer | yarn app timeline', {
+ // Specify the other units that are required for this test.
+ needs: ['serializer:yarn-app-timeline']
+});
+
+// Replace this with your real tests.
+test('it serializes records', function(assert) {
+ let record = this.subject();
+
+ let serializedRecord = record.serialize();
+
+ assert.ok(serializedRecord);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-appattempt-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-appattempt-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-appattempt-test.js
new file mode 100644
index 0000000..4e9146c
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-appattempt-test.js
@@ -0,0 +1,33 @@
+/**
+ * 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.
+ */
+
+import { moduleForModel, test } from 'ember-qunit';
+
+moduleForModel('yarn-timeline-appattempt', 'Unit | Serializer | yarn timeline appattempt', {
+ // Specify the other units that are required for this test.
+ needs: ['serializer:yarn-timeline-appattempt']
+});
+
+// Replace this with your real tests.
+test('it serializes records', function(assert) {
+ let record = this.subject();
+
+ let serializedRecord = record.serialize();
+
+ assert.ok(serializedRecord);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-container-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-container-test.js
new file mode 100644
index 0000000..e55fea0
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-container-test.js
@@ -0,0 +1,33 @@
+/**
+ * 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.
+ */
+
+import { moduleForModel, test } from 'ember-qunit';
+
+moduleForModel('yarn-timeline-container', 'Unit | Serializer | yarn timeline container', {
+ // Specify the other units that are required for this test.
+ needs: ['serializer:yarn-timeline-container']
+});
+
+// Replace this with your real tests.
+test('it serializes records', function(assert) {
+ let record = this.subject();
+
+ let serializedRecord = record.serialize();
+
+ assert.ok(serializedRecord);
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[33/50] [abbrv] hadoop git commit: YARN-6196. Improve Resource Donut
chart with better label in Node page of new YARN UI. Contributed by Akhil PB.
Posted by va...@apache.org.
YARN-6196. Improve Resource Donut chart with better label in Node page of 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/bbd98cb0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bbd98cb0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bbd98cb0
Branch: refs/heads/YARN-3368_branch2
Commit: bbd98cb019a7395e91a9fee44c2c4bea2acadedf
Parents: 03511fd
Author: Sunil G <su...@apache.org>
Authored: Fri Mar 10 16:17:48 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../main/webapp/app/helpers/log-files-comma.js | 10 ++++++++-
.../app/serializers/yarn-node-container.js | 2 +-
.../main/webapp/app/serializers/yarn-node.js | 4 ++--
.../main/webapp/app/serializers/yarn-rm-node.js | 4 ++--
.../src/main/webapp/app/templates/yarn-node.hbs | 23 +++++++++++++-------
.../main/webapp/app/templates/yarn-nodes.hbs | 2 +-
.../webapp/app/templates/yarn-nodes/table.hbs | 13 ++++++-----
7 files changed, 37 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbd98cb0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
index 78dcf25..026cd7f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
@@ -35,8 +35,16 @@ export default Ember.Helper.helper(function(params,hash) {
var containerId = hash.containerId;
var html = '<td>';
for (var i = 0; i < logFilesLen; i++) {
+ var logFileName = "";
+ if (logFiles[i]) {
+ if (typeof logFiles[i] === "object" && logFiles[i].containerLogFiles) {
+ logFileName = logFiles[i].containerLogFiles;
+ } else if (typeof logFiles[i] === "string") {
+ logFileName = logFiles[i];
+ }
+ }
html = html + '<a href="#/yarn-container-log/' + nodeId + '/' +
- nodeAddr + '/' + containerId + '/' + logFiles[i] + '">' + logFiles[i] +
+ nodeAddr + '/' + containerId + '/' + logFileName + '">' + logFileName +
'</a>';
if (i !== logFilesLen - 1) {
html = html + ",";
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbd98cb0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
index 7e78987..7bcb655 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
@@ -30,7 +30,7 @@ export default DS.JSONAPISerializer.extend({
containerId: payload.id,
state: payload.state,
user: payload.user,
- diagnostics: payload.diagnostics,
+ diagnostics: payload.diagnostics || 'N/A',
exitCode: payload.exitCode,
totalMemoryNeeded: payload.totalMemoryNeededMB,
totalVCoresNeeded: payload.totalVCoresNeeded,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbd98cb0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
index 0d9faec..10521e6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
@@ -36,8 +36,8 @@ export default DS.JSONAPISerializer.extend({
pmemCheckEnabled: payload.pmemCheckEnabled,
nodeHealthy: payload.nodeHealthy,
lastNodeUpdateTime: Converter.timeStampToDate(payload.lastNodeUpdateTime),
- healthReport: payload.healthReport,
- nmStartupTime: Converter.timeStampToDate(payload.nmStartupTime),
+ healthReport: payload.healthReport || 'N/A',
+ nmStartupTime: payload.nmStartupTime? Converter.timeStampToDate(payload.nmStartupTime) : '',
nodeManagerBuildVersion: payload.nodeManagerBuildVersion,
hadoopBuildVersion: payload.hadoopBuildVersion
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbd98cb0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
index ad50621..1c6d1be 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
@@ -34,7 +34,7 @@ export default DS.JSONAPISerializer.extend({
nodeHostName: payload.nodeHostName,
nodeHTTPAddress: payload.nodeHTTPAddress,
lastHealthUpdate: Converter.timeStampToDate(payload.lastHealthUpdate),
- healthReport: payload.healthReport,
+ healthReport: payload.healthReport || 'N/A',
numContainers: payload.numContainers,
usedMemoryMB: payload.usedMemoryMB,
availMemoryMB: payload.availMemoryMB,
@@ -57,7 +57,7 @@ export default DS.JSONAPISerializer.extend({
normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// expected response is of the form { data: [ {}, {} ] }
var normalizedArrayResponse = {};
- if (payload.nodes) {
+ if (payload.nodes && payload.nodes.node) {
// payload is of the form { "nodes": { "node": [ {},{},{} ] } }
normalizedArrayResponse.data = payload.nodes.node.map(singleNode => {
return this.internalNormalizeSingleResponse(store, primaryModelClass,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbd98cb0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs
index b7f727a..1e8549b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs
@@ -28,7 +28,7 @@
<div class="row">
<div class="col-md-12 container-fluid">
<div class="panel panel-default">
- <div class="panel-heading">Node Information</div>
+ <div class="panel-heading">Node Information: {{model.rmNode.id}}</div>
<table class="table">
<tbody>
<tr>
@@ -63,10 +63,12 @@
<td>Node Health Report</td>
<td>{{model.node.healthReport}}</td>
</tr>
- <tr>
- <td>Node Manager Start Time</td>
- <td>{{model.node.nmStartupTime}}</td>
- </tr>
+ {{#if model.node.nmStartupTime}}
+ <tr>
+ <td>Node Manager Start Time</td>
+ <td>{{model.node.nmStartupTime}}</td>
+ </tr>
+ {{/if}}
<tr>
<td>Node Manager Version</td>
<td>{{model.node.nodeManagerBuildVersion}}</td>
@@ -82,22 +84,25 @@
</div>
<div class="row">
- <div class="col-lg-5 container-fluid">
+ <div class="col-lg-6 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
- Resource - Memory (in MB)
+ Resource - Memory
</div>
<div class="container-fluid" id="mem-donut-chart">
{{donut-chart data=model.rmNode.getMemoryDataForDonutChart
showLabels=true
parentId="mem-donut-chart"
ratio=0.6
+ type="memory"
+ colorTargets="good"
+ colorTargetReverse=true
maxHeight=350}}
</div>
</div>
</div>
- <div class="col-lg-5 container-fluid">
+ <div class="col-lg-6 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
Resource - VCores
@@ -107,6 +112,8 @@
showLabels=true
parentId="vcore-donut-chart"
ratio=0.6
+ colorTargets="good"
+ colorTargetReverse=true
maxHeight=350}}
</div>
</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbd98cb0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
index 874b3c4..795d00e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
@@ -29,7 +29,7 @@
<ul class="nav nav-pills nav-stacked collapse in">
{{#link-to "yarn-nodes.table" tagName="li"}}
- {{#link-to 'yarn-nodes.table'}}Nodes Table
+ {{#link-to 'yarn-nodes.table'}}Information
{{/link-to}}
{{/link-to}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbd98cb0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
index 1390906..79d721b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
@@ -16,12 +16,13 @@
limitations under the License.
--}}
<div class="row">
-
- {{#if model.nodes}}
- {{em-table columns=columns rows=model.nodes}}
- {{else}}
- <h4 align="center">No nodes found on this cluster</h4>
- {{/if}}
+ <div class="col-md-12">
+ {{#if model.nodes}}
+ {{em-table columns=columns rows=model.nodes}}
+ {{else}}
+ <h4 align="center">No nodes found on this cluster</h4>
+ {{/if}}
+ </div>
</div>
{{outlet}}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[14/50] [abbrv] hadoop git commit: YARN-5682. [YARN-3368] Fix maven
build to keep all generated or downloaded files in target folder (Wangda Tan
via Sunil G)
Posted by va...@apache.org.
YARN-5682. [YARN-3368] Fix maven build to keep all generated or downloaded files in target folder (Wangda Tan via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8222307c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8222307c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8222307c
Branch: refs/heads/YARN-3368_branch2
Commit: 8222307c300a028102f9e7fd882b9b3f8f93eb6e
Parents: e5c0219
Author: sunilg <su...@apache.org>
Authored: Tue Oct 4 21:07:42 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
.../hadoop-yarn/hadoop-yarn-ui/pom.xml | 54 ++++++++++++--------
hadoop-yarn-project/hadoop-yarn/pom.xml | 2 +-
2 files changed, 34 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8222307c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index fcca48a..e59e9bf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -31,7 +31,7 @@
<properties>
<packaging.type>war</packaging.type>
- <webappDir>src/main/webapp</webappDir>
+ <webappTgtDir>${basedir}/target/src/main/webapp</webappTgtDir>
<node.executable>node</node.executable>
<nodeVersion>v0.12.2</nodeVersion>
<npmVersion>2.10.0</npmVersion>
@@ -84,10 +84,10 @@
<followSymLinks>false</followSymLinks>
<filesets>
<fileset>
- <directory>${basedir}/src/main/webapp/bower_components</directory>
+ <directory>${webappTgtDir}/bower_components</directory>
</fileset>
<fileset>
- <directory>${basedir}/src/main/webapp/node_modules</directory>
+ <directory>${webappTgtDir}/node_modules</directory>
</fileset>
</filesets>
</configuration>
@@ -109,6 +109,33 @@
<build>
<plugins>
+ <!-- prepare source code -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-source-code</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <copy toDir="${basedir}/target/src/main/webapp">
+ <fileset dir="${basedir}/src/main/webapp"/>
+ </copy>
+
+ <copy toDir="${basedir}/target/src/public">
+ <fileset dir="${basedir}/public"/>
+ </copy>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
<!-- Bower install & grunt build-->
<plugin>
<artifactId>exec-maven-plugin</artifactId>
@@ -121,7 +148,7 @@
<goal>exec</goal>
</goals>
<configuration>
- <workingDirectory>${webappDir}</workingDirectory>
+ <workingDirectory>${webappTgtDir}</workingDirectory>
<executable>npm</executable>
<arguments>
<argument>install</argument>
@@ -135,7 +162,7 @@
<goal>exec</goal>
</goals>
<configuration>
- <workingDirectory>${webappDir}</workingDirectory>
+ <workingDirectory>${webappTgtDir}</workingDirectory>
<executable>bower</executable>
<arguments>
<argument>--allow-root</argument>
@@ -150,7 +177,7 @@
<goal>exec</goal>
</goals>
<configuration>
- <workingDirectory>${webappDir}</workingDirectory>
+ <workingDirectory>${webappTgtDir}</workingDirectory>
<executable>ember</executable>
<arguments>
<argument>build</argument>
@@ -160,21 +187,6 @@
</arguments>
</configuration>
</execution>
- <execution>
- <id>cleanup tmp</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <workingDirectory>${webappDir}</workingDirectory>
- <executable>rm</executable>
- <arguments>
- <argument>-rf</argument>
- <argument>tmp</argument>
- </arguments>
- </configuration>
- </execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8222307c/hadoop-yarn-project/hadoop-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml
index 147bd9a..03404f1 100644
--- a/hadoop-yarn-project/hadoop-yarn/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/pom.xml
@@ -230,7 +230,6 @@
</profiles>
<modules>
- <module>hadoop-yarn-ui</module>
<module>hadoop-yarn-api</module>
<module>hadoop-yarn-common</module>
<module>hadoop-yarn-server</module>
@@ -238,5 +237,6 @@
<module>hadoop-yarn-site</module>
<module>hadoop-yarn-client</module>
<module>hadoop-yarn-registry</module>
+ <module>hadoop-yarn-ui</module>
</modules>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[43/50] [abbrv] hadoop git commit: Updating to use maven 3.3
Posted by va...@apache.org.
Updating to use maven 3.3
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/17213a0d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/17213a0d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/17213a0d
Branch: refs/heads/YARN-3368_branch2
Commit: 17213a0d277761ab3c83e7d5df84ce21b651e81a
Parents: ec3fb45
Author: vrushali <vr...@apache.org>
Authored: Thu Oct 12 15:29:08 2017 -0700
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:49 2017 +0530
----------------------------------------------------------------------
BUILDING.txt | 2 +-
dev-support/docker/Dockerfile | 13 ++++++++++---
hadoop-project/pom.xml | 2 +-
3 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/17213a0d/BUILDING.txt
----------------------------------------------------------------------
diff --git a/BUILDING.txt b/BUILDING.txt
index bf6122b..689325e 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -317,7 +317,7 @@ Requirements:
* Windows System
* JDK 1.8+
-* Maven 3.0 or later
+* Maven 3.3 or later
* Findbugs 1.3.9 (if running findbugs)
* ProtocolBuffer 2.5.0
* CMake 2.6 or newer
http://git-wip-us.apache.org/repos/asf/hadoop/blob/17213a0d/dev-support/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 6bba5a8..50a221fc 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -65,9 +65,16 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
snappy \
zlib1g-dev
-# Fixing the Apache commons / Maven dependency problem under Ubuntu:
-# See http://wiki.apache.org/commons/VfsProblems
-RUN cd /usr/share/maven/lib && ln -s ../../java/commons-lang.jar .
+######
+# Install Apache Maven
+######
+RUN mkdir -p /opt/maven && \
+ curl -L -s -S \
+ http://www-us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz \
+ -o /opt/maven.tar.gz && \
+ tar xzf /opt/maven.tar.gz --strip-components 1 -C /opt/maven
+ENV MAVEN_HOME /opt/maven
+
#######
# Java OpenJDK
http://git-wip-us.apache.org/repos/asf/hadoop/blob/17213a0d/hadoop-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 1beaef9..575a9c4 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -107,7 +107,7 @@
for an open-ended enforcement
-->
<enforced.java.version>[${javac.version},)</enforced.java.version>
- <enforced.maven.version>[3.0.2,)</enforced.maven.version>
+ <enforced.maven.version>[3.3.0,)</enforced.maven.version>
<!-- Plugin versions and config -->
<maven-surefire-plugin.argLine>-Xmx2048m -XX:MaxPermSize=768m -XX:+HeapDumpOnOutOfMemoryError</maven-surefire-plugin.argLine>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[32/50] [abbrv] hadoop git commit: YARN-6184. Introduce loading icon
in each page of new YARN UI. Contributed by Akhil PB.
Posted by va...@apache.org.
YARN-6184. Introduce loading icon in each page of 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/148c7b86
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/148c7b86
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/148c7b86
Branch: refs/heads/YARN-3368_branch2
Commit: 148c7b8689b244152a5a0a03a153ecb516a33b3b
Parents: 981ccd9
Author: Sunil G <su...@apache.org>
Authored: Wed Feb 22 11:54:32 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../main/webapp/app/components/tree-selector.js | 8 +-
.../webapp/app/controllers/yarn-queue-apps.js | 46 ----------
.../main/webapp/app/controllers/yarn-queue.js | 17 +++-
.../main/webapp/app/controllers/yarn-queues.js | 1 +
.../src/main/webapp/app/router.js | 6 +-
.../main/webapp/app/routes/cluster-overview.js | 4 +-
.../main/webapp/app/routes/yarn-app-attempt.js | 12 +--
.../src/main/webapp/app/routes/yarn-apps.js | 4 +-
.../src/main/webapp/app/routes/yarn-node.js | 4 +-
.../src/main/webapp/app/routes/yarn-nodes.js | 4 +-
.../main/webapp/app/routes/yarn-queue-apps.js | 42 ----------
.../src/main/webapp/app/routes/yarn-queue.js | 3 +-
.../main/webapp/app/routes/yarn-queue/apps.js | 22 +++++
.../main/webapp/app/routes/yarn-queue/info.js | 22 +++++
.../src/main/webapp/app/routes/yarn-queues.js | 35 +++++++-
.../src/main/webapp/app/styles/app.css | 8 ++
.../src/main/webapp/app/templates/loading.hbs | 23 +++++
.../webapp/app/templates/yarn-apps/loading.hbs | 23 +++++
.../webapp/app/templates/yarn-queue-apps.hbs | 64 --------------
.../main/webapp/app/templates/yarn-queue.hbs | 69 ++-------------
.../webapp/app/templates/yarn-queue/apps.hbs | 28 +++++++
.../webapp/app/templates/yarn-queue/info.hbs | 84 +++++++++++++++++++
.../main/webapp/app/templates/yarn-queues.hbs | 8 +-
.../webapp/public/assets/images/spinner.gif | Bin 0 -> 33076 bytes
.../unit/controllers/yarn-queue-apps-test.js | 30 -------
.../tests/unit/routes/yarn-queue-apps-test.js | 29 -------
.../tests/unit/routes/yarn-queue/apps-test.js | 29 +++++++
.../tests/unit/routes/yarn-queue/info-test.js | 29 +++++++
28 files changed, 347 insertions(+), 307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
index c9e735d..3d72b2f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
@@ -128,7 +128,7 @@ export default Ember.Component.extend({
.attr("transform", function() { return "translate(" + source.y0 + "," + source.x0 + ")"; })
.on("mouseover", function(d){
if (d.queueData.get("name") !== this.get("selected")) {
- document.location.href = "#/yarn-queues/" + d.queueData.get("name");
+ document.location.href = "#/yarn-queues/" + d.queueData.get("name") + "!";
}
Ember.run.later(this, function () {
@@ -143,7 +143,7 @@ export default Ember.Component.extend({
}.bind(this))
.on("click", function (d) {
- document.location.href = "#/yarn-queue/" + d.queueData.get("name");
+ document.location.href = "#/yarn-queue/" + d.queueData.get("name") + "/info";
});
nodeEnter.append("circle")
@@ -190,7 +190,7 @@ export default Ember.Component.extend({
nodeUpdate.select("circle")
.attr("r", 30)
- .attr("href",
+ .attr("href",
function(d) {
return "#/yarn-queues/" + d.queueData.get("name");
})
@@ -294,4 +294,4 @@ export default Ember.Component.extend({
didInsertElement: function() {
this.reDraw();
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue-apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue-apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue-apps.js
deleted file mode 100644
index e7bedd6..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue-apps.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * 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.
- */
-
-import Ember from 'ember';
-
-export default Ember.Controller.extend({
- needReload: true,
- selectedQueue: undefined,
-
- breadcrumbs: Ember.computed("model.selected", function () {
- var queueName = this.get("model.selected");
-
- return [{
- text: "Home",
- routeName: 'application'
- }, {
- text: "Queues",
- routeName: 'yarn-queues',
- model: 'root'
- }, {
- text: `Queue [ ${queueName} ]`,
- routeName: 'yarn-queue',
- model: queueName
- }, {
- text: "Applications",
- }];
-
- }),
-
-
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue.js
index 0b4150f..3a72b60 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue.js
@@ -22,10 +22,11 @@ export default Ember.Controller.extend({
needReload: true,
selectedQueue: undefined,
- breadcrumbs: Ember.computed("model.selected", function () {
+ breadcrumbs: Ember.computed("model.selected", "target.currentPath", function () {
var queueName = this.get("model.selected");
+ var path = this.get("target.currentPath");
- return [{
+ var crumbs = [{
text: "Home",
routeName: 'application'
}, {
@@ -34,11 +35,19 @@ export default Ember.Controller.extend({
model: 'root'
}, {
text: `Queue [ ${queueName} ]`,
- routeName: 'yarn-queue',
+ routeName: 'yarn-queue.info',
model: queueName
}];
- }),
+ if (path && path === "yarn-queue.apps") {
+ crumbs.push({
+ text: "Applications",
+ routeName: 'yarn-queue.apps',
+ model: queueName
+ });
+ }
+ return crumbs;
+ })
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queues.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queues.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queues.js
index 941e150..9658ded 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queues.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queues.js
@@ -21,6 +21,7 @@ import Ember from 'ember';
export default Ember.Controller.extend({
needReload: true,
selectedQueue: undefined,
+ showLoading: true,
breadcrumbs: [{
text: "Home",
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
index 87a018d..03ec780 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
@@ -32,6 +32,10 @@ Router.map(function() {
this.route('table');
this.route('heatmap');
});
+ this.route('yarn-queue', {path: '/yarn-queue/:queue_name'}, function() {
+ this.route('info');
+ this.route('apps');
+ });
this.route('yarn-nodes-heatmap');
this.route('yarn-node', { path: '/yarn-node/:node_id/:node_addr' });
this.route('yarn-node-apps', { path: '/yarn-node-apps/:node_id/:node_addr' });
@@ -43,7 +47,6 @@ Router.map(function() {
{ path: '/yarn-node-container/:node_id/:node_addr/:container_id' });
this.route('yarn-container-log', { path:
'/yarn-container-log/:node_id/:node_addr/:container_id/:filename' });
- this.route('yarn-queue', { path: '/yarn-queue/:queue_name' });
this.route('cluster-overview');
this.route('yarn-app', { path: '/yarn-app/:app_id' });
@@ -52,7 +55,6 @@ Router.map(function() {
this.route('notfound', { path: '*:' });
this.route('yarn-app-attempts', { path: '/yarn-app-attempts/:app_id' });
this.route('yarn-queues', { path: '/yarn-queues/:queue_name' });
- this.route('yarn-queue-apps', { path: '/yarn-queue-apps/:queue_name' });
});
export default Router;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js
index 1068126..b5db17d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js
@@ -23,7 +23,7 @@ import AbstractRoute from './abstract';
export default AbstractRoute.extend({
model() {
return Ember.RSVP.hash({
- clusterMetrics: this.store.findAll('ClusterMetric'),
+ clusterMetrics: this.store.findAll('ClusterMetric', {reload: true}),
apps: this.store.query('yarn-app',
{
state: "RUNNING"
@@ -41,4 +41,4 @@ export default AbstractRoute.extend({
this.store.unloadAll('yarn-app');
this.store.unloadAll('yarn-queue');
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempt.js
----------------------------------------------------------------------
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 762fb29..d449adf 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
@@ -23,15 +23,15 @@ import AbstractRoute from './abstract';
export default AbstractRoute.extend({
model(param) {
return Ember.RSVP.hash({
- attempt: this.store.findRecord('yarn-app-attempt', param.app_attempt_id),
-
- rmContainers: this.store.query('yarn-container',
+ attempt: this.store.findRecord('yarn-app-attempt', param.app_attempt_id, {reload: true}),
+
+ rmContainers: this.store.query('yarn-container',
{
app_attempt_id: param.app_attempt_id,
is_rm: true
}),
-
- tsContainers: this.store.query('yarn-container',
+
+ tsContainers: this.store.query('yarn-container',
{
app_attempt_id: param.app_attempt_id,
is_rm: false
@@ -47,4 +47,4 @@ export default AbstractRoute.extend({
this.store.unloadAll('yarn-app-attempt');
this.store.unloadAll('yarn-container');
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps.js
index 0ac503c..1b671da 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps.js
@@ -23,8 +23,8 @@ import AbstractRoute from './abstract';
export default AbstractRoute.extend({
model() {
return Ember.RSVP.hash({
- apps: this.store.findAll('yarn-app'),
- clusterMetrics: this.store.findAll('ClusterMetric'),
+ apps: this.store.findAll('yarn-app', {reload: true}),
+ clusterMetrics: this.store.findAll('ClusterMetric', {reload: true}),
});
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node.js
index 967d007..3d54846 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node.js
@@ -25,8 +25,8 @@ export default AbstractRoute.extend({
// Fetches data from both NM and RM. RM is queried to get node usage info.
return Ember.RSVP.hash({
nodeInfo: { id: param.node_id, addr: param.node_addr },
- node: this.store.findRecord('yarn-node', param.node_addr),
- rmNode: this.store.findRecord('yarn-rm-node', param.node_id)
+ node: this.store.findRecord('yarn-node', param.node_addr, {reload: true}),
+ rmNode: this.store.findRecord('yarn-rm-node', param.node_id, {reload: true})
});
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes.js
index 4439569..d31eb5c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes.js
@@ -23,8 +23,8 @@ import AbstractRoute from './abstract';
export default AbstractRoute.extend({
model() {
return Ember.RSVP.hash({
- nodes: this.store.findAll('yarn-rm-node'),
- clusterMetrics: this.store.findAll('ClusterMetric'),
+ nodes: this.store.findAll('yarn-rm-node', {reload: true}),
+ clusterMetrics: this.store.findAll('ClusterMetric', {reload: true}),
});
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue-apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue-apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue-apps.js
deleted file mode 100644
index 373e1be..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue-apps.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * 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.
- */
-
-import Ember from 'ember';
-
-import AbstractRoute from './abstract';
-
-export default AbstractRoute.extend({
- model(param) {
- return Ember.RSVP.hash({
- selected : param.queue_name,
- queues: this.store.findAll('yarn-queue'),
- selectedQueue : undefined,
- apps: undefined, // apps of selected queue
- });
- },
-
- afterModel(model) {
- model.selectedQueue = this.store.peekRecord('yarn-queue', model.selected);
- model.apps = this.store.findAll('yarn-app');
- },
-
- unloadAll() {
- this.store.unloadAll('yarn-queue');
- this.store.unloadAll('yarn-app');
- }
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
index 5342913..faae8b1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
@@ -26,13 +26,12 @@ export default AbstractRoute.extend({
selected : param.queue_name,
queues: this.store.query('yarn-queue', {}),
selectedQueue : undefined,
- apps: undefined, // apps of selected queue
+ apps: this.store.findAll('yarn-app', {reload: true})
});
},
afterModel(model) {
model.selectedQueue = this.store.peekRecord('yarn-queue', model.selected);
- model.apps = this.store.findAll('yarn-app');
},
unloadAll() {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/apps.js
new file mode 100644
index 0000000..8719170
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/apps.js
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/info.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/info.js
new file mode 100644
index 0000000..8719170
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/info.js
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
index 5342913..7ef7ac3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
@@ -22,21 +22,50 @@ import AbstractRoute from './abstract';
export default AbstractRoute.extend({
model(param) {
+ var queueName = param.queue_name? param.queue_name.split('!')[0] : 'root';
+ if (param.queue_name && param.queue_name.split('!').length > 1) {
+ this.controllerFor('yarn-queues').set('showLoading', false);
+ } else {
+ this.controllerFor('yarn-queues').set('showLoading', true);
+ }
return Ember.RSVP.hash({
- selected : param.queue_name,
+ selected : queueName,
queues: this.store.query('yarn-queue', {}),
selectedQueue : undefined,
- apps: undefined, // apps of selected queue
+ apps: this.store.findAll('yarn-app', {reload: true})
});
},
afterModel(model) {
model.selectedQueue = this.store.peekRecord('yarn-queue', model.selected);
- model.apps = this.store.findAll('yarn-app');
},
unloadAll() {
this.store.unloadAll('yarn-queue');
this.store.unloadAll('yarn-app');
+ },
+
+ refreshModel() {
+ var param = this.paramsFor('yarn-queues');
+ var queueName = param.queue_name? param.queue_name.split('!')[0] : 'root';
+ if (queueName !== param.queue_name) {
+ this.transitionTo('yarn-queues', queueName);
+ } else {
+ this.refresh();
+ }
+ },
+
+ actions: {
+ refresh: function () {
+ this.unloadAll();
+ this.refreshModel();
+ },
+
+ loading() {
+ if (!this.controllerFor('yarn-queues').get('showLoading')) {
+ return false;
+ }
+ return true;
+ }
}
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/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 eb5fe61..7ac21bc 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
@@ -138,6 +138,14 @@ div.tooltip {
}
/*
+ * Loading icon styles
+ */
+.loading-mask > img {
+ display: block;
+ margin: 0 auto;
+}
+
+/*
* Data table
*/
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/loading.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/loading.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/loading.hbs
new file mode 100644
index 0000000..a95af2b
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/loading.hbs
@@ -0,0 +1,23 @@
+{{!
+ * 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.
+}}
+
+<div class="col-md-12 container-fluid">
+ <div class="loading-mask">
+ <img src="assets/images/spinner.gif" alt="Loading...">
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/loading.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/loading.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/loading.hbs
new file mode 100644
index 0000000..a95af2b
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/loading.hbs
@@ -0,0 +1,23 @@
+{{!
+ * 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.
+}}
+
+<div class="col-md-12 container-fluid">
+ <div class="loading-mask">
+ <img src="assets/images/spinner.gif" alt="Loading...">
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue-apps.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue-apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue-apps.hbs
deleted file mode 100644
index d5329f2..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue-apps.hbs
+++ /dev/null
@@ -1,64 +0,0 @@
-{{!
- * 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.
-}}
-
-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
-
-<div class="col-md-12 container-fluid">
- <div class="row">
-
- <div class="col-md-2 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4>Application</h4>
- </div>
- <div class="panel-body">
- <ul class="nav nav-pills nav-stacked" id="stacked-menu">
- <ul class="nav nav-pills nav-stacked collapse in">
- {{#link-to 'yarn-queue' tagName="li"}}
- {{#link-to 'yarn-queue' model.selected}}Information
- {{/link-to}}
- {{/link-to}}
- {{#link-to 'yarn-queue-apps' tagName="li"}}
- {{#link-to 'yarn-queue-apps' model.selected}}Applications List
- {{/link-to}}
- {{/link-to}}
- </ul>
- </ul>
- </div>
- </div>
- </div>
-
- <div class="col-md-10 container-fluid">
- <!-- timeline view of children -->
- <div class="row">
-
- <div class="col-lg-12 container-fluid">
- {{#if model.apps}}
- {{app-table table-id="apps-table" arr=model.apps}}
- {{simple-table table-id="apps-table" bFilter=true colTypes="elapsed-time" colTargets="7"}}
- {{else}}
- <h4 align = "center">Could not find any applications from this cluster</h4>
- {{/if}}
- </div>
-
- </div>
- </div>
-
- </div>
-</div>
-{{outlet}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs
index 11c527c..ef2d285 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs
@@ -24,17 +24,17 @@
<div class="col-md-2 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
- <h4>Application</h4>
+ <h4>Queue</h4>
</div>
<div class="panel-body">
<ul class="nav nav-pills nav-stacked" id="stacked-menu">
<ul class="nav nav-pills nav-stacked collapse in">
- {{#link-to 'yarn-queue' tagName="li"}}
- {{#link-to 'yarn-queue' model.selected}}Information
+ {{#link-to 'yarn-queue.info' tagName="li"}}
+ {{#link-to 'yarn-queue.info' model.selected}}Information
{{/link-to}}
{{/link-to}}
- {{#link-to 'yarn-queue-apps' tagName="li"}}
- {{#link-to 'yarn-queue-apps' model.selected}}Applications List
+ {{#link-to 'yarn-queue.apps' tagName="li"}}
+ {{#link-to 'yarn-queue.apps' model.selected}}Applications List
{{/link-to}}
{{/link-to}}
</ul>
@@ -44,65 +44,8 @@
</div>
<div class="col-md-10 container-fluid">
- <!-- timeline view of children -->
- <div class="row">
-
- <div class="col-lg-4 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">
- Queue Information
- </div>
- {{queue-configuration-table queue=model.selectedQueue}}
- </div>
- </div>
-
- <div class="col-lg-4 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">
- Queue Capacities
- </div>
- <div class="container-fluid" id="capacity-bar-chart">
- <br/>
- {{bar-chart data=model.selectedQueue.capacitiesBarChartData
- title=""
- parentId="capacity-bar-chart"
- textWidth=170
- ratio=0.55
- maxHeight=350}}
- </div>
- </div>
- </div>
-
- {{#if model.selectedQueue.hasUserUsages}}
- <div class="col-lg-4 container-fluid" id="userusage-donut-chart">
- {{donut-chart data=model.selectedQueue.userUsagesDonutChartData
- title="User Usages"
- showLabels=true
- parentId="userusage-donut-chart"
- type="memory"
- ratio=0.6
- maxHeight=350}}
- </div>
- {{/if}}
-
- <div class="col-lg-4 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">
- Running Apps
- </div>
- <div class="container-fluid" id="numapplications-donut-chart">
- {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData
- showLabels=true
- parentId="numapplications-donut-chart"
- ratio=0.6
- maxHeight=350}}
- </div>
- </div>
- </div>
-
- </div>
+ {{outlet}}
</div>
</div>
</div>
-{{outlet}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs
new file mode 100644
index 0000000..6d6488f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs
@@ -0,0 +1,28 @@
+{{!
+ * 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.
+}}
+
+<div class="row">
+ <div class="col-lg-12 container-fluid">
+ {{#if model.apps}}
+ {{app-table table-id="apps-table" arr=model.apps}}
+ {{simple-table table-id="apps-table" bFilter=true colTypes="elapsed-time" colTargets="7"}}
+ {{else}}
+ <h4 align = "center">Could not find any applications from this cluster</h4>
+ {{/if}}
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/info.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/info.hbs
new file mode 100644
index 0000000..c112ef9
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/info.hbs
@@ -0,0 +1,84 @@
+{{!
+ * 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.
+}}
+
+<div class="row">
+
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Queue Capacities: {{model.selected}}
+ </div>
+ <div class="container-fluid" id="capacity-bar-chart">
+ <br/>
+ {{bar-chart data=model.selectedQueue.capacitiesBarChartData
+ title=""
+ parentId="capacity-bar-chart"
+ textWidth=170
+ ratio=0.55
+ maxHeight=350}}
+ </div>
+ </div>
+ </div>
+
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Queue Information: {{model.selected}}
+ </div>
+ {{queue-configuration-table queue=model.selectedQueue}}
+ </div>
+ </div>
+
+</div>
+
+<div class="row">
+
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Running Apps: {{model.selected}}
+ </div>
+ <div class="container-fluid" id="numapplications-donut-chart">
+ {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData
+ showLabels=true
+ parentId="numapplications-donut-chart"
+ ratio=0.6
+ maxHeight=350}}
+ </div>
+ </div>
+ </div>
+
+ {{#if model.selectedQueue.hasUserUsages}}
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ User Usages: {{model.selected}}
+ </div>
+ <div class="container-fluid" id="userusage-donut-chart">
+ {{donut-chart data=model.selectedQueue.userUsagesDonutChartData
+ showLabels=true
+ parentId="userusage-donut-chart"
+ type="memory"
+ ratio=0.6
+ maxHeight=350}}
+ </div>
+ </div>
+ </div>
+ {{/if}}
+
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs
index ea9338c..6dfb220 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs
@@ -26,7 +26,7 @@
<div class="col-lg-4 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
- Queue Information
+ Queue Information: {{model.selected}}
</div>
{{queue-configuration-table queue=model.selectedQueue}}
</div>
@@ -35,7 +35,7 @@
<div class="col-lg-4 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
- Queue Capacities
+ Queue Capacities: {{model.selected}}
</div>
<div class="container-fluid" id="capacity-bar-chart">
<br/>
@@ -52,7 +52,7 @@
<div class="col-lg-4 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
- Running Apps
+ Running Apps: {{model.selected}}
</div>
<div class="container-fluid" id="numapplications-donut-chart">
{{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData
@@ -67,4 +67,4 @@
</div>
</div>
-{{outlet}}
\ No newline at end of file
+{{outlet}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/spinner.gif
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/spinner.gif b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/spinner.gif
new file mode 100644
index 0000000..727b91d
Binary files /dev/null and b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/spinner.gif differ
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queue-apps-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queue-apps-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queue-apps-test.js
deleted file mode 100644
index adf2e07..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queue-apps-test.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 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.
- */
-
-import { moduleFor, test } from 'ember-qunit';
-
-moduleFor('controller:yarn-queue-apps', 'Unit | Controller | yarn queue apps', {
- // Specify the other units that are required for this test.
- // needs: ['controller:foo']
-});
-
-// Replace this with your real tests.
-test('it exists', function(assert) {
- let controller = this.subject();
- assert.ok(controller);
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue-apps-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue-apps-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue-apps-test.js
deleted file mode 100644
index 6738ea0..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue-apps-test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * 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.
- */
-
-import { moduleFor, test } from 'ember-qunit';
-
-moduleFor('route:yarn-queue-apps', 'Unit | Route | yarn queue apps', {
- // Specify the other units that are required for this test.
- // needs: ['controller:foo']
-});
-
-test('it exists', function(assert) {
- let route = this.subject();
- assert.ok(route);
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/apps-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/apps-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/apps-test.js
new file mode 100644
index 0000000..faa116b
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/apps-test.js
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('route:yarn-queue/apps', 'Unit | Route | yarn queue/apps', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+test('it exists', function(assert) {
+ let route = this.subject();
+ assert.ok(route);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/info-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/info-test.js
new file mode 100644
index 0000000..ca6f137
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/info-test.js
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('route:yarn-queue/info', 'Unit | Route | yarn queue/info', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+test('it exists', function(assert) {
+ let route = this.subject();
+ assert.ok(route);
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[36/50] [abbrv] hadoop git commit: Fixing checktyle warnings during
rebase
Posted by va...@apache.org.
Fixing checktyle warnings during rebase
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3a5f1a6c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3a5f1a6c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3a5f1a6c
Branch: refs/heads/YARN-3368_branch2
Commit: 3a5f1a6c26eef809381af4852a696384794a5bc8
Parents: 17213a0
Author: vrushali <vr...@apache.org>
Authored: Tue Oct 17 11:39:20 2017 -0700
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:49 2017 +0530
----------------------------------------------------------------------
.../hadoop/yarn/server/resourcemanager/ResourceManager.java | 3 ---
.../hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js | 4 ++--
.../src/main/webapp/app/components/donut-chart.js | 6 +++---
.../hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a5f1a6c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
index 6c013c6..75c20d6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
@@ -30,9 +30,7 @@ import org.apache.hadoop.metrics2.MetricsSystem;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.metrics2.source.JvmMetrics;
import org.apache.hadoop.http.HttpServer2;
-import org.apache.hadoop.http.lib.StaticUserWebFilter;
import org.apache.hadoop.net.NetUtils;
-import org.apache.hadoop.security.AuthenticationFilterInitializer;
import org.apache.hadoop.security.Groups;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
@@ -47,7 +45,6 @@ import org.apache.hadoop.util.ShutdownHookManager;
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.curator.ZKCuratorManager;
import org.apache.hadoop.util.VersionInfo;
-import org.apache.hadoop.util.ZKUtil;
import org.apache.hadoop.yarn.YarnUncaughtExceptionHandler;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a5f1a6c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
index 05d78eb..95245bf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
@@ -20,7 +20,7 @@ import Ember from 'ember';
import BaseChartComponent from 'yarn-ui/components/base-chart-component';
export default BaseChartComponent.extend({
- // data:
+ // data:
// [{label=label1, value=value1}, ...]
// ...
renderBarChart: function(data, title, textWidth = 50) {
@@ -120,4 +120,4 @@ export default BaseChartComponent.extend({
this.initChart();
this.draw();
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a5f1a6c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
index b1e6ecf..ce26811 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
@@ -25,7 +25,7 @@ export default BaseChartComponent.extend({
/*
* data = [{label="xx", value=},{...}]
*/
- renderDonutChart: function(data, title, showLabels = false,
+ renderDonutChart: function(data, title, showLabels = false,
middleLabel = "Total", middleValue = undefined, suffix = "") {
var g = this.chart.g;
var layout = this.getLayout();
@@ -184,7 +184,7 @@ export default BaseChartComponent.extend({
this.colors = ColorUtils.getColors(this.get("data").length, targets, colorTargetReverse);
}
- this.renderDonutChart(this.get("data"), this.get("title"), this.get("showLabels"),
+ this.renderDonutChart(this.get("data"), this.get("title"), this.get("showLabels"),
this.get("middleLabel"), this.get("middleValue"));
},
@@ -192,4 +192,4 @@ export default BaseChartComponent.extend({
this.initChart();
this.draw();
},
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a5f1a6c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml
index 43a2ea6..f2403a6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-
+
<!--
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[49/50] [abbrv] hadoop git commit: YARN-6458. Use yarn package
manager to lock down dependency versions for new web UI. Contributed by
Sreenath Somarajapuram.
Posted by va...@apache.org.
YARN-6458. Use yarn package manager to lock down dependency versions for new web UI. Contributed by Sreenath Somarajapuram.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3aa81115
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3aa81115
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3aa81115
Branch: refs/heads/YARN-3368_branch2
Commit: 3aa8111594ceeb4e289dee63201ebb32ec9e1e35
Parents: 9e4e218
Author: Sunil G <su...@apache.org>
Authored: Sun Jun 4 22:05:14 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:49 2017 +0530
----------------------------------------------------------------------
.../hadoop-yarn/hadoop-yarn-ui/README.md | 64 +
.../hadoop-yarn/hadoop-yarn-ui/pom.xml | 171 +-
.../hadoop-yarn-ui/src/main/webapp/.bowerrc | 5 +-
.../src/main/webapp/WEB-INF/wro.xml | 9 +
.../src/main/webapp/bower-shrinkwrap.json | 66 +
.../src/main/webapp/ember-cli-build.js | 16 +-
.../hadoop-yarn-ui/src/main/webapp/package.json | 15 +-
.../hadoop-yarn-ui/src/main/webapp/yarn.lock | 4983 ++++++++++++++++++
8 files changed, 5275 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3aa81115/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md
new file mode 100644
index 0000000..f67f351
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md
@@ -0,0 +1,64 @@
+<!--
+ 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.
+-->
+
+# Yarn UI
+
+The Yarn UI is an Ember based web-app that provides visualization of the applications running on the Apache Hadoop YARN framework.
+
+## Configurations
+
+* You can point the UI to custom locations by setting the environment variables in `src/main/webapp/config/configs.env`
+
+## Development
+
+All the following commands must be run inside `src/main/webapp`.
+
+### Prerequisites
+
+You will need the following things properly installed on your computer.
+
+* Install [Yarn](https://yarnpkg.com) v0.21.3
+* Install [Bower](http://bower.io/) v1.7.7
+* Install all dependencies by running `yarn install` & `bower install`
+
+### Running UI
+
+* `yarn start`
+* Visit your app at [http://localhost:4200](http://localhost:4200).
+
+### Building
+
+* `yarn run build` (production)
+* Files would be stored in "dist/"
+
+### Adding new dependencies
+
+**Warning: Do not edit the _package.json_ or _bower.json_ files manually. This could make them out-of-sync with the respective lock or shrinkwrap files.**
+
+Yarn UI has replaced NPM with Yarn package manager. And hence Yarn would be used to manage dependencies defined in package.json.
+
+* Please use the Yarn and Bower command-line tools to add new dependencies. And the tool version must be same as those defined in Prerequisites section.
+* Once any dependency is added:
+ * If it's in package.json. Make sure that the respective, and only those changes are reflected in yarn.lock file.
+ * If it's in bower.json. Make sure that the respective, and only those changes are reflected in bower-shrinkwrap.json file.
+* Commands to add using CLI tools:
+ * Yarn: yarn add [package-name]
+ * Bower: bower install --save [package-name]
+
+### Adding new routes (pages), controllers, components etc.
+
+* Use ember-cli blueprint generator - [Ember CLI](http://ember-cli.com/extending/#generators-and-blueprints)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3aa81115/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 5f6eda9..5f546ef 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -27,15 +27,16 @@
<artifactId>hadoop-yarn-ui</artifactId>
<version>2.9.0-SNAPSHOT</version>
<name>Apache Hadoop YARN UI</name>
- <packaging>${packaging.type}</packaging>
+ <packaging>${packagingType}</packaging>
<properties>
- <packaging.type>pom</packaging.type>
- <webappTgtDir>${basedir}/target/src/main/webapp</webappTgtDir>
- <node.executable>node</node.executable>
- <nodeVersion>v0.12.2</nodeVersion>
- <npmVersion>2.10.0</npmVersion>
- <keep-ui-build-cache>false</keep-ui-build-cache>
+ <packagingType>pom</packagingType>
+
+ <webappDir>${basedir}/target/webapp</webappDir>
+ <nodeExecutable>${basedir}/target/webapp/node/node</nodeExecutable>
+ <packageManagerScript>node/yarn/dist/bin/yarn.js</packageManagerScript>
+
+ <keepUIBuildCache>false</keepUIBuildCache>
</properties>
<build>
@@ -48,7 +49,9 @@
<excludes>
<exclude>src/main/webapp/jsconfig.json</exclude>
<exclude>src/main/webapp/bower.json</exclude>
+ <exclude>src/main/webapp/bower-shrinkwrap.json</exclude>
<exclude>src/main/webapp/package.json</exclude>
+ <exclude>src/main/webapp/yarn.lock</exclude>
<exclude>src/main/webapp/testem.json</exclude>
<exclude>src/main/webapp/public/assets/images/**/*</exclude>
<exclude>src/main/webapp/public/assets/images/*</exclude>
@@ -58,6 +61,7 @@
<exclude>src/main/webapp/.ember-cli</exclude>
<exclude>src/main/webapp/.jshintrc</exclude>
<exclude>src/main/webapp/.watchmanconfig</exclude>
+ <exclude>src/main/webapp/WEB-INF/wro.xml</exclude>
</excludes>
</configuration>
</plugin>
@@ -66,14 +70,14 @@
<artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version>
<configuration>
- <skip>${keep-ui-build-cache}</skip>
+ <skip>${keepUIBuildCache}</skip>
<followSymLinks>false</followSymLinks>
<filesets>
<fileset>
- <directory>${webappTgtDir}/bower_components</directory>
+ <directory>${webappDir}/bower_components</directory>
</fileset>
<fileset>
- <directory>${webappTgtDir}/node_modules</directory>
+ <directory>${webappDir}/node_modules</directory>
</fileset>
</filesets>
</configuration>
@@ -90,60 +94,82 @@
</activation>
<properties>
- <packaging.type>war</packaging.type>
+ <packagingType>war</packagingType>
</properties>
<build>
<plugins>
- <!-- prepare source code -->
+ <!-- Copy files into target for build -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <id>prepare-source-code</id>
- <phase>generate-sources</phase>
+ <id>copy-resources</id>
+ <!-- here the phase you need -->
+ <phase>validate</phase>
<goals>
- <goal>run</goal>
+ <goal>copy-resources</goal>
</goals>
<configuration>
- <target>
- <copy toDir="${basedir}/target/src/main/webapp">
- <fileset dir="${basedir}/src/main/webapp"/>
- </copy>
-
- <copy toDir="${basedir}/target/src/public">
- <fileset dir="${basedir}/public"/>
- </copy>
- </target>
+ <outputDirectory>${webappDir}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/webapp</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>node_modules/**/*</exclude>
+ <exclude>bower_components/**/*</exclude>
+ <exclude>tmp/**/*</exclude>
+ <exclude>dist/**/*</exclude>
+ </excludes>
+ </resource>
+ </resources>
</configuration>
</execution>
</executions>
</plugin>
-
- <!-- Bower install & grunt build-->
<plugin>
- <artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <!-- Install Node, Yarn, Bower & dependencies -->
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>1.2</version>
+ <configuration>
+ <workingDirectory>${webappDir}</workingDirectory>
+ </configuration>
<executions>
+
+ <!-- Install all dependencies -->
<execution>
- <phase>generate-sources</phase>
- <id>npm install</id>
+ <phase>generate-resources</phase>
+ <id>install node and yarn</id>
<goals>
- <goal>exec</goal>
+ <goal>install-node-and-yarn</goal>
</goals>
<configuration>
- <workingDirectory>${webappTgtDir}</workingDirectory>
- <executable>npm</executable>
- <arguments>
- <argument>install</argument>
- </arguments>
+ <nodeVersion>v5.12.0</nodeVersion>
+ <yarnVersion>v0.21.3</yarnVersion>
+ </configuration>
+ </execution>
+ <execution>
+ <phase>generate-resources</phase>
+ <id>yarn install</id>
+ <goals>
+ <goal>yarn</goal>
+ </goals>
+ <configuration>
+ <arguments>install</arguments>
</configuration>
</execution>
<execution>
- <phase>generate-sources</phase>
+ <phase>generate-resources</phase>
<id>bower install</id>
+ <configuration>
+ <arguments>install</arguments>
+ </configuration>
<goals>
<goal>exec</goal>
</goals>
@@ -156,33 +182,83 @@
</arguments>
</configuration>
</execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+
+ <!-- Build -->
<execution>
<id>ember build</id>
- <phase>generate-sources</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
- <workingDirectory>${webappTgtDir}</workingDirectory>
- <executable>ember</executable>
+ <workingDirectory>${webappDir}</workingDirectory>
+ <executable>${nodeExecutable}</executable>
<arguments>
- <argument>build</argument>
- <argument>-prod</argument>
- <argument>--output-path</argument>
- <argument>${basedir}/target/dist</argument>
+ <argument>${packageManagerScript}</argument>
+ <argument>run</argument>
+ <argument>build:mvn</argument>
</arguments>
</configuration>
</execution>
+
+ </executions>
+ </plugin>
+
+ <!-- Asset minifier -->
+ <plugin>
+ <groupId>ro.isdc.wro4j</groupId>
+ <artifactId>wro4j-maven-plugin</artifactId>
+ <version>1.7.9</version>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
+ <configuration>
+ <minimize>true</minimize>
+ <targetGroups>yarn-ui,vendor</targetGroups>
+ <destinationFolder>${basedir}/target/minified-resources/assets</destinationFolder>
+ <contextFolder>${webappDir}/dist/assets</contextFolder>
+ <wroFile>${webappDir}/WEB-INF/wro.xml</wroFile>
+ </configuration>
</plugin>
<!-- Package into war -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ </execution>
+ </executions>
<configuration>
- <webXml>${basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
- <warSourceDirectory>${basedir}/target/dist</warSourceDirectory>
+ <webXml>${webappDir}/WEB-INF/web.xml</webXml>
+ <warSourceDirectory>${webappDir}/dist</warSourceDirectory>
+ <webResources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>${basedir}/target/minified-resources</directory>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <skipIfEmpty>true</skipIfEmpty>
</configuration>
</plugin>
@@ -190,4 +266,5 @@
</build>
</profile>
</profiles>
+
</project>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3aa81115/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
index 959e169..5b0b07d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
@@ -1,4 +1,7 @@
{
"directory": "bower_components",
- "analytics": false
+ "analytics": false,
+ "resolvers": [
+ "bower-shrinkwrap-resolver-ext"
+ ]
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3aa81115/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/wro.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/wro.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/wro.xml
new file mode 100644
index 0000000..64c925a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/wro.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<groups xmlns="http://www.isdc.ro/wro">
+ <group name='vendor'>
+ <js>/vendor.js</js>
+ </group>
+ <group name='yarn-ui'>
+ <js>/yarn-ui.js</js>
+ </group>
+</groups>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3aa81115/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower-shrinkwrap.json
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower-shrinkwrap.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower-shrinkwrap.json
new file mode 100644
index 0000000..b0f3aa3
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower-shrinkwrap.json
@@ -0,0 +1,66 @@
+{
+ "https://github.com/DataTables/DataTables.git": {
+ "1.10.15": "1.10.15"
+ },
+ "https://github.com/components/ember-data.git": {
+ "2.1.0": "d8b4d3092f67afe22d9d374c40d719d557915fa3"
+ },
+ "https://github.com/components/ember.git": {
+ "2.2.0": "49e042ca89922ed96b27488c2a98add280ae7123"
+ },
+ "https://github.com/components/jqueryui.git": {
+ "1.11.4": "c34f8dbf3ba57b3784b93f26119f436c0e8288e1"
+ },
+ "https://github.com/dockyard/ember-qunit-notifications.git": {
+ "0.1.0": "a83277aa7a1c0545c66e6d133caebb9a620e71ad"
+ },
+ "https://github.com/dockyard/qunit-notifications.git": {
+ "0.1.1": "7a13f6dba5a340e1cb9e0b64c1c711e4d7edaca1"
+ },
+ "https://github.com/ember-cli/ember-cli-shims.git": {
+ "0.0.6": "dcab43b58d5698690050bb9a46ead5c8663c7da1"
+ },
+ "https://github.com/ember-cli/ember-cli-test-loader.git": {
+ "0.2.1": "3348d801089279296c38f31ae14d9c4d115ce154"
+ },
+ "https://github.com/ember-cli/ember-load-initializers.git": {
+ "0.1.7": "7bb21488563bd1bba23e903a812bf5815beddd1a"
+ },
+ "https://github.com/fgnass/spin.js.git": {
+ "2.3.2": "2.3.2"
+ },
+ "https://github.com/ivaynberg/select2.git": {
+ "4.0.0": "4.0.0"
+ },
+ "https://github.com/jquery/jquery-dist.git": {
+ "2.1.4": "7751e69b615c6eca6f783a81e292a55725af6b85"
+ },
+ "https://github.com/jquery/qunit.git": {
+ "1.19.0": "467e7e34652ad7d5883ce9c568461cf8c5e172a8"
+ },
+ "https://github.com/mbostock-bower/d3-bower.git": {
+ "3.5.17": "3.5.17"
+ },
+ "https://github.com/moment/moment-timezone.git": {
+ "0.5.0": "74a2e9378ecf4a31a168f3049f086565c8d66814"
+ },
+ "https://github.com/moment/moment.git": {
+ "2.10.6": "2.10.6",
+ "2.12.0": "d3d7488b4d60632854181cb0a9af325d57fb3d51"
+ },
+ "https://github.com/rwjblue/ember-qunit-builds.git": {
+ "0.4.16": "142c4066a5458bef9dfcb92b70152b9c01d79188"
+ },
+ "https://github.com/sreenaths/more-js.git": {
+ "0.8.2": "0.8.2"
+ },
+ "https://github.com/sreenaths/snippet-ss.git": {
+ "1.11.0": "c1abc566f4e001b7f1939b6dbdd911eadc969cf9"
+ },
+ "https://github.com/stefanpenner/loader.js.git": {
+ "3.3.0": "ac909550c9544325632542bbea97531cc60bc628"
+ },
+ "https://github.com/twbs/bootstrap.git": {
+ "3.3.6": "81df608a40bf0629a1dc08e584849bb1e43e0b7a"
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3aa81115/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
index b75a2e9..4799f92 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
@@ -21,8 +21,22 @@ var Funnel = require("broccoli-funnel");
var EmberApp = require('ember-cli/lib/broccoli/ember-app');
module.exports = function(defaults) {
+ var isProd = EmberApp.env() === 'production';
var app = new EmberApp(defaults, {
- hinting: true
+ storeConfigInMeta: false,
+ minifyCSS: {
+ enabled: isProd
+ },
+ minifyJS: {
+ // Will be minified by wro4j-maven-plugin for performance
+ enabled: false,
+ },
+ fingerprint: {
+ enabled: false
+ },
+ sourcemaps: {
+ enabled: !isProd
+ }
});
app.import("bower_components/datatables/media/css/jquery.dataTables.min.css");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3aa81115/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
index a5e9a2b..2b454aa 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
@@ -8,8 +8,9 @@
"test": "tests"
},
"scripts": {
- "build": "ember build",
- "start": "ember server"
+ "build": "TMPDIR=tmp node ./node_modules/ember-cli/bin/ember build",
+ "start": "TMPDIR=tmp node ./node_modules/ember-cli/bin/ember server",
+ "build:mvn": "TMPDIR=tmp node/node ./node_modules/ember-cli/bin/ember build -prod"
},
"repository": "",
"engines": {
@@ -18,12 +19,14 @@
"author": "",
"license": "Apache",
"devDependencies": {
+ "bower": "1.7.7",
+ "bower-shrinkwrap-resolver-ext": "0.1.0",
"broccoli-asset-rev": "2.4.2",
"broccoli-funnel": "1.0.1",
"em-table": "0.7.0",
"ember-array-contains-helper": "1.0.2",
"ember-bootstrap": "0.5.1",
- "ember-cli": "1.13.13",
+ "ember-cli": "1.13.14",
"ember-cli-app-version": "1.0.0",
"ember-cli-babel": "5.1.6",
"ember-cli-content-security-policy": "0.4.0",
@@ -44,8 +47,10 @@
"ember-lodash": "0.0.10",
"ember-resolver": "2.0.3",
"ember-spin-spinner": "0.2.3",
- "ember-truth-helpers": "1.2.0",
- "select2": "4.0.0"
+ "ember-truth-helpers": "1.3.0",
+ "loader.js": "4.2.3",
+ "select2": "4.0.0",
+ "testem": "0.9.11"
},
"dependencies": {
"em-helpers": "^0.8.0",
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[40/50] [abbrv] hadoop git commit: YARN-7071. Add vcores and number
of containers in new YARN UI node heat map. Contributed by Abdullah Yousufi.
Posted by va...@apache.org.
YARN-7071. Add vcores and number of containers in new YARN UI node heat map. Contributed by Abdullah Yousufi.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1cf7ed8a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1cf7ed8a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1cf7ed8a
Branch: refs/heads/YARN-3368_branch2
Commit: 1cf7ed8a28c723aba9c405f28431e6c31b4effef
Parents: 65b90e1
Author: Sunil G <su...@apache.org>
Authored: Fri Sep 1 20:46:39 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:49 2017 +0530
----------------------------------------------------------------------
.../main/webapp/app/components/nodes-heatmap.js | 62 ++++++++++++++++++--
.../src/main/webapp/app/models/yarn-rm-node.js | 4 +-
.../app/templates/components/nodes-heatmap.hbs | 3 +
.../webapp/app/templates/yarn-nodes/heatmap.hbs | 2 +-
4 files changed, 61 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1cf7ed8a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
index 3acc5de..a1df480 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
@@ -27,6 +27,10 @@ export default BaseChartComponent.extend({
RACK_MARGIN: 20,
filter: "",
selectedCategory: 0,
+ memoryLabel: "Memory",
+ cpuLabel: "VCores",
+ containersLabel: "Containers",
+ totalContainers: 0,
bindTP: function(element, cell) {
element.on("mouseover", function() {
@@ -75,8 +79,7 @@ export default BaseChartComponent.extend({
return true;
}
- var usage = node.get("usedMemoryMB") /
- (node.get("usedMemoryMB") + node.get("availMemoryMB"));
+ var usage = this.calcUsage(node);
var lowerLimit = (this.selectedCategory - 1) * 0.2;
var upperLimit = this.selectedCategory * 0.2;
if (lowerLimit <= usage && usage <= upperLimit) {
@@ -89,6 +92,7 @@ export default BaseChartComponent.extend({
// [{label=label1, value=value1}, ...]
// ...
renderCells: function (model, title) {
+ var selectedOption = d3.select("select").property("value");
var data = [];
model.forEach(function (o) {
data.push(o);
@@ -149,6 +153,7 @@ export default BaseChartComponent.extend({
var chartXOffset = -1;
+ this.totalContainers = 0;
for (i = 0; i < racksArray.length; i++) {
text = g.append("text")
.text(racksArray[i])
@@ -166,6 +171,7 @@ export default BaseChartComponent.extend({
var rack = data[j].get("rack");
if (rack === racksArray[i]) {
+ this.totalContainers += data[j].get("numContainers");
this.addNode(g, xOffset, yOffset, colorFunc, data[j]);
xOffset += this.CELL_MARGIN + this.CELL_WIDTH;
if (xOffset + this.CELL_MARGIN + this.CELL_WIDTH >= layout.x2 -
@@ -192,7 +198,7 @@ export default BaseChartComponent.extend({
layout.y2 = yOffset + layout.margin;
this.adjustMaxHeight(layout.y2);
- this.renderTitleAndBG(g, title, layout, false);
+ this.renderTitleAndBG(g, title + selectedOption + ")" , layout, false);
},
addNode: function (g, xOffset, yOffset, colorFunc, data) {
@@ -200,10 +206,9 @@ export default BaseChartComponent.extend({
.attr("y", yOffset)
.attr("x", xOffset)
.attr("height", this.CELL_HEIGHT)
- .attr("fill", colorFunc(data.get("usedMemoryMB") /
- (data.get("usedMemoryMB") + data.get("availMemoryMB"))))
+ .attr("fill", colorFunc(this.calcUsage(data)))
.attr("width", this.CELL_WIDTH)
- .attr("tooltiptext", data.get("toolTipText"));
+ .attr("tooltiptext", data.get("toolTipText") + this.getToolTipText(data));
if (this.isNodeSelected(data)) {
rect.style("opacity", 0.8);
@@ -243,6 +248,18 @@ export default BaseChartComponent.extend({
},
didInsertElement: function () {
+ var parentId = this.get("parentId");
+ var self = this;
+ var optionsData = [this.memoryLabel, this.cpuLabel, this.containersLabel];
+ d3.select("#heatmap-select")
+ .on('change', function() {
+ self.renderCells(self.get("model"), self.get("title"), self.get("textWidth"));
+ })
+ .selectAll('option')
+ .data(optionsData).enter()
+ .append('option')
+ .text(function (d) { return d; });
+
this.draw();
},
@@ -252,5 +269,38 @@ export default BaseChartComponent.extend({
this.selectedCategory = 0;
this.didInsertElement();
}
+ },
+
+ calcUsage: function(data) {
+ var selectedOption = d3.select('select').property("value");
+ if (selectedOption === this.memoryLabel) {
+ return data.get("usedMemoryMB") /
+ (data.get("usedMemoryMB") + data.get("availMemoryMB"));
+ }
+ else if (selectedOption === this.cpuLabel) {
+ return data.get("usedVirtualCores") /
+ (data.get("usedVirtualCores") + data.get("availableVirtualCores"));
+ }
+ else if (selectedOption === this.containersLabel) {
+ var totalContainers = this.totalContainers;
+ if (totalContainers === 0) { return 0; }
+ return data.get("numContainers") / totalContainers;
+ }
+ },
+
+ getToolTipText: function(data) {
+ var selectedOption = d3.select('select').property("value");
+ if (selectedOption === this.memoryLabel) {
+ return "<p>Used Memory: " + Math.round(data.get("usedMemoryMB")) + " MB</p>" +
+ "<p>Available Memory: " + Math.round(data.get("availMemoryMB")) + " MB</p>";
+ }
+ else if (selectedOption === this.cpuLabel) {
+ return "<p>Used VCores: " + Math.round(data.get("usedVirtualCores")) + " VCores</p>" +
+ "<p>Available VCores: " + Math.round(data.get("availableVirtualCores")) + " VCores</p>";
+ }
+ else if (selectedOption === this.containersLabel) {
+ return "<p>Containers: " + Math.round(data.get("numContainers")) + " Containers</p>" +
+ "<p>Total Containers: " + this.totalContainers + " Containers</p>";
+ }
}
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1cf7ed8a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
index 6baeca2..20b6f5b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
@@ -92,9 +92,7 @@ export default DS.Model.extend({
toolTipText: function() {
return "<p>Rack: " + this.get("rack") + '</p>' +
- "<p>Host: " + this.get("nodeHostName") + '</p>' +
- "<p>Used Memory: " + Math.round(this.get("usedMemoryMB")) + ' MB</p>' +
- "<p>Available Memory: " + Math.round(this.get("availMemoryMB")) + ' MB</p>';
+ "<p>Host: " + this.get("nodeHostName") + '</p>';
}.property(),
usedMemoryBytes: function() {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1cf7ed8a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/nodes-heatmap.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/nodes-heatmap.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/nodes-heatmap.hbs
index e9e6261..e7c89d6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/nodes-heatmap.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/nodes-heatmap.hbs
@@ -22,6 +22,9 @@
<input type="text" class="form-control" aria-label="..." placeholder="Enter part of host/rack to filter nodes"
onchange={{action "applyFilter"}}>
</div>
+ <div class="col-md-6 container-fluid">
+ <select id="heatmap-select" class="form-control"></select>
+ </div>
</div>
</div>
<p/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1cf7ed8a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/heatmap.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/heatmap.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/heatmap.hbs
index e06249f..0ebe7ba 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/heatmap.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/heatmap.hbs
@@ -21,7 +21,7 @@
<div class="row">
<div class="col-lg-12 container-fluid" id="nodes-heatmap-chart">
{{nodes-heatmap model=model.nodes parentId="nodes-heatmap-chart"
- title="Node Heatmap Chart (Usage of Memory)"}}
+ title="Node Heatmap Chart (Usage of "}}
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[41/50] [abbrv] hadoop git commit: YARN-7022. Improve click
interaction in queue topology in new YARN UI. Contributed by Abdullah
Yousufi.
Posted by va...@apache.org.
YARN-7022. Improve click interaction in queue topology in new YARN UI. Contributed by Abdullah Yousufi.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ec3fb457
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ec3fb457
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ec3fb457
Branch: refs/heads/YARN-3368_branch2
Commit: ec3fb457724bb94833346c1ac196c86bb1866dca
Parents: da104a3
Author: Sunil G <su...@apache.org>
Authored: Tue Sep 5 08:06:43 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:49 2017 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/components/tree-selector.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec3fb457/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
index 1a81a32..6788582 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
@@ -129,7 +129,7 @@ export default Ember.Component.extend({
var nodeEnter = node.enter().append("g")
.attr("class", "node")
.attr("transform", function() { return "translate(" + source.y0 + "," + source.x0 + ")"; })
- .on("mouseover", function(d){
+ .on("click", function(d){
if (d.queueData.get("name") !== this.get("selected")) {
document.location.href = "#/yarn-queues/" + d.queueData.get("name") + "!";
}
@@ -145,7 +145,7 @@ export default Ember.Component.extend({
}, 100);
}.bind(this))
- .on("click", function (d) {
+ .on("dblclick", function (d) {
document.location.href = "#/yarn-queue/" + d.queueData.get("name") + "/info";
});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[02/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to fix
document. (Wangda Tan via Sunil G)
Posted by va...@apache.org.
YARN-4849. Addendum patch to fix document. (Wangda Tan via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/48336218
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/48336218
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/48336218
Branch: refs/heads/YARN-3368_branch2
Commit: 48336218d4fddfb388ca0b60d3147ef1bafc2170
Parents: a4021c9
Author: sunilg <su...@apache.org>
Authored: Wed Aug 24 16:10:19 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
BUILDING.txt | 2 +-
.../src/site/markdown/YarnUI2.md | 36 +++++++++++---------
2 files changed, 21 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/48336218/BUILDING.txt
----------------------------------------------------------------------
diff --git a/BUILDING.txt b/BUILDING.txt
index 527e5cf..bf6122b 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -130,7 +130,7 @@ Maven build goals:
* Use -Psrc to create a project source TAR.GZ
* Use -Dtar to create a TAR with the distribution (using -Pdist)
* Use -Preleasedocs to include the changelog and release docs (requires Internet connectivity)
- * Use -Pyarn-ui to build YARN UI v2. (Requires Internet connectivity, and it is for dev use only)
+ * Use -Pyarn-ui to build YARN UI v2. (Requires Internet connectivity)
Snappy build options:
http://git-wip-us.apache.org/repos/asf/hadoop/blob/48336218/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
index 575ebc7..ff48183 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
@@ -17,27 +17,31 @@
Hadoop: YARN-UI V2
=================
-*This is a WIP project, nobody should use it in production.*
Prerequisites
-------------
-You will need the following things properly installed on your computer.
+If you run RM locally in your computer for test purpose, you need the following things properly installed.
-* Install Node.js with NPM: https://nodejs.org/download/
-* After Node.js installed, install bower: `npm install -g bower`.
-* Install Ember-cli: `npm install -g ember-cli`
+- Install Node.js with NPM: https://nodejs.org/download
+- After Node.js installed, install `corsproxy`: `npm install -g corsproxy`.
-BUILD
-----
-* Please refer to BUILDING.txt in the top directory and pass -Pyarn-ui to build UI-related code
-* Execute `mvn test -Pyarn-ui` to run unit tests
-Try it
-------
+Configurations
+-------------
+
+*In yarn-site.xml*
+
+| Configuration Property | Description |
+|:---- |:---- |
+| `yarn.resourcemanager.webapp.ui2.enable` | In the server side it indicates whether the new YARN-UI v2 is enabled or not. Defaults to `false`. |
+| `yarn.resourcemanager.webapp.ui2.address` | Specify the address of ResourceManager and port which host YARN-UI v2, defaults to `localhost:8288`. |
-* Packaging and deploying Hadoop in this branch
-* In `hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/config.js`, change `timelineWebUrl` and `rmWebUrl` to your YARN RM/Timeline server web address.
-* If you are running YARN RM in your localhost, you should update `localBaseUrl` to `localhost:1337/`, install `npm install -g corsproxy` and run `corsproxy` to avoid CORS errors. More details: `https://www.npmjs.com/package/corsproxy`.
-* Run `ember serve` under `hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/`
-* Visit your app at [http://localhost:4200](http://localhost:4200).
+*In $HADOOP_PREFIX/share/hadoop/yarn/webapps/rm/config/configs.env*
+
+- Update timelineWebAddress and rmWebAddress to the actual addresses run resource manager and timeline server
+- If you run RM locally in you computer just for test purpose, you need to keep `corsproxy` running. Otherwise, you need to set `localBaseAddress` to empty.
+
+Use it
+-------------
+Open your browser, go to `rm-address:8288` and try it!
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[50/50] [abbrv] hadoop git commit: YARN-7075. Better styling for
donut charts in new YARN UI. Contributed by Da Ding.
Posted by va...@apache.org.
YARN-7075. Better styling for donut charts in new YARN UI. Contributed by Da Ding.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/da104a3e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/da104a3e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/da104a3e
Branch: refs/heads/YARN-3368_branch2
Commit: da104a3e7845f39b2f02eb10c872aac84d4a0293
Parents: 1cf7ed8
Author: Sunil G <su...@apache.org>
Authored: Sat Sep 2 08:08:59 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:49 2017 +0530
----------------------------------------------------------------------
.../main/webapp/app/components/donut-chart.js | 5 +++-
.../src/main/webapp/app/styles/app.css | 24 ++++++++++++++++++--
2 files changed, 26 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/da104a3e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
index 82d2d46..b1e6ecf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
@@ -53,7 +53,10 @@ export default BaseChartComponent.extend({
// 50 is for title
var outerRadius = (h - 50 - 2 * layout.margin) / 2;
- var innerRadius = outerRadius * 0.618;
+
+ // Ratio of inner radius to outer radius
+ var radiusRatio = 0.75;
+ var innerRadius = outerRadius * radiusRatio;
var arc = d3.svg.arc()
.innerRadius(innerRadius)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/da104a3e/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 8b8ea56..38e25e4 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
@@ -20,6 +20,8 @@ body, html, body > .ember-view {
height: 100%;
overflow: visible;
color: @text-color;
+ background: #f6f6f8;
+ font-family: "Open Sans","Helvetica Neue", sans-serif!important;
}
body, html {
min-width: 1024px;
@@ -29,11 +31,11 @@ body, html {
Over all style
*/
text {
- font: 16px sans-serif;
+ font-size: 14px;
}
text.small {
- font: 8px sans-serif;
+ font-size: 8px;
}
html, body
@@ -184,6 +186,7 @@ table.dataTable thead .sorting_desc_disabled {
.breadcrumb {
padding-bottom: 3px;
+ background-color: #f6f6f8;
}
.navbar-default .navbar-nav > li > a {
@@ -268,12 +271,29 @@ td {
margin: 0 auto -40px; // Must be same as footer & footer-frame
}
+.panel {
+ background-color: #fff;
+ border: 1px solid #ddd;
+ border-radius: 15px;
+ -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+ box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+ overflow: hidden;
+}
+
.panel-default .container-fluid {
margin-top: -45px !important;
margin-bottom: -10px !important;
}
+.panel-default > .panel-heading {
+ background-image: none;
+ background-color: #f5f5f5 !important;
+ border-radius: 15px 15px 0px 0px;
+}
+
+
.panel-heading {
+ background-color: rgba(0, 0, 0, 0) !important;
font-weight: bold;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[48/50] [abbrv] hadoop git commit: YARN-6458. Use yarn package
manager to lock down dependency versions for new web UI. Contributed by
Sreenath Somarajapuram.
Posted by va...@apache.org.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3aa81115/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
new file mode 100644
index 0000000..948feb9
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
@@ -0,0 +1,4983 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+abbrev@1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
+
+abbrev@~1.0.7:
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
+
+accepts@~1.3.3:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
+ dependencies:
+ mime-types "~2.1.11"
+ negotiator "0.6.1"
+
+acorn@^4.0.3:
+ version "4.0.11"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
+
+after@0.8.1:
+ version "0.8.1"
+ resolved "https://registry.yarnpkg.com/after/-/after-0.8.1.tgz#ab5d4fb883f596816d3515f8f791c0af486dd627"
+
+align-text@^0.1.1, align-text@^0.1.3:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+ dependencies:
+ kind-of "^3.0.2"
+ longest "^1.0.1"
+ repeat-string "^1.5.2"
+
+alter@~0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/alter/-/alter-0.2.0.tgz#c7588808617572034aae62480af26b1d4d1cb3cd"
+ dependencies:
+ stable "~0.1.3"
+
+amd-name-resolver@0.0.2:
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.2.tgz#7bee4e112aabeecc2e14429c4ca750c55d8e5ecd"
+
+amdefine@>=0.0.4:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+
+ansi-regex@^0.2.0, ansi-regex@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
+
+ansi-regex@^1.0.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-1.1.1.tgz#41c847194646375e6a1a5d10c3ca054ef9fc980d"
+
+ansi-regex@^2.0.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-styles@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
+
+ansi-styles@^2.0.1, ansi-styles@^2.1.0, ansi-styles@^2.2.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+ansi-styles@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
+
+ansi@^0.3.0, ansi@~0.3.0, ansi@~0.3.1:
+ version "0.3.1"
+ resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
+
+ansicolors@~0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
+
+ansicolors@~0.3.2:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
+
+ansistyles@~0.1.3:
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
+
+anymatch@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
+ dependencies:
+ arrify "^1.0.0"
+ micromatch "^2.1.5"
+
+archy@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+
+are-we-there-yet@~1.0.0:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz#a2d28c93102aa6cc96245a26cb954de06ec53f0c"
+ dependencies:
+ delegates "^1.0.0"
+ readable-stream "^2.0.0 || ^1.1.13"
+
+are-we-there-yet@~1.1.2:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+ dependencies:
+ delegates "^1.0.0"
+ readable-stream "^2.0.6"
+
+argparse@^1.0.7, argparse@~1.0.2:
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+ dependencies:
+ sprintf-js "~1.0.2"
+
+arr-diff@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+ dependencies:
+ arr-flatten "^1.0.1"
+
+arr-flatten@^1.0.1:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
+
+array-equal@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+
+array-flatten@1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+
+array-index@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9"
+ dependencies:
+ debug "^2.2.0"
+ es6-symbol "^3.0.2"
+
+array-unique@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+
+arraybuffer.slice@0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
+
+arrify@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+asap@^2.0.0, asap@~2.0.3:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f"
+
+asn1@0.1.11:
+ version "0.1.11"
+ resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz#559be18376d08a4ec4dbe80877d27818639b2df7"
+
+asn1@~0.2.3:
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
+assert-plus@^0.1.5:
+ version "0.1.5"
+ resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160"
+
+assert-plus@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+
+ast-traverse@~0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/ast-traverse/-/ast-traverse-0.1.1.tgz#69cf2b8386f19dcda1bb1e05d68fe359d8897de6"
+
+ast-types@0.8.12:
+ version "0.8.12"
+ resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.12.tgz#a0d90e4351bb887716c83fd637ebf818af4adfcc"
+
+ast-types@0.9.6:
+ version "0.9.6"
+ resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
+
+async-disk-cache@^1.0.0:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-1.3.1.tgz#3394010d9448b16205b01e0e2e704180805413d3"
+ dependencies:
+ debug "^2.1.3"
+ heimdalljs "^0.2.3"
+ istextorbinary "2.1.0"
+ mkdirp "^0.5.0"
+ rimraf "^2.5.3"
+ rsvp "^3.0.18"
+
+async-some@~1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/async-some/-/async-some-1.0.2.tgz#4d8a81620d5958791b5b98f802d3207776e95509"
+ dependencies:
+ dezalgo "^1.0.2"
+
+async@0.9.0:
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/async/-/async-0.9.0.tgz#ac3613b1da9bed1b47510bb4651b8931e47146c7"
+
+async@^1.0.0:
+ version "1.5.2"
+ resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
+async@^2.0.1:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9"
+ dependencies:
+ lodash "^4.14.0"
+
+async@~0.2.6, async@~0.2.9:
+ version "0.2.10"
+ resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+
+async@~0.8.0:
+ version "0.8.0"
+ resolved "https://registry.yarnpkg.com/async/-/async-0.8.0.tgz#ee65ec77298c2ff1456bc4418a052d0f06435112"
+
+aws-sign2@~0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+
+aws4@^1.2.1:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+
+babel-core@^5.0.0:
+ version "5.8.38"
+ resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-5.8.38.tgz#1fcaee79d7e61b750b00b8e54f6dfc9d0af86558"
+ dependencies:
+ babel-plugin-constant-folding "^1.0.1"
+ babel-plugin-dead-code-elimination "^1.0.2"
+ babel-plugin-eval "^1.0.1"
+ babel-plugin-inline-environment-variables "^1.0.1"
+ babel-plugin-jscript "^1.0.4"
+ babel-plugin-member-expression-literals "^1.0.1"
+ babel-plugin-property-literals "^1.0.1"
+ babel-plugin-proto-to-assign "^1.0.3"
+ babel-plugin-react-constant-elements "^1.0.3"
+ babel-plugin-react-display-name "^1.0.3"
+ babel-plugin-remove-console "^1.0.1"
+ babel-plugin-remove-debugger "^1.0.1"
+ babel-plugin-runtime "^1.0.7"
+ babel-plugin-undeclared-variables-check "^1.0.2"
+ babel-plugin-undefined-to-void "^1.1.6"
+ babylon "^5.8.38"
+ bluebird "^2.9.33"
+ chalk "^1.0.0"
+ convert-source-map "^1.1.0"
+ core-js "^1.0.0"
+ debug "^2.1.1"
+ detect-indent "^3.0.0"
+ esutils "^2.0.0"
+ fs-readdir-recursive "^0.1.0"
+ globals "^6.4.0"
+ home-or-tmp "^1.0.0"
+ is-integer "^1.0.4"
+ js-tokens "1.0.1"
+ json5 "^0.4.0"
+ lodash "^3.10.0"
+ minimatch "^2.0.3"
+ output-file-sync "^1.1.0"
+ path-exists "^1.0.0"
+ path-is-absolute "^1.0.0"
+ private "^0.1.6"
+ regenerator "0.8.40"
+ regexpu "^1.3.0"
+ repeating "^1.1.2"
+ resolve "^1.1.6"
+ shebang-regex "^1.0.0"
+ slash "^1.0.0"
+ source-map "^0.5.0"
+ source-map-support "^0.2.10"
+ to-fast-properties "^1.0.0"
+ trim-right "^1.0.0"
+ try-resolve "^1.0.0"
+
+babel-plugin-constant-folding@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/babel-plugin-constant-folding/-/babel-plugin-constant-folding-1.0.1.tgz#8361d364c98e449c3692bdba51eff0844290aa8e"
+
+babel-plugin-dead-code-elimination@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/babel-plugin-dead-code-elimination/-/babel-plugin-dead-code-elimination-1.0.2.tgz#5f7c451274dcd7cccdbfbb3e0b85dd28121f0f65"
+
+babel-plugin-eval@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz#a2faed25ce6be69ade4bfec263f70169195950da"
+
+babel-plugin-htmlbars-inline-precompile@0.0.5:
+ version "0.0.5"
+ resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-0.0.5.tgz#60fc2a3a453664cb524b21866892c212ee63ff70"
+
+babel-plugin-inline-environment-variables@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/babel-plugin-inline-environment-variables/-/babel-plugin-inline-environment-variables-1.0.1.tgz#1f58ce91207ad6a826a8bf645fafe68ff5fe3ffe"
+
+babel-plugin-jscript@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/babel-plugin-jscript/-/babel-plugin-jscript-1.0.4.tgz#8f342c38276e87a47d5fa0a8bd3d5eb6ccad8fcc"
+
+babel-plugin-member-expression-literals@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/babel-plugin-member-expression-literals/-/babel-plugin-member-expression-literals-1.0.1.tgz#cc5edb0faa8dc927170e74d6d1c02440021624d3"
+
+babel-plugin-property-literals@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/babel-plugin-property-literals/-/babel-plugin-property-literals-1.0.1.tgz#0252301900192980b1c118efea48ce93aab83336"
+
+babel-plugin-proto-to-assign@^1.0.3:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/babel-plugin-proto-to-assign/-/babel-plugin-proto-to-assign-1.0.4.tgz#c49e7afd02f577bc4da05ea2df002250cf7cd123"
+ dependencies:
+ lodash "^3.9.3"
+
+babel-plugin-react-constant-elements@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/babel-plugin-react-constant-elements/-/babel-plugin-react-constant-elements-1.0.3.tgz#946736e8378429cbc349dcff62f51c143b34e35a"
+
+babel-plugin-react-display-name@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/babel-plugin-react-display-name/-/babel-plugin-react-display-name-1.0.3.tgz#754fe38926e8424a4e7b15ab6ea6139dee0514fc"
+
+babel-plugin-remove-console@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/babel-plugin-remove-console/-/babel-plugin-remove-console-1.0.1.tgz#d8f24556c3a05005d42aaaafd27787f53ff013a7"
+
+babel-plugin-remove-debugger@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/babel-plugin-remove-debugger/-/babel-plugin-remove-debugger-1.0.1.tgz#fd2ea3cd61a428ad1f3b9c89882ff4293e8c14c7"
+
+babel-plugin-runtime@^1.0.7:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/babel-plugin-runtime/-/babel-plugin-runtime-1.0.7.tgz#bf7c7d966dd56ecd5c17fa1cb253c9acb7e54aaf"
+
+babel-plugin-undeclared-variables-check@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/babel-plugin-undeclared-variables-check/-/babel-plugin-undeclared-variables-check-1.0.2.tgz#5cf1aa539d813ff64e99641290af620965f65dee"
+ dependencies:
+ leven "^1.0.2"
+
+babel-plugin-undefined-to-void@^1.1.6:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz#7f578ef8b78dfae6003385d8417a61eda06e2f81"
+
+babylon@^5.8.38:
+ version "5.8.38"
+ resolved "https://registry.yarnpkg.com/babylon/-/babylon-5.8.38.tgz#ec9b120b11bf6ccd4173a18bf217e60b79859ffd"
+
+backbone@^1.1.2:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.3.3.tgz#4cc80ea7cb1631ac474889ce40f2f8bc683b2999"
+ dependencies:
+ underscore ">=1.8.3"
+
+backo2@1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+
+balanced-match@^0.4.1:
+ version "0.4.2"
+ resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+
+base64-arraybuffer@0.1.2:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz#474df4a9f2da24e05df3158c3b1db3c3cd46a154"
+
+base64id@0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/base64id/-/base64id-0.1.0.tgz#02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"
+
+basic-auth@~1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-1.1.0.tgz#45221ee429f7ee1e5035be3f51533f1cdfd29884"
+
+bcrypt-pbkdf@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+ dependencies:
+ tweetnacl "^0.14.3"
+
+benchmark@1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-1.0.0.tgz#2f1e2fa4c359f11122aa183082218e957e390c73"
+
+better-assert@~1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+ dependencies:
+ callsite "1.0.0"
+
+"binaryextensions@1 || 2":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.0.0.tgz#e597d1a7a6a3558a2d1c7241a16c99965e6aa40f"
+
+bl@~1.0.0:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/bl/-/bl-1.0.3.tgz#fc5421a28fd4226036c3b3891a66a25bc64d226e"
+ dependencies:
+ readable-stream "~2.0.5"
+
+bl@~1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398"
+ dependencies:
+ readable-stream "~2.0.5"
+
+blank-object@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/blank-object/-/blank-object-1.0.2.tgz#f990793fbe9a8c8dd013fb3219420bec81d5f4b9"
+
+blob@0.0.4:
+ version "0.0.4"
+ resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
+
+block-stream@*, block-stream@0.0.8:
+ version "0.0.8"
+ resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.8.tgz#0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b"
+ dependencies:
+ inherits "~2.0.0"
+
+bluebird@^2.9.26, bluebird@^2.9.33:
+ version "2.11.0"
+ resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
+
+body-parser@^1.2.0:
+ version "1.17.1"
+ resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.17.1.tgz#75b3bc98ddd6e7e0d8ffe750dfaca5c66993fa47"
+ dependencies:
+ bytes "2.4.0"
+ content-type "~1.0.2"
+ debug "2.6.1"
+ depd "~1.1.0"
+ http-errors "~1.6.1"
+ iconv-lite "0.4.15"
+ on-finished "~2.3.0"
+ qs "6.4.0"
+ raw-body "~2.2.0"
+ type-is "~1.6.14"
+
+body-parser@~1.14.0:
+ version "1.14.2"
+ resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.14.2.tgz#1015cb1fe2c443858259581db53332f8d0cf50f9"
+ dependencies:
+ bytes "2.2.0"
+ content-type "~1.0.1"
+ debug "~2.2.0"
+ depd "~1.1.0"
+ http-errors "~1.3.1"
+ iconv-lite "0.4.13"
+ on-finished "~2.3.0"
+ qs "5.2.0"
+ raw-body "~2.1.5"
+ type-is "~1.6.10"
+
+boom@2.x.x:
+ version "2.10.1"
+ resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+ dependencies:
+ hoek "2.x.x"
+
+bower-config@0.6.1:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-0.6.1.tgz#7093155688bef44079bf4cb32d189312c87ded60"
+ dependencies:
+ graceful-fs "~2.0.0"
+ mout "~0.9.0"
+ optimist "~0.6.0"
+ osenv "0.0.3"
+
+bower-endpoint-parser@0.2.2:
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6"
+
+bower-shrinkwrap-resolver-ext@0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/bower-shrinkwrap-resolver-ext/-/bower-shrinkwrap-resolver-ext-0.1.0.tgz#963c1a87107501b0cb7823d8cbc84d5167c7fa23"
+ dependencies:
+ debuglog "^1.0.1"
+ json-stable-stringify "^1.0.1"
+ object-assign "^4.0.1"
+ semver "^5.3.0"
+ string.prototype.endswith "^0.2.0"
+
+bower@1.7.7, bower@^1.3.12:
+ version "1.7.7"
+ resolved "https://registry.yarnpkg.com/bower/-/bower-1.7.7.tgz#2fd7ff3ebdcba5a8ffcd84c397c8fdfe9f825f92"
+
+brace-expansion@^1.0.0:
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
+ dependencies:
+ balanced-match "^0.4.1"
+ concat-map "0.0.1"
+
+braces@^1.8.2:
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+ dependencies:
+ expand-range "^1.8.1"
+ preserve "^0.2.0"
+ repeat-element "^1.1.2"
+
+breakable@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/breakable/-/breakable-1.0.0.tgz#784a797915a38ead27bad456b5572cb4bbaa78c1"
+
+broccoli-asset-rev@2.4.2:
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/broccoli-asset-rev/-/broccoli-asset-rev-2.4.2.tgz#b84953affbda78d17dffb41349398f50fc26125c"
+ dependencies:
+ broccoli-asset-rewrite "^1.0.9"
+ broccoli-filter "^1.2.2"
+ json-stable-stringify "^1.0.0"
+ matcher-collection "^1.0.1"
+ rsvp "~3.0.6"
+
+broccoli-asset-rewrite@^1.0.9:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/broccoli-asset-rewrite/-/broccoli-asset-rewrite-1.1.0.tgz#77a5da56157aa318c59113245e8bafb4617f8830"
+ dependencies:
+ broccoli-filter "^1.2.3"
+
+broccoli-babel-transpiler@^5.4.5, broccoli-babel-transpiler@^5.5.0:
+ version "5.6.2"
+ resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.6.2.tgz#958c72e43575b2f0a862a5096dba1ce1ebc7d74d"
+ dependencies:
+ babel-core "^5.0.0"
+ broccoli-funnel "^1.0.0"
+ broccoli-merge-trees "^1.0.0"
+ broccoli-persistent-filter "^1.0.1"
+ clone "^0.2.0"
+ hash-for-dep "^1.0.2"
+ json-stable-stringify "^1.0.0"
+
+broccoli-caching-writer@^2.0.0, broccoli-caching-writer@^2.0.4, broccoli-caching-writer@^2.2.0, broccoli-caching-writer@^2.3.1:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
+ dependencies:
+ broccoli-kitchen-sink-helpers "^0.2.5"
+ broccoli-plugin "1.1.0"
+ debug "^2.1.1"
+ rimraf "^2.2.8"
+ rsvp "^3.0.17"
+ walk-sync "^0.2.5"
+
+broccoli-clean-css@0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-0.2.0.tgz#15f1c265a6986585a972bfb070bf52e9c054c861"
+ dependencies:
+ broccoli-filter "^0.1.6"
+ clean-css "^2.2.1"
+
+broccoli-config-loader@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/broccoli-config-loader/-/broccoli-config-loader-1.0.0.tgz#c3cf5ecfaffc04338c6f1d5d38dc36baeaa131ba"
+ dependencies:
+ broccoli-caching-writer "^2.0.4"
+
+broccoli-config-replace@^1.1.0:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/broccoli-config-replace/-/broccoli-config-replace-1.1.2.tgz#6ea879d92a5bad634d11329b51fc5f4aafda9c00"
+ dependencies:
+ broccoli-kitchen-sink-helpers "^0.3.1"
+ broccoli-plugin "^1.2.0"
+ debug "^2.2.0"
+ fs-extra "^0.24.0"
+
+broccoli-filter@^0.1.6:
+ version "0.1.14"
+ resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-0.1.14.tgz#23cae3891ff9ebb7b4d7db00c6dcf03535daf7ad"
+ dependencies:
+ broccoli-kitchen-sink-helpers "^0.2.6"
+ broccoli-writer "^0.1.1"
+ mkdirp "^0.3.5"
+ promise-map-series "^0.2.1"
+ quick-temp "^0.1.2"
+ rsvp "^3.0.16"
+ symlink-or-copy "^1.0.1"
+ walk-sync "^0.1.3"
+
+broccoli-filter@^1.2.2, broccoli-filter@^1.2.3:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-1.2.4.tgz#409afb94b9a3a6da9fac8134e91e205f40cc7330"
+ dependencies:
+ broccoli-kitchen-sink-helpers "^0.3.1"
+ broccoli-plugin "^1.0.0"
+ copy-dereference "^1.0.0"
+ debug "^2.2.0"
+ mkdirp "^0.5.1"
+ promise-map-series "^0.2.1"
+ rsvp "^3.0.18"
+ symlink-or-copy "^1.0.1"
+ walk-sync "^0.3.1"
+
+broccoli-funnel@1.0.1, broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.0.1.tgz#12cb76e342343592a3b18ae7840c0db3bd16d8af"
+ dependencies:
+ array-equal "^1.0.0"
+ blank-object "^1.0.1"
+ broccoli-plugin "^1.0.0"
+ debug "^2.2.0"
+ fast-ordered-set "^1.0.0"
+ fs-tree-diff "^0.3.0"
+ minimatch "^2.0.1"
+ mkdirp "^0.5.0"
+ path-posix "^1.0.0"
+ rimraf "^2.4.3"
+ symlink-or-copy "^1.0.0"
+ walk-sync "^0.2.6"
+
+broccoli-jshint@^1.0.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/broccoli-jshint/-/broccoli-jshint-1.2.0.tgz#8cd565d11a04bfd32cb8f85a0f7ede1e5be7a6a2"
+ dependencies:
+ broccoli-persistent-filter "^1.2.0"
+ chalk "~0.4.0"
+ findup-sync "^0.3.0"
+ jshint "^2.7.0"
+ json-stable-stringify "^1.0.0"
+ mkdirp "~0.4.0"
+
+broccoli-kitchen-sink-helpers@^0.2.5, broccoli-kitchen-sink-helpers@^0.2.6, broccoli-kitchen-sink-helpers@^0.2.7:
+ version "0.2.9"
+ resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
+ dependencies:
+ glob "^5.0.10"
+ mkdirp "^0.5.1"
+
+broccoli-kitchen-sink-helpers@^0.3.1:
+ version "0.3.1"
+ resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.3.1.tgz#77c7c18194b9664163ec4fcee2793444926e0c06"
+ dependencies:
+ glob "^5.0.10"
+ mkdirp "^0.5.1"
+
+broccoli-less-single@^0.6.4:
+ version "0.6.4"
+ resolved "https://registry.yarnpkg.com/broccoli-less-single/-/broccoli-less-single-0.6.4.tgz#200316f4146b8cf7e6ab97fc661b8085cc89bdb9"
+ dependencies:
+ broccoli-caching-writer "^2.3.1"
+ include-path-searcher "^0.1.0"
+ less "^2.5.0"
+ lodash.merge "^3.3.2"
+ mkdirp "^0.5.0"
+
+broccoli-merge-trees@1.1.1, broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.1.1.tgz#1e283d18c686da922bb91a80d7aac0d161388e21"
+ dependencies:
+ broccoli-plugin "^1.0.0"
+ can-symlink "^1.0.0"
+ debug "^2.2.0"
+ fast-ordered-set "^1.0.2"
+ fs-tree-diff "^0.4.3"
+ rimraf "^2.4.3"
+ symlink-or-copy "^1.0.0"
+
+broccoli-persistent-filter@^1.0.1, broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0:
+ version "1.2.13"
+ resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.2.13.tgz#61368669e2b8f35238fdd38a2a896597e4a1c821"
+ dependencies:
+ async-disk-cache "^1.0.0"
+ blank-object "^1.0.1"
+ broccoli-plugin "^1.0.0"
+ fs-tree-diff "^0.5.2"
+ hash-for-dep "^1.0.2"
+ heimdalljs "^0.2.1"
+ heimdalljs-logger "^0.1.7"
+ md5-hex "^1.0.2"
+ mkdirp "^0.5.1"
+ promise-map-series "^0.2.1"
+ rsvp "^3.0.18"
+ symlink-or-copy "^1.0.1"
+ walk-sync "^0.3.1"
+
+broccoli-plugin@1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02"
+ dependencies:
+ promise-map-series "^0.2.1"
+ quick-temp "^0.1.3"
+ rimraf "^2.3.4"
+ symlink-or-copy "^1.0.1"
+
+broccoli-plugin@^1.0.0, broccoli-plugin@^1.2.0, broccoli-plugin@^1.2.1, broccoli-plugin@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.3.0.tgz#bee704a8e42da08cb58e513aaa436efb7f0ef1ee"
+ dependencies:
+ promise-map-series "^0.2.1"
+ quick-temp "^0.1.3"
+ rimraf "^2.3.4"
+ symlink-or-copy "^1.1.8"
+
+broccoli-sane-watcher@^1.1.1:
+ version "1.1.5"
+ resolved "https://registry.yarnpkg.com/broccoli-sane-watcher/-/broccoli-sane-watcher-1.1.5.tgz#f2b0af9cf0afb74c7a49cd88eb11c6869ee8c0c0"
+ dependencies:
+ broccoli-slow-trees "^1.1.0"
+ debug "^2.1.0"
+ rsvp "^3.0.18"
+ sane "^1.1.1"
+
+broccoli-slow-trees@^1.0.0, broccoli-slow-trees@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/broccoli-slow-trees/-/broccoli-slow-trees-1.1.0.tgz#426c5724e008107e4573f73e8a9ca702916b78f7"
+
+broccoli-source@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-1.1.0.tgz#54f0e82c8b73f46580cbbc4f578f0b32fca8f809"
+
+broccoli-sourcemap-concat@^1.1.6:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/broccoli-sourcemap-concat/-/broccoli-sourcemap-concat-1.1.6.tgz#7caa0e28e2553c58897c369a673da05600541872"
+ dependencies:
+ broccoli-caching-writer "^2.0.0"
+ broccoli-kitchen-sink-helpers "^0.2.5"
+ fast-sourcemap-concat " ^0.2.4"
+ lodash-node "^2.4.1"
+ lodash.uniq "^3.2.2"
+ mkdirp "^0.5.1"
+
+broccoli-sourcemap-concat@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/broccoli-sourcemap-concat/-/broccoli-sourcemap-concat-2.0.2.tgz#64dbea4f9da4737c3fc5502efa20bb6322cd06a2"
+ dependencies:
+ broccoli-caching-writer "^2.0.0"
+ broccoli-kitchen-sink-helpers "^0.2.5"
+ fast-sourcemap-concat " ^0.2.4"
+ lodash-node "^2.4.1"
+ lodash.uniq "^3.2.2"
+ minimatch "^2.0.10"
+ mkdirp "^0.5.1"
+
+broccoli-sri-hash@^1.2.2:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/broccoli-sri-hash/-/broccoli-sri-hash-1.2.2.tgz#64e54401ac02ea49ebf2701169ae214c07588493"
+ dependencies:
+ broccoli-caching-writer "^2.2.0"
+ mkdirp "^0.5.1"
+ rsvp "^3.1.0"
+ sri-toolbox "^0.2.0"
+ symlink-or-copy "^1.0.1"
+
+broccoli-stew@^1.0.0:
+ version "1.4.2"
+ resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-1.4.2.tgz#9ec4062fd7162c6026561a2fbf64558363aff8d6"
+ dependencies:
+ broccoli-funnel "^1.0.1"
+ broccoli-merge-trees "^1.0.0"
+ broccoli-persistent-filter "^1.1.6"
+ broccoli-plugin "^1.3.0"
+ chalk "^1.1.3"
+ debug "^2.4.0"
+ ensure-posix-path "^1.0.1"
+ fs-extra "^2.0.0"
+ minimatch "^3.0.2"
+ resolve "^1.1.6"
+ rsvp "^3.0.16"
+ sanitize-filename "^1.5.3"
+ symlink-or-copy "^1.1.8"
+ walk-sync "^0.3.0"
+
+broccoli-uglify-sourcemap@^1.0.0:
+ version "1.5.2"
+ resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-1.5.2.tgz#04f84ab0db539031fa868ccfa563c9932d50cedb"
+ dependencies:
+ broccoli-plugin "^1.2.1"
+ debug "^2.2.0"
+ lodash.merge "^4.5.1"
+ matcher-collection "^1.0.0"
+ mkdirp "^0.5.0"
+ source-map-url "^0.3.0"
+ symlink-or-copy "^1.0.1"
+ uglify-js "^2.7.0"
+ walk-sync "^0.1.3"
+
+broccoli-unwatched-tree@^0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/broccoli-unwatched-tree/-/broccoli-unwatched-tree-0.1.1.tgz#4312fde04bdafe67a05a967d72cc50b184a9f514"
+
+broccoli-viz@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/broccoli-viz/-/broccoli-viz-2.0.1.tgz#3f3ed2fb83e368aa5306fae460801dea552e40db"
+
+broccoli-writer@^0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/broccoli-writer/-/broccoli-writer-0.1.1.tgz#d4d71aa8f2afbc67a3866b91a2da79084b96ab2d"
+ dependencies:
+ quick-temp "^0.1.0"
+ rsvp "^3.0.6"
+
+broccoli@0.16.8:
+ version "0.16.8"
+ resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-0.16.8.tgz#2a00f6b82a8106ec9cfb380a8ada4ad490b836d5"
+ dependencies:
+ broccoli-kitchen-sink-helpers "^0.2.5"
+ broccoli-slow-trees "^1.0.0"
+ commander "^2.5.0"
+ connect "^3.3.3"
+ copy-dereference "^1.0.0"
+ findup-sync "^0.2.1"
+ handlebars "^3.0.1"
+ mime "^1.2.11"
+ promise-map-series "^0.2.1"
+ quick-temp "^0.1.2"
+ rimraf "^2.2.8"
+ rsvp "^3.0.17"
+
+bser@1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/bser/-/bser-1.0.2.tgz#381116970b2a6deea5646dd15dd7278444b56169"
+ dependencies:
+ node-int64 "^0.4.0"
+
+buffer-shims@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
+
+builtin-modules@^1.0.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+
+builtins@0.0.7:
+ version "0.0.7"
+ resolved "https://registry.yarnpkg.com/builtins/-/builtins-0.0.7.tgz#355219cd6cf18dbe7c01cc7fd2dce765cfdc549a"
+
+builtins@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+
+bytes@2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.2.0.tgz#fd35464a403f6f9117c2de3609ecff9cae000588"
+
+bytes@2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070"
+
+bytes@2.4.0:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.4.0.tgz#7d97196f9d5baf7f6935e25985549edd2a6c2339"
+
+callsite@1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+
+camelcase@^1.0.2, camelcase@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+
+can-symlink@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/can-symlink/-/can-symlink-1.0.0.tgz#97b607d8a84bb6c6e228b902d864ecb594b9d219"
+ dependencies:
+ tmp "0.0.28"
+
+cardinal@^0.5.0:
+ version "0.5.0"
+ resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-0.5.0.tgz#00d5f661dbd4aabfdf7d41ce48a5a59bca35a291"
+ dependencies:
+ ansicolors "~0.2.1"
+ redeyed "~0.5.0"
+
+caseless@~0.11.0:
+ version "0.11.0"
+ resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+
+center-align@^0.1.1:
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+ dependencies:
+ align-text "^0.1.3"
+ lazy-cache "^1.0.3"
+
+chalk@1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.0.tgz#09b453cec497a75520e4a60ae48214a8700e0921"
+ dependencies:
+ ansi-styles "^2.1.0"
+ escape-string-regexp "^1.0.2"
+ has-ansi "^2.0.0"
+ strip-ansi "^3.0.0"
+ supports-color "^2.0.0"
+
+chalk@^0.5.1:
+ version "0.5.1"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
+ dependencies:
+ ansi-styles "^1.1.0"
+ escape-string-regexp "^1.0.0"
+ has-ansi "^0.1.0"
+ strip-ansi "^0.3.0"
+ supports-color "^0.2.0"
+
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+ dependencies:
+ ansi-styles "^2.2.1"
+ escape-string-regexp "^1.0.2"
+ has-ansi "^2.0.0"
+ strip-ansi "^3.0.0"
+ supports-color "^2.0.0"
+
+chalk@~0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+ dependencies:
+ ansi-styles "~1.0.0"
+ has-color "~0.1.0"
+ strip-ansi "~0.1.0"
+
+char-spinner@~1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/char-spinner/-/char-spinner-1.0.1.tgz#e6ea67bd247e107112983b7ab0479ed362800081"
+
+charm@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
+ dependencies:
+ inherits "^2.0.1"
+
+chmodr@~1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/chmodr/-/chmodr-1.0.2.tgz#04662b932d0f02ec66deaa2b0ea42811968e3eb9"
+
+chownr@^1.0.1, chownr@~1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+
+clean-base-url@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/clean-base-url/-/clean-base-url-1.0.0.tgz#c901cf0a20b972435b0eccd52d056824a4351b7b"
+
+clean-css@^2.2.1:
+ version "2.2.23"
+ resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-2.2.23.tgz#0590b5478b516c4903edc2d89bd3fdbdd286328c"
+ dependencies:
+ commander "2.2.x"
+
+cli-color@~0.3.2:
+ version "0.3.3"
+ resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-0.3.3.tgz#12d5bdd158ff8a0b0db401198913c03df069f6f5"
+ dependencies:
+ d "~0.1.1"
+ es5-ext "~0.10.6"
+ memoizee "~0.3.8"
+ timers-ext "0.1"
+
+cli-table@^0.3.1:
+ version "0.3.1"
+ resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
+ dependencies:
+ colors "1.0.3"
+
+cli@~1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/cli/-/cli-1.0.1.tgz#22817534f24bfa4950c34d532d48ecbc621b8c14"
+ dependencies:
+ exit "0.1.2"
+ glob "^7.1.1"
+
+cliui@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+ dependencies:
+ center-align "^0.1.1"
+ right-align "^0.1.1"
+ wordwrap "0.0.2"
+
+clone@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
+
+clone@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+
+cmd-shim@~2.0.1:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
+ dependencies:
+ graceful-fs "^4.1.2"
+ mkdirp "~0.5.0"
+
+colors@1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+
+colors@~0.6.0-1:
+ version "0.6.2"
+ resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc"
+
+columnify@~1.5.2:
+ version "1.5.4"
+ resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+ dependencies:
+ strip-ansi "^3.0.0"
+ wcwidth "^1.0.0"
+
+combined-stream@^1.0.5, combined-stream@~1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
+ dependencies:
+ delayed-stream "~1.0.0"
+
+commander@2.2.x:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.2.0.tgz#175ad4b9317f3ff615f201c1e57224f55a3e91df"
+
+commander@^2.5.0, commander@^2.6.0, commander@^2.9.0:
+ version "2.9.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+ dependencies:
+ graceful-readlink ">= 1.0.0"
+
+commander@~2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781"
+
+commoner@~0.10.3:
+ version "0.10.8"
+ resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5"
+ dependencies:
+ commander "^2.5.0"
+ detective "^4.3.1"
+ glob "^5.0.15"
+ graceful-fs "^4.1.2"
+ iconv-lite "^0.4.5"
+ mkdirp "^0.5.0"
+ private "^0.1.6"
+ q "^1.1.2"
+ recast "^0.11.17"
+
+component-bind@1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+
+component-emitter@1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3"
+
+component-inherit@0.0.3:
+ version "0.0.3"
+ resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+
+compressible@~2.0.8:
+ version "2.0.10"
+ resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd"
+ dependencies:
+ mime-db ">= 1.27.0 < 2"
+
+compression@^1.4.4:
+ version "1.6.2"
+ resolved "https://registry.yarnpkg.com/compression/-/compression-1.6.2.tgz#cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"
+ dependencies:
+ accepts "~1.3.3"
+ bytes "2.3.0"
+ compressible "~2.0.8"
+ debug "~2.2.0"
+ on-headers "~1.0.1"
+ vary "~1.1.0"
+
+concat-map@0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+concat-stream@1.5.0, concat-stream@^1.4.6:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611"
+ dependencies:
+ inherits "~2.0.1"
+ readable-stream "~2.0.0"
+ typedarray "~0.0.5"
+
+config-chain@~1.1.9:
+ version "1.1.11"
+ resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
+ dependencies:
+ ini "^1.3.4"
+ proto-list "~1.2.1"
+
+configstore@1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/configstore/-/configstore-1.2.1.tgz#00ad402c0dba027bd8b4b7228dc7d42cefe3c81a"
+ dependencies:
+ graceful-fs "^4.1.2"
+ mkdirp "^0.5.0"
+ object-assign "^3.0.0"
+ os-tmpdir "^1.0.0"
+ osenv "^0.1.0"
+ uuid "^2.0.1"
+ write-file-atomic "^1.1.2"
+ xdg-basedir "^2.0.0"
+
+connect@^3.3.3:
+ version "3.6.1"
+ resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.1.tgz#b7760693a74f0454face1d9378edb3f885b43227"
+ dependencies:
+ debug "2.6.3"
+ finalhandler "1.0.1"
+ parseurl "~1.3.1"
+ utils-merge "1.0.0"
+
+console-browserify@1.1.x:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+ dependencies:
+ date-now "^0.1.4"
+
+consolidate@^0.13.1:
+ version "0.13.1"
+ resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.13.1.tgz#9e9503568eb4850889da6ed87a852c8dd2d13f64"
+ dependencies:
+ bluebird "^2.9.26"
+
+content-disposition@0.5.2:
+ version "0.5.2"
+ resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+
+content-type@~1.0.1, content-type@~1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
+
+convert-source-map@^1.1.0:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
+
+cookie-signature@1.0.6:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+
+cookie@0.3.1:
+ version "0.3.1"
+ resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+
+copy-dereference@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/copy-dereference/-/copy-dereference-1.0.0.tgz#6b131865420fd81b413ba994b44d3655311152b6"
+
+core-js@^1.0.0:
+ version "1.2.7"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+
+core-object@0.0.2:
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/core-object/-/core-object-0.0.2.tgz#c9a6fee8f712e281fa9f6fba10243409ea2debc3"
+ dependencies:
+ lodash-node "^2.4.1"
+
+core-util-is@~1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+cpr@0.4.2:
+ version "0.4.2"
+ resolved "https://registry.yarnpkg.com/cpr/-/cpr-0.4.2.tgz#cc5083e6d2fa31f52bbfeefae508a445fe6180f2"
+ dependencies:
+ graceful-fs "~4.1.2"
+ mkdirp "~0.5.0"
+ rimraf "~2.4.3"
+
+cross-spawn-async@^2.0.0:
+ version "2.2.5"
+ resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
+ dependencies:
+ lru-cache "^4.0.0"
+ which "^1.2.8"
+
+cryptiles@2.x.x:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+ dependencies:
+ boom "2.x.x"
+
+ctype@0.5.3:
+ version "0.5.3"
+ resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f"
+
+d@1:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+ dependencies:
+ es5-ext "^0.10.9"
+
+d@~0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309"
+ dependencies:
+ es5-ext "~0.10.2"
+
+dashdash@^1.12.0:
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+ dependencies:
+ assert-plus "^1.0.0"
+
+date-now@^0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+
+debug@0.7.4:
+ version "0.7.4"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
+
+debug@1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-1.0.2.tgz#3849591c10cce648476c3c7c2e2e3416db5963c4"
+ dependencies:
+ ms "0.6.2"
+
+debug@1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-1.0.3.tgz#fc8c6b2d6002804b4081c0208e0f6460ba1fa3e4"
+ dependencies:
+ ms "0.6.2"
+
+debug@1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-1.0.4.tgz#5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"
+ dependencies:
+ ms "0.6.2"
+
+debug@2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-2.1.0.tgz#33ab915659d8c2cc8a41443d94d6ebd37697ed21"
+ dependencies:
+ ms "0.6.2"
+
+debug@2.6.1:
+ version "2.6.1"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351"
+ dependencies:
+ ms "0.7.2"
+
+debug@2.6.3:
+ version "2.6.3"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
+ dependencies:
+ ms "0.7.2"
+
+debug@2.6.4, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.4.0:
+ version "2.6.4"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.4.tgz#7586a9b3c39741c0282ae33445c4e8ac74734fe0"
+ dependencies:
+ ms "0.7.3"
+
+debug@~2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+ dependencies:
+ ms "0.7.1"
+
+debuglog@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+
+decamelize@^1.0.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+
+defaults@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+ dependencies:
+ clone "^1.0.2"
+
+defined@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+
+defs@~1.1.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/defs/-/defs-1.1.1.tgz#b22609f2c7a11ba7a3db116805c139b1caffa9d2"
+ dependencies:
+ alter "~0.2.0"
+ ast-traverse "~0.1.1"
+ breakable "~1.0.0"
+ esprima-fb "~15001.1001.0-dev-harmony-fb"
+ simple-fmt "~0.1.0"
+ simple-is "~0.2.0"
+ stringmap "~0.2.2"
+ stringset "~0.2.1"
+ tryor "~0.1.2"
+ yargs "~3.27.0"
+
+delayed-stream@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+delegates@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+
+depd@1.1.0, depd@~1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
+
+destroy@~1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+
+detect-indent@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-3.0.1.tgz#9dc5e5ddbceef8325764b9451b02bc6d54084f75"
+ dependencies:
+ get-stdin "^4.0.1"
+ minimist "^1.1.0"
+ repeating "^1.1.0"
+
+detective@^4.3.1:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/detective/-/detective-4.5.0.tgz#6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1"
+ dependencies:
+ acorn "^4.0.3"
+ defined "^1.0.0"
+
+dezalgo@^1.0.0, dezalgo@^1.0.1, dezalgo@^1.0.2, dezalgo@~1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+ dependencies:
+ asap "^2.0.0"
+ wrappy "1"
+
+did_it_work@0.0.6:
+ version "0.0.6"
+ resolved "https://registry.yarnpkg.com/did_it_work/-/did_it_work-0.0.6.tgz#5180cb9e16ebf9a8753a0cc6b4af9ccdff71ec05"
+
+diff@^1.3.1:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
+
+dom-serializer@0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+ dependencies:
+ domelementtype "~1.1.1"
+ entities "~1.1.1"
+
+domelementtype@1:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+
+domelementtype@~1.1.1:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+
+domhandler@2.3:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
+ dependencies:
+ domelementtype "1"
+
+domutils@1.5:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+ dependencies:
+ dom-serializer "0"
+ domelementtype "1"
+
+ecc-jsbn@~0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+ dependencies:
+ jsbn "~0.1.0"
+
+editions@^1.1.1:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.3.tgz#0907101bdda20fac3cbe334c27cbd0688dc99a5b"
+
+editor@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/editor/-/editor-1.0.0.tgz#60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"
+
+ee-first@1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+
+em-helpers@^0.8.0:
+ version "0.8.0"
+ resolved "https://registry.yarnpkg.com/em-helpers/-/em-helpers-0.8.0.tgz#01678f3692a61d563cce68e49459e206d14db095"
+ dependencies:
+ ember-cli-htmlbars "^1.0.1"
+ ember-cli-less "^1.4.0"
+ source-map "^0.5.6"
+ optionalDependencies:
+ phantomjs-prebuilt "2.1.13"
+
+em-table@^0.7.0:
+ version "0.7.2"
+ resolved "https://registry.yarnpkg.com/em-table/-/em-table-0.7.2.tgz#867ff734701df9765f2505e02acd74768edb0f71"
+ dependencies:
+ ember-cli-htmlbars "^1.0.1"
+ ember-cli-less "^1.4.0"
+ source-map "^0.5.6"
+ optionalDependencies:
+ phantomjs-prebuilt "2.1.13"
+
+ember-array-contains-helper@1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/ember-array-contains-helper/-/ember-array-contains-helper-1.0.2.tgz#53427e6e9dfcfceb443bfeb6965928b5f624f6a0"
+ dependencies:
+ ember-cli-babel "^5.1.5"
+
+ember-bootstrap@0.5.1:
+ version "0.5.1"
+ resolved "https://registry.yarnpkg.com/ember-bootstrap/-/ember-bootstrap-0.5.1.tgz#bbad60b2818c47b3fb31562967ae02ee7e92d38c"
+ dependencies:
+ ember-cli-babel "^5.0.0"
+ ember-wormhole "^0.3.4"
+
+ember-cli-app-version@1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-1.0.0.tgz#6963591abb3a176f68ab1507f41324e8154d0e66"
+ dependencies:
+ ember-cli-babel "^5.0.0"
+ ember-cli-htmlbars "^1.0.0"
+ git-repo-version "0.3.0"
+
+ember-cli-babel@5.1.6, ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6:
+ version "5.1.6"
+ resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.1.6.tgz#d3e4fe59d96589adf7db1d99ff4f6b9dfa9dc132"
+ dependencies:
+ broccoli-babel-transpiler "^5.4.5"
+ broccoli-funnel "^1.0.0"
+ clone "^1.0.2"
+ ember-cli-version-checker "^1.0.2"
+ resolve "^1.1.2"
+
+ember-cli-content-security-policy@0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-content-security-policy/-/ember-cli-content-security-policy-0.4.0.tgz#71e4f228e68bcefc313f0ffae26f3600a0093276"
+ dependencies:
+ body-parser "^1.2.0"
+
+ember-cli-copy-dereference@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-copy-dereference/-/ember-cli-copy-dereference-1.0.0.tgz#a1795bf6c70650317df4ab8674dd02e0bea5d4fd"
+
+ember-cli-dependency-checker@1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-1.2.0.tgz#0d1d4fc93a48d9a105fbb120d262d05485dd7425"
+ dependencies:
+ chalk "^0.5.1"
+ is-git-url "0.2.0"
+ semver "^4.1.0"
+
+ember-cli-get-dependency-depth@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-get-dependency-depth/-/ember-cli-get-dependency-depth-1.0.0.tgz#e0afecf82a2d52f00f28ab468295281aec368d11"
+
+ember-cli-htmlbars-inline-precompile@0.3.1:
+ version "0.3.1"
+ resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-0.3.1.tgz#5e37101d7017c61ae11b721ee709ae0c1802ce59"
+ dependencies:
+ babel-plugin-htmlbars-inline-precompile "0.0.5"
+ ember-cli-babel "^5.1.3"
+ ember-cli-htmlbars "^1.0.0"
+
+ember-cli-htmlbars@0.7.6:
+ version "0.7.6"
+ resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-0.7.6.tgz#07e068eea68133d7e2fa6b505d87673f4bce145f"
+ dependencies:
+ broccoli-filter "^0.1.6"
+ ember-cli-version-checker "^1.0.2"
+
+ember-cli-htmlbars@1.0.2, ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.0.2.tgz#53b3e503ed3aaccb8c23592f292bc2e10ae467a1"
+ dependencies:
+ broccoli-persistent-filter "^1.0.3"
+ ember-cli-version-checker "^1.0.2"
+ json-stable-stringify "^1.0.0"
+ strip-bom "^2.0.0"
+
+ember-cli-ic-ajax@0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/ember-cli-ic-ajax/-/ember-cli-ic-ajax-0.2.1.tgz#0dd9a2c9f9d16f4da98ade15fef427ee63cf8710"
+ dependencies:
+ ic-ajax "~2.0.1"
+
+ember-cli-inject-live-reload@1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-1.4.0.tgz#1dac5b4a2fecc51cea3c17bce9089596115a7fbd"
+
+ember-cli-is-package-missing@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-is-package-missing/-/ember-cli-is-package-missing-1.0.0.tgz#6e6184cafb92635dd93ca6c946b104292d4e3390"
+
+ember-cli-jquery-ui@0.0.20:
+ version "0.0.20"
+ resolved "https://registry.yarnpkg.com/ember-cli-jquery-ui/-/ember-cli-jquery-ui-0.0.20.tgz#c9949a18c5dc3c650ad9ab6bd8ac107cddf15a40"
+ dependencies:
+ ember-cli-babel "^5.0.0"
+ ember-cli-htmlbars "0.7.6"
+
+ember-cli-less@^1.4.0:
+ version "1.5.4"
+ resolved "https://registry.yarnpkg.com/ember-cli-less/-/ember-cli-less-1.5.4.tgz#4cfbc05c6f23712fe9665f93be9bc8f2cccb0f71"
+ dependencies:
+ broccoli-less-single "^0.6.4"
+ broccoli-merge-trees "^1.0.0"
+ ember-cli-version-checker "^1.1.4"
+ lodash.merge "^3.3.2"
+
+ember-cli-moment-shim@0.7.3:
+ version "0.7.3"
+ resolved "https://registry.yarnpkg.com/ember-cli-moment-shim/-/ember-cli-moment-shim-0.7.3.tgz#bb4f6a36ad726acb9e432b0c73270cf1cd193973"
+ dependencies:
+ broccoli-funnel "^1.0.0"
+ broccoli-merge-trees "^1.0.0"
+ broccoli-stew "^1.0.0"
+ chalk "^1.1.1"
+ ember-cli-babel "^5.0.0"
+ exists-sync "0.0.3"
+ lodash.defaults "^3.1.2"
+
+ember-cli-node-assets@^0.1.4:
+ version "0.1.6"
+ resolved "https://registry.yarnpkg.com/ember-cli-node-assets/-/ember-cli-node-assets-0.1.6.tgz#6488a2949048c801ad6d9e33753c7bce32fc1146"
+ dependencies:
+ broccoli-funnel "^1.0.1"
+ broccoli-merge-trees "^1.1.1"
+ broccoli-unwatched-tree "^0.1.1"
+ debug "^2.2.0"
+ lodash "^4.5.1"
+ resolve "^1.1.7"
+
+ember-cli-normalize-entity-name@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz#0b14f7bcbc599aa117b5fddc81e4fd03c4bad5b7"
+ dependencies:
+ silent-error "^1.0.0"
+
+ember-cli-numeral@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-numeral/-/ember-cli-numeral-0.2.0.tgz#60c984aa9e8b97bf79ded777104848935796528a"
+ dependencies:
+ ember-cli-node-assets "^0.1.4"
+ numeral "^1.5.3"
+
+ember-cli-path-utils@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-path-utils/-/ember-cli-path-utils-1.0.0.tgz#4e39af8b55301cddc5017739b77a804fba2071ed"
+
+ember-cli-preprocess-registry@^1.0.3:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-preprocess-registry/-/ember-cli-preprocess-registry-1.1.0.tgz#1a8f848876de2851507842e4c0c9051f62b4aac6"
+ dependencies:
+ broccoli-clean-css "0.2.0"
+ broccoli-funnel "^1.0.0"
+ broccoli-merge-trees "^1.0.0"
+ debug "^2.2.0"
+ exists-sync "0.0.3"
+ lodash "^3.10.0"
+ process-relative-require "^1.0.0"
+ silent-error "^1.0.0"
+
+ember-cli-qunit@1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-1.2.1.tgz#b728bc72ced1b4991d1044eb906b88dbfb019abe"
+ dependencies:
+ broccoli-babel-transpiler "^5.5.0"
+ broccoli-jshint "^1.0.0"
+ broccoli-merge-trees "^1.1.0"
+ broccoli-sourcemap-concat "^1.1.6"
+ ember-cli-version-checker "^1.1.4"
+ ember-qunit "^0.4.18"
+ qunitjs "^1.20.0"
+ resolve "^1.1.6"
+
+ember-cli-release@0.2.8:
+ version "0.2.8"
+ resolved "https://registry.yarnpkg.com/ember-cli-release/-/ember-cli-release-0.2.8.tgz#e9fddd06058c0f3bc2ea57ab2667e9611f8fb205"
+ dependencies:
+ chalk "^1.0.0"
+ git-tools "^0.1.4"
+ make-array "^0.1.2"
+ merge "^1.2.0"
+ moment-timezone "^0.3.0"
+ nopt "^3.0.3"
+ rsvp "^3.0.17"
+ semver "^4.3.1"
+ silent-error "^1.0.0"
+
+ember-cli-sri@1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/ember-cli-sri/-/ember-cli-sri-1.2.1.tgz#105b1f8bfb88fff8817caa14d0776ecb06f857ee"
+ dependencies:
+ broccoli-sri-hash "^1.2.2"
+
+ember-cli-string-utils@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
+
+ember-cli-test-info@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-test-info/-/ember-cli-test-info-1.0.0.tgz#ed4e960f249e97523cf891e4aed2072ce84577b4"
+ dependencies:
+ ember-cli-string-utils "^1.0.0"
+
+ember-cli-uglify@1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-1.2.0.tgz#3208c32b54bc2783056e8bb0d5cfe9bbaf17ffb2"
+ dependencies:
+ broccoli-uglify-sourcemap "^1.0.0"
+
+ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz#0bc2d134c830142da64bf9627a0eded10b61ae72"
+ dependencies:
+ semver "^5.3.0"
+
+ember-cli@1.13.14:
+ version "1.13.14"
+ resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-1.13.14.tgz#1ff35577a0b4fbb8efad24710f52bb7b874a7765"
+ dependencies:
+ amd-name-resolver "0.0.2"
+ bower "^1.3.12"
+ bower-config "0.6.1"
+ bower-endpoint-parser "0.2.2"
+ broccoli "0.16.8"
+ broccoli-babel-transpiler "^5.4.5"
+ broccoli-config-loader "^1.0.0"
+ broccoli-config-replace "^1.1.0"
+ broccoli-funnel "^1.0.0"
+ broccoli-kitchen-sink-helpers "^0.2.7"
+ broccoli-merge-trees "^1.0.0"
+ broccoli-plugin "^1.2.0"
+ broccoli-sane-watcher "^1.1.1"
+ broccoli-source "^1.1.0"
+ broccoli-sourcemap-concat "^2.0.2"
+ broccoli-viz "^2.0.1"
+ chalk "1.1.0"
+ clean-base-url "^1.0.0"
+ compression "^1.4.4"
+ configstore "1.2.1"
+ core-object "0.0.2"
+ cpr "0.4.2"
+ debug "^2.1.3"
+ diff "^1.3.1"
+ ember-cli-copy-dereference "^1.0.0"
+ ember-cli-get-dependency-depth "^1.0.0"
+ ember-cli-is-package-missing "^1.0.0"
+ ember-cli-normalize-entity-name "^1.0.0"
+ ember-cli-path-utils "^1.0.0"
+ ember-cli-preprocess-registry "^1.0.3"
+ ember-cli-string-utils "^1.0.0"
+ ember-cli-test-info "^1.0.0"
+ ember-router-generator "^1.0.0"
+ escape-string-regexp "^1.0.3"
+ exists-sync "0.0.3"
+ exit "^0.1.2"
+ express "^4.12.3"
+ findup "0.1.5"
+ findup-sync "^0.2.1"
+ fs-extra "0.22.1"
+ fs-monitor-stack "^1.0.2"
+ git-repo-info "^1.0.4"
+ glob "5.0.13"
+ http-proxy "^1.9.0"
+ inflection "^1.7.0"
+ inquirer "0.5.1"
+ is-git-url "^0.2.0"
+ isbinaryfile "^2.0.3"
+ leek "0.0.18"
+ lodash "^3.6.0"
+ markdown-it "4.3.0"
+ markdown-it-terminal "0.0.2"
+ merge-defaults "^0.2.1"
+ minimatch "^2.0.4"
+ morgan "^1.5.2"
+ node-modules-path "^1.0.0"
+ node-uuid "^1.4.3"
+ nopt "^3.0.1"
+ npm "2.14.10"
+ pleasant-progress "^1.0.2"
+ portfinder "^0.4.0"
+ promise-map-series "^0.2.1"
+ quick-temp "0.1.3"
+ readline2 "0.1.1"
+ resolve "^1.1.6"
+ rsvp "^3.0.17"
+ sane "^1.1.1"
+ semver "^4.3.3"
+ silent-error "^1.0.0"
+ symlink-or-copy "^1.0.1"
+ temp "0.8.1"
+ testem "0.9.11"
+ through "^2.3.6"
+ tiny-lr "0.2.0"
+ walk-sync "0.1.3"
+ yam "0.0.18"
+
+ember-d3@0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/ember-d3/-/ember-d3-0.1.0.tgz#f670809632298b3f7124c398ea48f1d7503ef1e1"
+ dependencies:
+ ember-cli-babel "^5.0.0"
+
+ember-data@2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.1.0.tgz#9aa0f95042010513250818119d63ace3888c7dd9"
+ dependencies:
+ rsvp "^3.0.18"
+
+ember-disable-proxy-controllers@1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/ember-disable-proxy-controllers/-/ember-disable-proxy-controllers-1.0.1.tgz#1254eeec0ba025c24eb9e8da611afa7b38754281"
+ dependencies:
+ ember-cli-babel "^5.0.0"
+
+ember-export-application-global@1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-1.0.5.tgz#73bd641b19e3474190f717c9b504617511506bea"
+
+ember-qunit@^0.4.18:
+ version "0.4.24"
+ resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-0.4.24.tgz#b54cf6688c442d07eacea47c3285879cdd7c2163"
+ dependencies:
+ ember-test-helpers "^0.5.32"
+
+ember-resolver@2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-2.0.3.tgz#7ed5cc60049906def4edc80c25eedb301cace3b2"
+ dependencies:
+ ember-cli-babel "^5.1.3"
+ ember-cli-version-checker "^1.1.4"
+
+ember-router-generator@^1.0.0:
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-1.2.3.tgz#8ed2ca86ff323363120fc14278191e9e8f1315ee"
+ dependencies:
+ recast "^0.11.3"
+
+ember-spin-spinner@0.2.3:
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/ember-spin-spinner/-/ember-spin-spinner-0.2.3.tgz#932c7823686f33274fc4daf08557fcb18037e876"
+ dependencies:
+ ember-cli-babel "^5.0.0"
+
+ember-test-helpers@^0.5.32:
+ version "0.5.34"
+ resolved "https://registry.yarnpkg.com/ember-test-helpers/-/ember-test-helpers-0.5.34.tgz#c8439108d1cba1d7d838c212208a5c4061471b83"
+ dependencies:
+ klassy "^0.1.3"
+
+ember-truth-helpers@1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-1.3.0.tgz#6ed9f83ce9a49f52bb416d55e227426339a64c60"
+ dependencies:
+ ember-cli-babel "^5.1.6"
+
+ember-wormhole@^0.3.4:
+ version "0.3.6"
+ resolved "https://registry.yarnpkg.com/ember-wormhole/-/ember-wormhole-0.3.6.tgz#bbe21bb5478ad254efe4fff4019ac6710f4ad85c"
+ dependencies:
+ ember-cli-babel "^5.0.0"
+
+encodeurl@~1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
+
+engine.io-client-pure@1.5.9:
+ version "1.5.9"
+ resolved "https://registry.yarnpkg.com/engine.io-client-pure/-/engine.io-client-pure-1.5.9.tgz#fc3c4977b00ffc5b059dfa73c06216ad838496e2"
+ dependencies:
+ component-emitter "1.1.2"
+ component-inherit "0.0.3"
+ debug "1.0.4"
+ engine.io-parser "1.2.2"
+ has-cors "1.1.0"
+ indexof "0.0.1"
+ parsejson "0.0.1"
+ parseqs "0.0.2"
+ parseuri "0.0.4"
+ ws-pure "0.8.0"
+ xmlhttprequest-ssl "1.5.1"
+
+engine.io-parser@1.2.2:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.2.2.tgz#cd081041feea39c64323ff79b82a90a72afcccdd"
+ dependencies:
+ after "0.8.1"
+ arraybuffer.slice "0.0.6"
+ base64-arraybuffer "0.1.2"
+ blob "0.0.4"
+ has-binary "0.1.6"
+ utf8 "2.1.0"
+
+engine.io-pure@1.5.9:
+ version "1.5.9"
+ resolved "https://registry.yarnpkg.com/engine.io-pure/-/engine.io-pure-1.5.9.tgz#d46f763e0945e5f818d6a59061bf93f1e05c89b6"
+ dependencies:
+ base64id "0.1.0"
+ debug "1.0.3"
+ engine.io-parser "1.2.2"
+ ws-pure "0.8.0"
+
+ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz#a65b3e42d0b71cfc585eb774f9943c8d9b91b0c2"
+
+entities@1.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26"
+
+entities@~1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+
+errno@^0.1.1:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
+ dependencies:
+ prr "~0.0.0"
+
+es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.11, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.5, es5-ext@~0.10.6:
+ version "0.10.15"
+ resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.15.tgz#c330a5934c1ee21284a7c081a86e5fd937c91ea6"
+ dependencies:
+ es6-iterator "2"
+ es6-symbol "~3.1"
+
+es6-iterator@2:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
+ dependencies:
+ d "1"
+ es5-ext "^0.10.14"
+ es6-symbol "^3.1"
+
+es6-iterator@~0.1.3:
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-0.1.3.tgz#d6f58b8c4fc413c249b4baa19768f8e4d7c8944e"
+ dependencies:
+ d "~0.1.1"
+ es5-ext "~0.10.5"
+ es6-symbol "~2.0.1"
+
+es6-promise@~4.0.3:
+ version "4.0.5"
+ resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42"
+
+es6-symbol@^3.0.2, es6-symbol@^3.1, es6-symbol@~3.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+ dependencies:
+ d "1"
+ es5-ext "~0.10.14"
+
+es6-symbol@~2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-2.0.1.tgz#761b5c67cfd4f1d18afb234f691d678682cb3bf3"
+ dependencies:
+ d "~0.1.1"
+ es5-ext "~0.10.5"
+
+es6-weak-map@~0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-0.1.4.tgz#706cef9e99aa236ba7766c239c8b9e286ea7d228"
+ dependencies:
+ d "~0.1.1"
+ es5-ext "~0.10.6"
+ es6-iterator "~0.1.3"
+ es6-symbol "~2.0.1"
+
+escape-html@~1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+
+escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+esprima-fb@~12001.1.0-dev-harmony-fb:
+ version "12001.1.0-dev-harmony-fb"
+ resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz#d84400384ba95ce2678c617ad24a7f40808da915"
+
+esprima-fb@~15001.1001.0-dev-harmony-fb:
+ version "15001.1001.0-dev-harmony-fb"
+ resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz#43beb57ec26e8cf237d3dd8b33e42533577f2659"
+
+esprima@^2.6.0:
+ version "2.7.3"
+ resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+
+esprima@^3.1.1, esprima@~3.1.0:
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
+esutils@^2.0.0:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+
+etag@~1.8.0:
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.0.tgz#6f631aef336d6c46362b51764044ce216be3c051"
+
+event-emitter@~0.3.4:
+ version "0.3.5"
+ resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+ dependencies:
+ d "1"
+ es5-ext "~0.10.14"
+
+eventemitter3@1.x.x:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
+
+events-to-array@^1.0.1:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.1.2.tgz#2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6"
+
+exec-sh@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.0.tgz#14f75de3f20d286ef933099b2ce50a90359cef10"
+ dependencies:
+ merge "^1.1.3"
+
+exists-sync@0.0.3:
+ version "0.0.3"
+ resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.3.tgz#b910000bedbb113b378b82f5f5a7638107622dcf"
+
+exit@0.1.2, exit@0.1.x, exit@^0.1.2:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+
+expand-brackets@^0.1.4:
+ version "0.1.5"
+ resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+ dependencies:
+ is-posix-bracket "^0.1.0"
+
+expand-range@^1.8.1:
+ version "1.8.2"
+ resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+ dependencies:
+ fill-range "^2.1.0"
+
+express@^4.10.7, express@^4.12.3:
+ version "4.15.2"
+ resolved "https://registry.yarnpkg.com/express/-/express-4.15.2.tgz#af107fc148504457f2dca9a6f2571d7129b97b35"
+ dependencies:
+ accepts "~1.3.3"
+ array-flatten "1.1.1"
+ content-disposition "0.5.2"
+ content-type "~1.0.2"
+ cookie "0.3.1"
+ cookie-signature "1.0.6"
+ debug "2.6.1"
+ depd "~1.1.0"
+ encodeurl "~1.0.1"
+ escape-html "~1.0.3"
+ etag "~1.8.0"
+ finalhandler "~1.0.0"
+ fresh "0.5.0"
+ merge-descriptors "1.0.1"
+ methods "~1.1.2"
+ on-finished "~2.3.0"
+ parseurl "~1.3.1"
+ path-to-regexp "0.1.7"
+ proxy-addr "~1.1.3"
+ qs "6.4.0"
+ range-parser "~1.2.0"
+ send "0.15.1"
+ serve-static "1.12.1"
+ setprototypeof "1.0.3"
+ statuses "~1.3.1"
+ type-is "~1.6.14"
+ utils-merge "1.0.0"
+ vary "~1.1.0"
+
+extend@~3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
+
+extglob@^0.3.1:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+ dependencies:
+ is-extglob "^1.0.0"
+
+extract-zip@~1.5.0:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.5.0.tgz#92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"
+ dependencies:
+ concat-stream "1.5.0"
+ debug "0.7.4"
+ mkdirp "0.5.0"
+ yauzl "2.4.1"
+
+extsprintf@1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
+
+fast-ordered-set@^1.0.0, fast-ordered-set@^1.0.2:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/fast-ordered-set/-/fast-ordered-set-1.0.3.tgz#3fbb36634f7be79e4f7edbdb4a357dee25d184eb"
+ dependencies:
+ blank-object "^1.0.1"
+
+"fast-sourcemap-concat@ ^0.2.4":
+ version "0.2.7"
+ resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-0.2.7.tgz#b5d68a6d33e52f9d326fec38b836fa44d9b0d8fc"
+ dependencies:
+ chalk "^0.5.1"
+ debug "^2.2.0"
+ mkdirp "^0.5.0"
+ rsvp "^3.0.14"
+ source-map "^0.4.2"
+ source-map-url "^0.3.0"
+
+faye-websocket@~0.10.0:
+ version "0.10.0"
+ resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+ dependencies:
+ websocket-driver ">=0.5.1"
+
+fb-watchman@^1.8.0:
+ version "1.9.2"
+ resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-1.9.2.tgz#a24cf47827f82d38fb59a69ad70b76e3b6ae7383"
+ dependencies:
+ bser "1.0.2"
+
+fd-slicer@~1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
+ dependencies:
+ pend "~1.2.0"
+
+filename-regex@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
+
+fileset@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/fileset/-/fileset-0.2.1.tgz#588ef8973c6623b2a76df465105696b96aac8067"
+ dependencies:
+ glob "5.x"
+ minimatch "2.x"
+
+fill-range@^2.1.0:
+ version "2.2.3"
+ resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+ dependencies:
+ is-number "^2.1.0"
+ isobject "^2.0.0"
+ randomatic "^1.1.3"
+ repeat-element "^1.1.2"
+ repeat-string "^1.5.2"
+
+finalhandler@1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.1.tgz#bcd15d1689c0e5ed729b6f7f541a6df984117db8"
+ dependencies:
+ debug "2.6.3"
+ encodeurl "~1.0.1"
+ escape-html "~1.0.3"
+ on-finished "~2.3.0"
+ parseurl "~1.3.1"
+ statuses "~1.3.1"
+ unpipe "~1.0.0"
+
+finalhandler@~1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.2.tgz#d0e36f9dbc557f2de14423df6261889e9d60c93a"
+ dependencies:
+ debug "2.6.4"
+ encodeurl "~1.0.1"
+ escape-html "~1.0.3"
+ on-finished "~2.3.0"
+ parseurl "~1.3.1"
+ statuses "~1.3.1"
+ unpipe "~1.0.0"
+
+findup-sync@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.2.1.tgz#e0a90a450075c49466ee513732057514b81e878c"
+ dependencies:
+ glob "~4.3.0"
+
+findup-sync@^0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16"
+ dependencies:
+ glob "~5.0.0"
+
+findup@0.1.5, findup@^0.1.5:
+ version "0.1.5"
+ resolved "https://registry.yarnpkg.com/findup/-/findup-0.1.5.tgz#8ad929a3393bac627957a7e5de4623b06b0e2ceb"
+ dependencies:
+ colors "~0.6.0-1"
+ commander "~2.1.0"
+
+fireworm@^0.6.6:
+ version "0.6.6"
+ resolved "https://registry.yarnpkg.com/fireworm/-/fireworm-0.6.6.tgz#6023218e215c8ae628ac5105a60e470a50983f6f"
+ dependencies:
+ async "~0.2.9"
+ is-type "0.0.1"
+ lodash "~2.3.0"
+ minimatch "~0.2.9"
+
+for-in@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+
+for-own@^0.1.4:
+ version "0.1.5"
+ resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+ dependencies:
+ for-in "^1.0.1"
+
+forever-agent@~0.6.1:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+
+form-data@~1.0.0-rc3, form-data@~1.0.0-rc4:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.1.tgz#ae315db9a4907fa065502304a66d7733475ee37c"
+ dependencies:
+ async "^2.0.1"
+ combined-stream "^1.0.5"
+ mime-types "^2.1.11"
+
+forwarded@~0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
+
+fresh@0.5.0:
+ version "0.5.0"
+ resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
+
+fs-extra@0.22.1:
+ version "0.22.1"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.22.1.tgz#5fd6f8049dc976ca19eb2355d658173cabcce056"
+ dependencies:
+ graceful-fs "^4.1.2"
+ jsonfile "^2.1.0"
+ rimraf "^2.2.8"
+
+fs-extra@^0.16.3:
+ version "0.16.5"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.16.5.tgz#1ad661fa6c86c9608cd1b49efc6fce834939a750"
+ dependencies:
+ graceful-fs "^3.0.5"
+ jsonfile "^2.0.0"
+ rimraf "^2.2.8"
+
+fs-extra@^0.24.0:
+ version "0.24.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
+ dependencies:
+ graceful-fs "^4.1.2"
+ jsonfile "^2.1.0"
+ path-is-absolute "^1.0.0"
+ rimraf "^2.2.8"
+
+fs-extra@^2.0.0:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35"
+ dependencies:
+ graceful-fs "^4.1.2"
+ jsonfile "^2.1.0"
+
+fs-extra@~0.30.0:
+ version "0.30.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
+ dependencies:
+ graceful-fs "^4.1.2"
+ jsonfile "^2.1.0"
+ klaw "^1.0.0"
+ path-is-absolute "^1.0.0"
+ rimraf "^2.2.8"
+
+fs-monitor-stack@^1.0.2:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/fs-monitor-stack/-/fs-monitor-stack-1.1.1.tgz#c4038d5977939b6b4e38396d7e7cd0895a7ac6b3"
+
+fs-readdir-recursive@^0.1.0:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz#315b4fb8c1ca5b8c47defef319d073dad3568059"
+
+fs-tree-diff@^0.3.0:
+ version "0.3.1"
+ resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.3.1.tgz#41a84ee34994bd564c63d9852f1109c5de7f9290"
+ dependencies:
+ debug "^2.2.0"
+ fast-ordered-set "^1.0.2"
+
+fs-tree-diff@^0.4.3:
+ version "0.4.4"
+ resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.4.4.tgz#f6b75d70db22c1f3b05d592270f4ed6c9c2f82dd"
+ dependencies:
+ debug "^2.2.0"
+ fast-ordered-set "^1.0.2"
+
+fs-tree-diff@^0.5.2:
+ version "0.5.6"
+ resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.6.tgz#342665749e8dca406800b672268c8f5073f3e623"
+ dependencies:
+ heimdalljs-logger "^0.1.7"
+ object-assign "^4.1.0"
+ path-posix "^1.0.0"
+ symlink-or-copy "^1.1.8"
+
+fs-vacuum@~1.2.7:
+ version "1.2.10"
+ resolved "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz#b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"
+ dependencies:
+ graceful-fs "^4.1.2"
+ path-is-inside "^1.0.1"
+ rimraf "^2.5.2"
+
+fs-write-stream-atomic@~1.0.4:
+ version "1.0.10"
+ resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+ dependencies:
+ graceful-fs "^4.1.2"
+ iferr "^0.1.5"
+ imurmurhash "^0.1.4"
+ readable-stream "1 || 2"
+
+fs.realpath@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+fstream-ignore@^1.0.0:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
+ dependencies:
+ fstream "^1.0.0"
+ inherits "2"
+ minimatch "^3.0.0"
+
+fstream-npm@~1.0.7:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/fstream-npm/-/fstream-npm-1.0.7.tgz#7ed0d1ac13d7686dd9e1bf6ceb8be273bf6d2f86"
+ dependencies:
+ fstream-ignore "^1.0.0"
+ inherits "2"
+
+fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.8:
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+ dependencies:
+ graceful-fs "^4.1.2"
+ inherits "~2.0.0"
+ mkdirp ">=0.5 0"
+ rimraf "2"
+
+gauge@~1.2.0, gauge@~1.2.5:
+ version "1.2.7"
+ resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"
+ dependencies:
+ ansi "^0.3.0"
+ has-unicode "^2.0.0"
+ lodash.pad "^4.1.0"
+ lodash.padend "^4.1.0"
+ lodash.padstart "^4.1.0"
+
+generate-function@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
+
+generate-object-property@^1.1.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+ dependencies:
+ is-property "^1.0.0"
+
+get-stdin@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+
+getpass@^0.1.1:
+ version "0.1.6"
+ resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
+ dependencies:
+ assert-plus "^1.0.0"
+
+git-repo-info@^1.0.4:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.4.1.tgz#2a072823254aaf62fcf0766007d7b6651bd41943"
+
+git-repo-version@0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/git-repo-version/-/git-repo-version-0.3.0.tgz#c9b97d0d21c4357d669dc1269c2b6a75da6cc0e9"
+ dependencies:
+ git-repo-info "^1.0.4"
+
+git-tools@^0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/git-tools/-/git-tools-0.1.4.tgz#5e43e59443b8a5dedb39dba663da49e79f943978"
+ dependencies:
+ spawnback "~1.0.0"
+
+github-url-from-git@~1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/github-url-from-git/-/github-url-from-git-1.4.0.tgz#285e6b520819001bde128674704379e4ff03e0de"
+
+github-url-from-username-repo@~1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz#7dd79330d2abe69c10c2cef79714c97215791dfa"
+
+glob-base@^0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+ dependencies:
+ glob-parent "^2.0.0"
+ is-glob "^2.0.0"
+
+glob-parent@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+ dependencies:
+ is-glob "^2.0.0"
+
+"glob@3 || 4", glob@~4.3.0:
+ version "4.3.5"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-4.3.5.tgz#80fbb08ca540f238acce5d11d1e9bc41e75173d3"
+ dependencies:
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^2.0.1"
+ once "^1.3.0"
+
+glob@5.0.13, glob@^5.0.10:
+ version "5.0.13"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.13.tgz#0b6ffc3ac64eb90669f723a00a0ebb7281b33f8f"
+ dependencies:
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^2.0.1"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
+glob@5.x, glob@^5.0.15, glob@~5.0.0, glob@~5.0.15:
+ version "5.0.15"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+ dependencies:
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "2 || 3"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
+glob@^6.0.1:
+ version "6.0.4"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+ dependencies:
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "2 || 3"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
+glob@^7.0.5, glob@^7.1.1:
+ version "7.1.1"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
+ dependencies:
+ fs.realpath "^1.0.0"
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^3.0.2"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
+globals@^6.4.0:
+ version "6.4.1"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-6.4.1.tgz#8498032b3b6d1cc81eebc5f79690d8fe29fabf4f"
+
+graceful-fs@^3.0.5:
+ version "3.0.11"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
+ dependencies:
+ natives "^1.1.0"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~4.1.2:
+ version "4.1.11"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+graceful-fs@~2.0.0:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-2.0.3.tgz#7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"
+
+"graceful-readlink@>= 1.0.0":
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+
+growl@^1.8.1:
+ version "1.9.2"
+ resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
+
+handlebars@^3.0.1:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-3.0.3.tgz#0e09651a2f0fb3c949160583710d551f92e6d2ad"
+ dependencies:
+ optimist "^0.6.1"
+ source-map "^0.1.40"
+ optionalDependencies:
+ uglify-js "~2.3"
+
+har-validator@~2.0.2, har-validator@~2.0.6:
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
+ dependencies:
+ chalk "^1.1.1"
+ commander "^2.9.0"
+ is-my-json-valid "^2.12.4"
+ pinkie-promise "^2.0.0"
+
+has-ansi@^0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
+ dependencies:
+ ansi-regex "^0.2.0"
+
+has-ansi@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+ dependencies:
+ ansi-regex "^2.0.0"
+
+has-binary-data@0.1.3:
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/has-binary-data/-/has-binary-data-0.1.3.tgz#8ebb18388b57f19a5231275a16fc18d51f379aae"
+ dependencies:
+ isarray "0.0.1"
+
+has-binary@0.1.6:
+ version "0.1.6"
+ resolved "https://registry.yarnpkg.com/has-binary/-/has-binary-0.1.6.tgz#25326f39cfa4f616ad8787894e3af2cfbc7b6e10"
+ dependencies:
+ isarray "0.0.1"
+
+has-color@~0.1.0:
+ version "0.1.7"
+ resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
+
+has-cors@1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+
+has-unicode@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+
+hash-for-dep@^1.0.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.1.2.tgz#e3347ed92960eb0bb53a2c6c2b70e36d75b7cd0c"
+ dependencies:
+ broccoli-kitchen-sink-helpers "^0.3.1"
+ heimdalljs "^0.2.3"
+ heimdalljs-logger "^0.1.7"
+ resolve "^1.1.6"
+
+hasha@~2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz#78d7cbfc1e6d66303fe79837365984517b2f6ee1"
+ dependencies:
+ is-stream "^1.0.1"
+ pinkie-promise "^2.0.0"
+
+hawk@~3.1.0, hawk@~3.1.3:
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+ dependencies:
+ boom "2.x.x"
+ cryptiles "2.x.x"
+ hoek "2.x.x"
+ sntp "1.x.x"
+
+heimdalljs-logger@^0.1.7:
+ version "0.1.9"
+ resolved "https://registry.yarnpkg.com/heimdalljs-logger/-/heimdalljs-logger-0.1.9.tgz#d76ada4e45b7bb6f786fc9c010a68eb2e2faf176"
+ dependencies:
+ debug "^2.2.0"
+ heimdalljs "^0.2.0"
+
+heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3:
+ version "0.2.4"
+ resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.2.4.tgz#34ead16eab422c94803065d33abeba1f7b24a910"
+ dependencies:
+ rsvp "~3.2.1"
+
+hoek@2.x.x:
+ version "2.16.3"
+ resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+
+home-or-tmp@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-1.0.
<TRUNCATED>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[06/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to fix
license. (Wangda Tan via Sunil G)
Posted by va...@apache.org.
YARN-4849. Addendum patch to fix license. (Wangda Tan via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/62aedbf4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/62aedbf4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/62aedbf4
Branch: refs/heads/YARN-3368_branch2
Commit: 62aedbf416e942ac9b5209d2d4a4c18ba16429fe
Parents: 4833621
Author: sunilg <su...@apache.org>
Authored: Wed Aug 24 16:28:34 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
LICENSE.txt | 84 ++++++++++++++++++++++++++++++++++----------------------
1 file changed, 51 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/62aedbf4/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 8f418af..04d2daa 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -2315,35 +2315,53 @@ jamon-runtime 2.3.1
Your choice of the MPL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.
-For Apache Hadoop YARN Web UI component: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/
----------------------------------------------------------------------
-The Apache Hadoop YARN Web UI component bundles the following files under the MIT License:
-
- - ember v2.2.0 (http://emberjs.com/) - Copyright (c) 2014 Yehuda Katz, Tom Dale and Ember.js contributors
- - ember-data v2.1.0 (https://github.com/emberjs/data) - Copyright (C) 2011-2014 Tilde, Inc. and contributors, Portions Copyright (C) 2011 LivingSocial Inc.
- - ember-resolver v2.0.3 (https://github.com/ember-cli/ember-resolver) - Copyright (c) 2013 Stefan Penner and Ember App Kit Contributors
- - bootstrap v3.3.6 (http://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
- - jquery v2.1.4 (http://jquery.org) - Copyright 2005, 2014 jQuery Foundation and other contributors
- - jquery-ui v1.11.4 (http://jqueryui.com/) - Copyright 2014 jQuery Foundation and other contributors
- - datatables v1.10.8 (https://datatables.net/)
- - moment v2.10.6 (http://momentjs.com/) - Copyright (c) 2011-2015 Tim Wood, Iskren Chernev, Moment.js contributors
- - em-helpers v0.5.8 (https://github.com/sreenaths/em-helpers)
- - ember-array-contains-helper v1.0.2 (https://github.com/bmeurant/ember-array-contains-helper)
- - ember-cli-app-version v0.5.8 (https://github.com/EmberSherpa/ember-cli-app-version) - Authored by Taras Mankovski <ta...@gmail.com>
- - ember-cli-babel v5.1.6 (https://github.com/babel/ember-cli-babel) - Authored by Stefan Penner <st...@gmail.com>
- - ember-cli-content-security-policy v0.4.0 (https://github.com/rwjblue/ember-cli-content-security-policy)
- - ember-cli-dependency-checker v1.2.0 (https://github.com/quaertym/ember-cli-dependency-checker) - Authored by Emre Unal
- - ember-cli-htmlbars v1.0.2 (https://github.com/ember-cli/ember-cli-htmlbars) - Authored by Robert Jackson <me...@rwjblue.com>
- - ember-cli-htmlbars-inline-precompile v0.3.1 (https://github.com/pangratz/ember-cli-htmlbars-inline-precompile) - Authored by Clemens Müller <cm...@gmail.com>
- - ember-cli-ic-ajax v0.2.1 (https://github.com/rwjblue/ember-cli-ic-ajax) - Authored by Robert Jackson <me...@rwjblue.com>
- - ember-cli-inject-live-reload v1.4.0 (https://github.com/rwjblue/ember-cli-inject-live-reload) - Authored by Robert Jackson <me...@rwjblue.com>
- - ember-cli-qunit v1.2.1 (https://github.com/ember-cli/ember-cli-qunit) - Authored by Robert Jackson <me...@rwjblue.com>
- - ember-cli-release v0.2.8 (https://github.com/lytics/ember-cli-release) - Authored by Robert Jackson <me...@rwjblue.com>
- - ember-cli-sri v1.2.1 (https://github.com/jonathanKingston/ember-cli-sri) - Authored by Jonathan Kingston
- - ember-cli-uglify v1.2.0 (github.com/ember-cli/ember-cli-uglify) - Authored by Robert Jackson <me...@rwjblue.com>
- - ember-d3 v0.1.0 (https://github.com/brzpegasus/ember-d3) - Authored by Estelle DeBlois
- - ember-truth-helpers v1.2.0 (https://github.com/jmurphyau/ember-truth-helpers)
- - select2 v4.0.0 (https://select2.github.io/)
+The binary distribution of this product bundles these dependencies under the
+following license:
+bootstrap v3.3.6
+broccoli-asset-rev v2.4.2
+broccoli-funnel v1.0.1
+datatables v1.10.8
+em-helpers v0.5.13
+em-table v0.1.6
+ember v2.2.0
+ember-array-contains-helper v1.0.2
+ember-bootstrap v0.5.1
+ember-cli v1.13.13
+ember-cli-app-version v1.0.0
+ember-cli-babel v5.1.6
+ember-cli-content-security-policy v0.4.0
+ember-cli-dependency-checker v1.2.0
+ember-cli-htmlbars v1.0.2
+ember-cli-htmlbars-inline-precompile v0.3.1
+ember-cli-ic-ajax v0.2.1
+ember-cli-inject-live-reload v1.4.0
+ember-cli-jquery-ui v0.0.20
+ember-cli-qunit v1.2.1
+ember-cli-release v0.2.8
+ember-cli-shims v0.0.6
+ember-cli-sri v1.2.1
+ember-cli-test-loader v0.2.1
+ember-cli-uglify v1.2.0
+ember-d3 v0.1.0
+ember-data v2.1.0
+ember-disable-proxy-controllers v1.0.1
+ember-export-application-global v1.0.5
+ember-load-initializers v0.1.7
+ember-qunit v0.4.16
+ember-qunit-notifications v0.1.0
+ember-resolver v2.0.3
+ember-spin-spinner v0.2.3
+ember-truth-helpers v1.2.0
+jquery v2.1.4
+jquery-ui v1.11.4
+loader.js v3.3.0
+momentjs v2.10.6
+qunit v1.19.0
+select2 v4.0.0
+snippet-ss v1.11.0
+spin.js v2.3.2
+-------------------------------------------------------------------------------
+The MIT License (MIT)
All rights reserved.
@@ -2364,12 +2382,12 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-----
-The Apache Hadoop YARN Web UI component bundles the following files under the BSD License:
+The binary distribution of this product bundles these dependencies under the
+following license:
+D3 v3.5.6
+--------------------------------------------------------------------------------
(3-clause BSD license)
- - D3 v3.5.6 (http://d3js.org/) - Copyright (c) 2010-2014, Michael Bostock
-
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[10/50] [abbrv] hadoop git commit: YARN-5503. [YARN-3368] Add missing
hidden files in webapp folder for deployment (Sreenath Somarajapuram via
Sunil G)
Posted by va...@apache.org.
YARN-5503. [YARN-3368] Add missing hidden files in webapp folder for deployment (Sreenath Somarajapuram via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dd8ad343
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd8ad343
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd8ad343
Branch: refs/heads/YARN-3368_branch2
Commit: dd8ad34305922ee8715281b3988a609c8ddc8ec4
Parents: 9e609b8
Author: sunilg <su...@apache.org>
Authored: Tue Aug 30 20:58:35 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
.../hadoop-yarn/hadoop-yarn-ui/pom.xml | 19 ++++++++++-
.../hadoop-yarn-ui/src/main/webapp/.bowerrc | 4 +++
.../src/main/webapp/.editorconfig | 34 ++++++++++++++++++++
.../hadoop-yarn-ui/src/main/webapp/.ember-cli | 9 ++++++
.../hadoop-yarn-ui/src/main/webapp/.jshintrc | 32 ++++++++++++++++++
.../src/main/webapp/.watchmanconfig | 3 ++
6 files changed, 100 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd8ad343/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 8162bdd..fcca48a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -30,7 +30,7 @@
<packaging>${packaging.type}</packaging>
<properties>
- <packaging.type>jar</packaging.type>
+ <packaging.type>war</packaging.type>
<webappDir>src/main/webapp</webappDir>
<node.executable>node</node.executable>
<nodeVersion>v0.12.2</nodeVersion>
@@ -52,9 +52,26 @@
<exclude>src/main/webapp/bower.json</exclude>
<exclude>src/main/webapp/package.json</exclude>
<exclude>src/main/webapp/testem.json</exclude>
+
+ <exclude>src/main/webapp/dist/**/*</exclude>
+ <exclude>src/main/webapp/tmp/**/*</exclude>
<exclude>src/main/webapp/public/assets/images/**/*</exclude>
+ <exclude>src/main/webapp/public/assets/images/*</exclude>
<exclude>src/main/webapp/public/robots.txt</exclude>
+
+ <exclude>public/assets/images/**/*</exclude>
<exclude>public/crossdomain.xml</exclude>
+
+ <exclude>src/main/webapp/.tmp/**/*</exclude>
+ <exclude>src/main/webapp/.bowerrc</exclude>
+ <exclude>src/main/webapp/.editorconfig</exclude>
+ <exclude>src/main/webapp/.ember-cli</exclude>
+ <exclude>src/main/webapp/.gitignore</exclude>
+ <exclude>src/main/webapp/.jshintrc</exclude>
+ <exclude>src/main/webapp/.travis.yml</exclude>
+ <exclude>src/main/webapp/.watchmanconfig</exclude>
+ <exclude>src/main/webapp/tests/.jshintrc</exclude>
+ <exclude>src/main/webapp/blueprints/.jshintrc</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd8ad343/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
new file mode 100644
index 0000000..959e169
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
@@ -0,0 +1,4 @@
+{
+ "directory": "bower_components",
+ "analytics": false
+}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd8ad343/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
new file mode 100644
index 0000000..47c5438
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
@@ -0,0 +1,34 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+insert_final_newline = false
+indent_style = space
+indent_size = 2
+
+[*.css]
+indent_style = space
+indent_size = 2
+
+[*.html]
+indent_style = space
+indent_size = 2
+
+[*.{diff,md}]
+trim_trailing_whitespace = false
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd8ad343/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli
new file mode 100644
index 0000000..ee64cfe
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli
@@ -0,0 +1,9 @@
+{
+ /**
+ Ember CLI sends analytics information by default. The data is completely
+ anonymous, but there are times when you might want to disable this behavior.
+
+ Setting `disableAnalytics` to true will prevent any data from being sent.
+ */
+ "disableAnalytics": false
+}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd8ad343/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
new file mode 100644
index 0000000..08096ef
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
@@ -0,0 +1,32 @@
+{
+ "predef": [
+ "document",
+ "window",
+ "-Promise"
+ ],
+ "browser": true,
+ "boss": true,
+ "curly": true,
+ "debug": false,
+ "devel": true,
+ "eqeqeq": true,
+ "evil": true,
+ "forin": false,
+ "immed": false,
+ "laxbreak": false,
+ "newcap": true,
+ "noarg": true,
+ "noempty": false,
+ "nonew": false,
+ "nomen": false,
+ "onevar": false,
+ "plusplus": false,
+ "regexp": false,
+ "undef": true,
+ "sub": true,
+ "strict": false,
+ "white": false,
+ "eqnull": true,
+ "esnext": true,
+ "unused": true
+}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd8ad343/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.watchmanconfig
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.watchmanconfig b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.watchmanconfig
new file mode 100644
index 0000000..e7834e3
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.watchmanconfig
@@ -0,0 +1,3 @@
+{
+ "ignore_dirs": ["tmp", "dist"]
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[20/50] [abbrv] hadoop git commit: YARN-5153. Add a toggle button to
switch between timeline view / table view for containers and
application-attempts in new YARN UI. Contributed by Akhil PB.
Posted by va...@apache.org.
YARN-5153. Add a toggle button to switch between timeline view / table view for containers and application-attempts in 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/bef6b2f0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bef6b2f0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bef6b2f0
Branch: refs/heads/YARN-3368_branch2
Commit: bef6b2f030c1b85025f5a09e9316aef95034fbcf
Parents: deef8d5
Author: Sunil G <su...@apache.org>
Authored: Mon Apr 10 13:35:08 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../webapp/app/components/app-attempt-table.js | 7 -
.../main/webapp/app/components/timeline-view.js | 199 ++++++++++++++++++-
.../main/webapp/app/helpers/prepend-protocol.js | 29 +++
.../templates/components/app-attempt-table.hbs | 36 ++--
.../templates/components/container-table.hbs | 22 +-
.../app/templates/components/timeline-view.hbs | 61 ++++--
.../tests/unit/helpers/prepend-protocol-test.js | 28 +++
7 files changed, 331 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef6b2f0/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 3c43037..8828275 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,11 +19,4 @@
import Ember from 'ember';
export default Ember.Component.extend({
- 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/bef6b2f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
----------------------------------------------------------------------
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 d730a43..4a33d5b 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
@@ -18,6 +18,7 @@
import Ember from 'ember';
import Converter from 'yarn-ui/utils/converter';
+import ColumnDef from 'em-table/utils/column-definition';
export default Ember.Component.extend({
canvas: {
@@ -31,6 +32,8 @@ export default Ember.Component.extend({
modelArr: [],
colors: d3.scale.category10().range(),
_selected: undefined,
+ gridColumns: [],
+ gridRows: [],
selected: function() {
return this._selected;
@@ -276,5 +279,199 @@ export default Ember.Component.extend({
if (this.modelArr.length > 0) {
this.setSelected(this.modelArr[0]);
}
+
+ if (this.get('attemptModel')) {
+ this.setAttemptsGridColumnsAndRows();
+ } else {
+ this.setContainersGridColumnsAndRows();
+ }
+ },
+
+ setAttemptsGridColumnsAndRows: function() {
+ var self = this;
+ var columns = [];
+
+ columns.push({
+ id: 'id',
+ headerTitle: 'Attempt ID',
+ contentPath: 'id',
+ cellComponentName: 'em-table-linked-cell',
+ minWidth: '300px',
+ getCellContent: function(row) {
+ return {
+ displayText: row.get('id'),
+ routeName: 'yarn-app-attempt',
+ id: row.get('id')
+ };
+ }
+ }, {
+ id: 'attemptStartedTime',
+ headerTitle: 'Started Time',
+ contentPath: 'attemptStartedTime'
+ }, {
+ id: 'finishedTime',
+ headerTitle: 'Finished Time',
+ contentPath: 'finishedTime',
+ getCellContent: function(row) {
+ if (row.get('finishedTs')) {
+ return row.get('finishedTime');
+ }
+ return 'N/A';
+ }
+ }, {
+ id: 'elapsedTime',
+ headerTitle: 'Elapsed Time',
+ contentPath: 'elapsedTime'
+ }, {
+ id: 'appMasterContainerId',
+ headerTitle: 'AM Container ID',
+ contentPath: 'appMasterContainerId',
+ minWidth: '300px'
+ }, {
+ id: 'amNodeId',
+ headerTitle: 'AM Node ID',
+ contentPath: 'amNodeId'
+ }, {
+ id: 'attemptState',
+ headerTitle: 'State',
+ contentPath: 'attemptState',
+ getCellContent: function(row) {
+ var state = row.get('attemptState');
+ if (state) {
+ return state;
+ } else {
+ return 'N/A';
+ }
+ }
+ }, {
+ id: 'nodeHttpAddress',
+ headerTitle: 'NodeManager Web UI',
+ contentPath: 'nodeHttpAddress',
+ cellComponentName: 'em-table-html-cell',
+ getCellContent: function(row) {
+ var address = self.checkHttpProtocol(row.get('nodeHttpAddress'));
+ if (address) {
+ return `<a href="${address}" target="_blank">${address}</a>`;
+ } else {
+ return 'N/A';
+ }
+ }
+ }, {
+ id: 'logsLink',
+ headerTitle: 'Logs',
+ contentPath: 'logsLink',
+ cellComponentName: 'em-table-html-cell',
+ getCellContent: function(row) {
+ var logUrl = self.checkHttpProtocol(row.get('logsLink'));
+ if (logUrl) {
+ return `<a href="${logUrl}" target="_blank">Link</a>`;
+ } else {
+ return 'N/A';
+ }
+ }
+ });
+
+ var gridCols = ColumnDef.make(columns);
+ this.set('gridColumns', gridCols);
+ this.set('gridRows', this.modelArr);
+ },
+
+ setContainersGridColumnsAndRows: function() {
+ var self = this;
+ var columns = [];
+
+ columns.push({
+ id: 'id',
+ headerTitle: 'Container ID',
+ contentPath: 'id',
+ minWidth: '300px'
+ }, {
+ id: 'startedTime',
+ headerTitle: 'Started Time',
+ contentPath: 'startedTime'
+ }, {
+ id: 'finishedTime',
+ headerTitle: 'Finished Time',
+ contentPath: 'finishedTime',
+ getCellContent: function(row) {
+ if (row.get('finishedTs')) {
+ return row.get('finishedTime');
+ }
+ return 'N/A';
+ }
+ }, {
+ id: 'elapsedTime',
+ headerTitle: 'Elapsed Time',
+ contentPath: 'elapsedTime'
+ }, {
+ id: 'priority',
+ headerTitle: 'Priority',
+ contentPath: 'priority'
+ }, {
+ id: 'containerExitStatus',
+ headerTitle: 'Exit Status',
+ contentPath: 'containerExitStatus',
+ getCellContent: function(row) {
+ var status = row.get('containerExitStatus');
+ if (status) {
+ return status;
+ } else {
+ return 'N/A';
+ }
+ }
+ }, {
+ id: 'containerState',
+ headerTitle: 'State',
+ contentPath: 'containerState',
+ getCellContent: function(row) {
+ var state = row.get('containerState');
+ if (state) {
+ return state;
+ } else {
+ return 'N/A';
+ }
+ }
+ }, {
+ id: 'logUrl',
+ headerTitle: 'Logs',
+ contentPath: 'logUrl',
+ cellComponentName: 'em-table-html-cell',
+ getCellContent: function(row) {
+ var url = self.checkHttpProtocol(row.get('logUrl'));
+ if (url) {
+ return `<a href="${url}" target="_blank">${url}</a>`;
+ } else {
+ return 'N/A';
+ }
+ }
+ }, {
+ id: 'nodeHttpAddress',
+ headerTitle: 'Node Manager UI',
+ contentPath: 'nodeHttpAddress',
+ cellComponentName: 'em-table-html-cell',
+ getCellContent: function(row) {
+ var address = self.checkHttpProtocol(row.get('nodeHttpAddress'));
+ if (address) {
+ return `<a href="${address}" target="_blank">${address}</a>`;
+ } else {
+ return 'N/A';
+ }
+ }
+ });
+
+ var gridCols = ColumnDef.make(columns);
+ this.set('gridColumns', gridCols);
+ this.set('gridRows', this.modelArr);
},
-});
\ No newline at end of file
+
+ checkHttpProtocol: function(prop) {
+ if (prop && prop.indexOf('://') < 0) {
+ prop = 'http://' + prop;
+ }
+ return prop;
+ },
+
+ isDataEmpty: Ember.computed(function() {
+ return this.modelArr.length === 0;
+ })
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef6b2f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/prepend-protocol.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/prepend-protocol.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/prepend-protocol.js
new file mode 100644
index 0000000..e8d18c4
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/prepend-protocol.js
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export function prependProtocol(params/*, hash*/) {
+ let address = params[0];
+ if (address && address.indexOf('://') < 0) {
+ address = 'http://' + address;
+ }
+ return address;
+}
+
+export default Ember.Helper.helper(prependProtocol);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef6b2f0/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 fcd076b..c3a9e32 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
@@ -23,39 +23,43 @@
<td>{{attempt.id}}</td>
</tr>
<tr>
- <td>Start Time</td>
+ <td>Started Time</td>
<td>{{attempt.attemptStartedTime}}</td>
</tr>
+ {{#if attempt.validatedFinishedTs}}
<tr>
- <td>AM Container Id</td>
- <td>{{attempt.appMasterContainerId}}</td>
+ <td>Finished Time</td>
+ <td>{{attempt.validatedFinishedTs}}</td>
</tr>
- {{#if attempt.IsAmNodeUrl}}
+ {{/if}}
<tr>
- <td>AM Node Web UI</td>
- <td><a href="{{nodeHttpAddressFormatted}}" target="_blank">{{nodeHttpAddressFormatted}}</a></td>
+ <td>Elapsed Time</td>
+ <td>{{attempt.elapsedTime}}</td>
</tr>
- {{/if}}
<tr>
- <td>AM Node Id</td>
- <td>{{attempt.amNodeId}}</td>
+ <td>AM Container Id</td>
+ <td>{{attempt.appMasterContainerId}}</td>
</tr>
- {{#if attempt.IsLinkAvailable}}
<tr>
- <td>Log</td>
- <td><a href="{{attempt.logsLink}}" target="_blank">Link</a></td>
+ <td>AM Node Id</td>
+ <td>{{attempt.amNodeId}}</td>
</tr>
- {{/if}}
{{#if attempt.attemptState}}
<tr>
<td>Attempt State</td>
<td>{{attempt.attemptState}}</td>
</tr>
{{/if}}
- {{#if attempt.elapsedTime}}
+ {{#if attempt.nodeHttpAddress}}
<tr>
- <td>Elapsed Time</td>
- <td>{{attempt.elapsedTime}}</td>
+ <td>AM Node Web UI</td>
+ <td><a href="{{prepend-protocol attempt.nodeHttpAddress}}" target="_blank">{{attempt.nodeHttpAddress}}</a></td>
+ </tr>
+ {{/if}}
+ {{#if attempt.logsLink}}
+ <tr>
+ <td>Log</td>
+ <td><a href="{{prepend-protocol attempt.logsLink}}" target="_blank">Link</a></td>
</tr>
{{/if}}
</tbody>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef6b2f0/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 586f128..ab353d2 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
@@ -19,13 +19,15 @@
<table id="container-table" class="table table-striped table-bordered" cellspacing="0" width="100%" height="100%">
<tbody>
<tr>
- <td>Start Time</td>
+ <td>Started Time</td>
<td>{{container.startedTime}}</td>
</tr>
+ {{#if container.validatedFinishedTs}}
<tr>
<td>Finished Time</td>
<td>{{container.validatedFinishedTs}}</td>
</tr>
+ {{/if}}
<tr>
<td>Elapsed Time</td>
<td>{{container.elapsedTime}}</td>
@@ -34,21 +36,29 @@
<td>Priority</td>
<td>{{container.priority}}</td>
</tr>
- <tr>
- <td>Log</td>
- <td><a href="{{container.logUrl}}" target="_blank">Link</a></td>
- </tr>
+ {{#if container.containerExitStatus}}
<tr>
<td>Exit Status</td>
<td>{{container.containerExitStatus}}</td>
</tr>
+ {{/if}}
+ {{#if container.containerState}}
<tr>
<td>State</td>
<td>{{container.containerState}}</td>
</tr>
+ {{/if}}
+ {{#if container.nodeHttpAddress}}
<tr>
<td>NodeManager UI</td>
- <td><a href="{{container.nodeHttpAddress}}" target="_blank">{{container.nodeHttpAddress}}</a></td>
+ <td><a href="{{prepend-protocol container.nodeHttpAddress}}" target="_blank">{{container.nodeHttpAddress}}</a></td>
+ </tr>
+ {{/if}}
+ {{#if container.logUrl}}
+ <tr>
+ <td>Log</td>
+ <td><a href="{{prepend-protocol container.logUrl}}" target="_blank">Link</a></td>
</tr>
+ {{/if}}
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef6b2f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs
----------------------------------------------------------------------
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 b110268..7856194 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
@@ -25,30 +25,49 @@
Containers
{{/if}}
</div>
- <div class="panel-body">
- <br/><br/>
- <div class="col-md-8 container-fluid" id={{parent-id}}>
- </div>
-
- <!-- diag info -->
- <div class="col-md-4 container-fluid">
- <div class="panel panel-default add-ellipsis">
- <div class="panel-heading">
- {{#if selected.link}}
- {{#link-to selected.linkname selected.id}}{{selected.id}}{{/link-to}}
- {{else}}
- {{selected.id}}
- {{/if}}
+ {{#if isDataEmpty}}
+ <ul class="nav nav-tabs" role="tablist">
+ <li class="active">
+ <a href="#graphViewTab" role="tab" data-toggle="tab">Graph View</a>
+ </li>
+ <li class="">
+ <a href="#gridViewTab" role="tab" data-toggle="tab">Grid View</a>
+ </li>
+ </ul>
+ <div class="panel-body">
+ <div class="tab-content">
+ <div role="tabpanel" class="tab-pane active" id="graphViewTab">
+ <br/><br/>
+ <div class="col-md-8 container-fluid" id={{parent-id}}></div>
+ <!-- diag info -->
+ <div class="col-md-4 container-fluid">
+ <div class="panel panel-default add-ellipsis">
+ <div class="panel-heading">
+ {{#if selected.link}}
+ {{#link-to selected.linkname selected.id}}{{selected.id}}{{/link-to}}
+ {{else}}
+ {{selected.id}}
+ {{/if}}
+ </div>
+ {{#if attemptModel}}
+ {{app-attempt-table attempt=selected}}
+ {{else}}
+ {{container-table container=selected}}
+ {{/if}}
+ </div>
+ </div>
+ </div>
+ <div role="tabpanel" class="tab-pane" id="gridViewTab">
+ {{em-table columns=gridColumns rows=gridRows}}
</div>
- {{#if attemptModel}}
- {{app-attempt-table attempt=selected}}
- {{else}}
- {{container-table container=selected}}
- {{/if}}
</div>
</div>
- </div>
+ {{else}}
+ <div class="panel-body">
+ <h4 class="text-center">No data available!</h4>
+ </div>
+ {{/if}}
</div>
</div>
-{{outlet}}
\ No newline at end of file
+{{outlet}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef6b2f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/prepend-protocol-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/prepend-protocol-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/prepend-protocol-test.js
new file mode 100644
index 0000000..6dc8137
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/prepend-protocol-test.js
@@ -0,0 +1,28 @@
+/**
+ * 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.
+ */
+
+import { prependProtocol } from '../../../helpers/prepend-protocol';
+import { module, test } from 'qunit';
+
+module('Unit | Helper | prepend protocol');
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+ let result = prependProtocol(42);
+ assert.ok(result);
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[16/50] [abbrv] hadoop git commit: YARN-5741. [YARN-3368] Update UI2
documentation for new UI2 path (Kai Sasaki and Wangda Tan via Sunil G)
Posted by va...@apache.org.
YARN-5741. [YARN-3368] Update UI2 documentation for new UI2 path (Kai Sasaki and Wangda Tan via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/29fc43e5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/29fc43e5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/29fc43e5
Branch: refs/heads/YARN-3368_branch2
Commit: 29fc43e5a4e3cc32853c96a65962d969a84ab7dd
Parents: 7513315
Author: sunilg <su...@apache.org>
Authored: Tue Oct 18 23:49:55 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
.../src/site/markdown/YarnUI2.md | 28 +++++++++-----------
1 file changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/29fc43e5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
index ff48183..f646d3d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
@@ -18,30 +18,26 @@
Hadoop: YARN-UI V2
=================
-Prerequisites
--------------
-
-If you run RM locally in your computer for test purpose, you need the following things properly installed.
-
-- Install Node.js with NPM: https://nodejs.org/download
-- After Node.js installed, install `corsproxy`: `npm install -g corsproxy`.
-
-
Configurations
-------------
-*In yarn-site.xml*
+*In `yarn-site.xml`*
| Configuration Property | Description |
|:---- |:---- |
-| `yarn.resourcemanager.webapp.ui2.enable` | In the server side it indicates whether the new YARN-UI v2 is enabled or not. Defaults to `false`. |
-| `yarn.resourcemanager.webapp.ui2.address` | Specify the address of ResourceManager and port which host YARN-UI v2, defaults to `localhost:8288`. |
+| `yarn.webapp.ui2.enable` | *(Required)* In the server side it indicates whether the new YARN-UI v2 is enabled or not. Defaults to `false`. |
+| `yarn.webapp.ui2.war-file-path` | *(Optional)* WAR file path for launching yarn UI2 web application. By default this is empty and YARN will lookup required war file from classpath |
-*In $HADOOP_PREFIX/share/hadoop/yarn/webapps/rm/config/configs.env*
+Please note that, If you run YARN daemons locally in your machine for test purpose,
+you need the following configurations added to `yarn-site.xml` to enable cross
+origin (CORS) support.
-- Update timelineWebAddress and rmWebAddress to the actual addresses run resource manager and timeline server
-- If you run RM locally in you computer just for test purpose, you need to keep `corsproxy` running. Otherwise, you need to set `localBaseAddress` to empty.
+| Configuration Property | Value | Description |
+|:---- |:---- |:---- |
+| `yarn.timeline-service.http-cross-origin.enabled` | true | Enable CORS support for Timeline Server |
+| `yarn.resourcemanager.webapp.cross-origin.enabled` | true | Enable CORS support for Resource Manager |
+| `yarn.nodemanager.webapp.cross-origin.enabled` | true | Enable CORS support for Node Manager |
Use it
-------------
-Open your browser, go to `rm-address:8288` and try it!
+Open your browser, go to `rm-address:8088/ui2` and try it!
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[42/50] [abbrv] hadoop git commit: YARN-5146. Support for Fair
Scheduler in new YARN UI. Contributed by Abdullah Yousufi.
Posted by va...@apache.org.
YARN-5146. Support for Fair Scheduler in new YARN UI. Contributed by Abdullah Yousufi.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1a1f39c9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a1f39c9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a1f39c9
Branch: refs/heads/YARN-3368_branch2
Commit: 1a1f39c98c2598a0fd77fa995a02b18060a2ca8a
Parents: 1635741
Author: Sunil G <su...@apache.org>
Authored: Tue Aug 15 21:58:44 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:49 2017 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/adapters/yarn-queue.js | 30 -----
.../app/adapters/yarn-queue/capacity-queue.js | 23 ++++
.../app/adapters/yarn-queue/fair-queue.js | 23 ++++
.../app/adapters/yarn-queue/fifo-queue.js | 23 ++++
.../app/adapters/yarn-queue/yarn-queue.js | 30 +++++
.../main/webapp/app/components/tree-selector.js | 19 ++-
.../src/main/webapp/app/models/yarn-queue.js | 94 --------------
.../app/models/yarn-queue/capacity-queue.js | 95 ++++++++++++++
.../webapp/app/models/yarn-queue/fair-queue.js | 79 ++++++++++++
.../webapp/app/models/yarn-queue/fifo-queue.js | 52 ++++++++
.../webapp/app/models/yarn-queue/yarn-queue.js | 23 ++++
.../main/webapp/app/routes/cluster-overview.js | 4 +-
.../src/main/webapp/app/routes/yarn-queue.js | 26 ++--
.../src/main/webapp/app/routes/yarn-queues.js | 12 +-
.../main/webapp/app/routes/yarn-queues/index.js | 25 ----
.../app/routes/yarn-queues/queues-selector.js | 25 ----
.../main/webapp/app/serializers/yarn-queue.js | 129 -------------------
.../serializers/yarn-queue/capacity-queue.js | 128 ++++++++++++++++++
.../app/serializers/yarn-queue/fair-queue.js | 92 +++++++++++++
.../app/serializers/yarn-queue/fifo-queue.js | 59 +++++++++
.../app/serializers/yarn-queue/yarn-queue.js | 47 +++++++
.../components/queue-configuration-table.hbs | 54 --------
.../templates/components/queue-navigator.hbs | 7 +-
.../yarn-queue/capacity-queue-conf-table.hbs | 54 ++++++++
.../yarn-queue/capacity-queue-info.hbs | 84 ++++++++++++
.../components/yarn-queue/capacity-queue.hbs | 63 +++++++++
.../yarn-queue/fair-queue-conf-table.hbs | 52 ++++++++
.../components/yarn-queue/fair-queue-info.hbs | 66 ++++++++++
.../components/yarn-queue/fair-queue.hbs | 63 +++++++++
.../yarn-queue/fifo-queue-conf-table.hbs | 56 ++++++++
.../components/yarn-queue/fifo-queue-info.hbs | 47 +++++++
.../components/yarn-queue/fifo-queue.hbs | 48 +++++++
.../webapp/app/templates/yarn-queue/info.hbs | 73 +----------
.../main/webapp/app/templates/yarn-queues.hbs | 54 +-------
.../src/main/webapp/app/utils/color-utils.js | 1 -
35 files changed, 1266 insertions(+), 494 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
deleted file mode 100644
index f2017df..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 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.
- */
-
-import AbstractAdapter from './abstract';
-
-export default AbstractAdapter.extend({
- address: "rmWebAddress",
- restNameSpace: "cluster",
- serverName: "RM",
-
- pathForType(/*modelName*/) {
- return 'scheduler'; // move to some common place, return path by modelname.
- }
-
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/capacity-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/capacity-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/capacity-queue.js
new file mode 100644
index 0000000..7eb9f76
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/capacity-queue.js
@@ -0,0 +1,23 @@
+/**
+ * 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.
+ */
+
+import YarnQueueAdapter from './yarn-queue';
+
+export default YarnQueueAdapter.extend({
+
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fair-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fair-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fair-queue.js
new file mode 100644
index 0000000..7eb9f76
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fair-queue.js
@@ -0,0 +1,23 @@
+/**
+ * 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.
+ */
+
+import YarnQueueAdapter from './yarn-queue';
+
+export default YarnQueueAdapter.extend({
+
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fifo-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fifo-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fifo-queue.js
new file mode 100644
index 0000000..7eb9f76
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fifo-queue.js
@@ -0,0 +1,23 @@
+/**
+ * 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.
+ */
+
+import YarnQueueAdapter from './yarn-queue';
+
+export default YarnQueueAdapter.extend({
+
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/yarn-queue.js
new file mode 100644
index 0000000..8184c39
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/yarn-queue.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import AbstractAdapter from '../abstract';
+
+export default AbstractAdapter.extend({
+ address: "rmWebAddress",
+ restNameSpace: "cluster",
+ serverName: "RM",
+
+ pathForType(/*modelName*/) {
+ return 'scheduler'; // move to some common place, return path by modelname.
+ }
+
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
index 3d72b2f..1a81a32 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
@@ -39,6 +39,9 @@ export default Ember.Component.extend({
// mainSvg
mainSvg: undefined,
+ used: undefined,
+ max: undefined,
+
// Init data
initData: function() {
this.map = { };
@@ -52,7 +55,8 @@ export default Ember.Component.extend({
}.bind(this));
// var selected = this.get("selected");
-
+ this.used = this.get("used");
+ this.max = this.get("max");
this.initQueue("root", 1, this.treeData);
},
@@ -81,7 +85,6 @@ export default Ember.Component.extend({
// Queue is not existed
return;
}
-
if (depth > this.maxDepth) {
this.maxDepth = this.maxDepth + 1;
}
@@ -149,7 +152,9 @@ export default Ember.Component.extend({
nodeEnter.append("circle")
.attr("r", 1e-6)
.style("fill", function(d) {
- var usedCap = d.queueData.get("usedCapacity");
+ var maxCap = d.queueData.get(this.max);
+ maxCap = maxCap == undefined ? 100 : maxCap;
+ var usedCap = d.queueData.get(this.used) / maxCap * 100.0;
if (usedCap <= 60.0) {
return "LimeGreen";
} else if (usedCap <= 100.0) {
@@ -157,7 +162,7 @@ export default Ember.Component.extend({
} else {
return "LightCoral";
}
- });
+ }.bind(this));
// append percentage
nodeEnter.append("text")
@@ -166,13 +171,15 @@ export default Ember.Component.extend({
.attr("fill", "white")
.attr("text-anchor", function() { return "middle"; })
.text(function(d) {
- var usedCap = d.queueData.get("usedCapacity");
+ var maxCap = d.queueData.get(this.max);
+ maxCap = maxCap == undefined ? 100 : maxCap;
+ var usedCap = d.queueData.get(this.used) / maxCap * 100.0;
if (usedCap >= 100.0) {
return usedCap.toFixed(0) + "%";
} else {
return usedCap.toFixed(1) + "%";
}
- })
+ }.bind(this))
.style("fill-opacity", 1e-6);
// append queue name
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js
deleted file mode 100644
index 27c48f7..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.
- */
-
-import DS from 'ember-data';
-
-export default DS.Model.extend({
- name: DS.attr('string'),
- children: DS.attr('array'),
- parent: DS.attr('string'),
- capacity: DS.attr('number'),
- maxCapacity: DS.attr('number'),
- usedCapacity: DS.attr('number'),
- absCapacity: DS.attr('number'),
- absMaxCapacity: DS.attr('number'),
- absUsedCapacity: DS.attr('number'),
- state: DS.attr('string'),
- userLimit: DS.attr('number'),
- userLimitFactor: DS.attr('number'),
- preemptionDisabled: DS.attr('number'),
- numPendingApplications: DS.attr('number'),
- numActiveApplications: DS.attr('number'),
- users: DS.hasMany('YarnUser'),
-
- isLeafQueue: function() {
- var len = this.get("children.length");
- if (!len) {
- return true;
- }
- return len <= 0;
- }.property("children"),
-
- capacitiesBarChartData: function() {
- return [
- {
- label: "Absolute Capacity",
- value: this.get("name") === "root" ? 100 : this.get("absCapacity")
- },
- {
- label: "Absolute Used",
- value: this.get("name") === "root" ? this.get("usedCapacity") : this.get("absUsedCapacity")
- },
- {
- label: "Absolute Max Capacity",
- value: this.get("name") === "root" ? 100 : this.get("absMaxCapacity")
- }
- ];
- }.property("absCapacity", "absUsedCapacity", "absMaxCapacity"),
-
- userUsagesDonutChartData: function() {
- var data = [];
- if (this.get("users")) {
- this.get("users").forEach(function(o) {
- data.push({
- label: o.get("name"),
- value: o.get("usedMemoryMB")
- });
- });
- }
-
- return data;
- }.property("users"),
-
- hasUserUsages: function() {
- return this.get("userUsagesDonutChartData").length > 0;
- }.property(),
-
- numOfApplicationsDonutChartData: function() {
- return [
- {
- label: "Pending Apps",
- value: this.get("numPendingApplications") || 0 // TODO, fix the REST API so root will return #applications as well.
- },
- {
- label: "Active Apps",
- value: this.get("numActiveApplications") || 0
- }
- ];
- }.property()
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js
new file mode 100644
index 0000000..1cb07bb
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js
@@ -0,0 +1,95 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+
+export default DS.Model.extend({
+ name: DS.attr('string'),
+ children: DS.attr('array'),
+ parent: DS.attr('string'),
+ capacity: DS.attr('number'),
+ maxCapacity: DS.attr('number'),
+ usedCapacity: DS.attr('number'),
+ absCapacity: DS.attr('number'),
+ absMaxCapacity: DS.attr('number'),
+ absUsedCapacity: DS.attr('number'),
+ state: DS.attr('string'),
+ userLimit: DS.attr('number'),
+ userLimitFactor: DS.attr('number'),
+ preemptionDisabled: DS.attr('number'),
+ numPendingApplications: DS.attr('number'),
+ numActiveApplications: DS.attr('number'),
+ users: DS.hasMany('YarnUser'),
+ type: DS.attr('string'),
+
+ isLeafQueue: function() {
+ var len = this.get("children.length");
+ if (!len) {
+ return true;
+ }
+ return len <= 0;
+ }.property("children"),
+
+ capacitiesBarChartData: function() {
+ return [
+ {
+ label: "Absolute Capacity",
+ value: this.get("name") === "root" ? 100 : this.get("absCapacity")
+ },
+ {
+ label: "Absolute Used",
+ value: this.get("name") === "root" ? this.get("usedCapacity") : this.get("absUsedCapacity")
+ },
+ {
+ label: "Absolute Max Capacity",
+ value: this.get("name") === "root" ? 100 : this.get("absMaxCapacity")
+ }
+ ];
+ }.property("absCapacity", "usedCapacity", "absMaxCapacity"),
+
+ userUsagesDonutChartData: function() {
+ var data = [];
+ if (this.get("users")) {
+ this.get("users").forEach(function(o) {
+ data.push({
+ label: o.get("name"),
+ value: o.get("usedMemoryMB")
+ });
+ });
+ }
+
+ return data;
+ }.property("users"),
+
+ hasUserUsages: function() {
+ return this.get("userUsagesDonutChartData").length > 0;
+ }.property(),
+
+ numOfApplicationsDonutChartData: function() {
+ return [
+ {
+ label: "Pending Apps",
+ value: this.get("numPendingApplications") || 0 // TODO, fix the REST API so root will return #applications as well.
+ },
+ {
+ label: "Active Apps",
+ value: this.get("numActiveApplications") || 0
+ }
+ ];
+ }.property("numPendingApplications", "numActiveApplications")
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fair-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fair-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fair-queue.js
new file mode 100644
index 0000000..be71362
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fair-queue.js
@@ -0,0 +1,79 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+
+export default DS.Model.extend({
+ name: DS.attr('string'),
+ children: DS.attr('array'),
+ parent: DS.attr('string'),
+ maxApps: DS.attr('number'),
+ minResources: DS.attr(),
+ maxResources: DS.attr(),
+ usedResources: DS.attr(),
+ demandResources: DS.attr(),
+ steadyFairResources: DS.attr(),
+ fairResources: DS.attr(),
+ clusterResources: DS.attr(),
+ pendingContainers: DS.attr('number'),
+ allocatedContainers: DS.attr('number'),
+ reservedContainers: DS.attr('number'),
+ schedulingPolicy: DS.attr('string'),
+ preemptable: DS.attr('number'),
+ numPendingApplications: DS.attr('number'),
+ numActiveApplications: DS.attr('number'),
+ type: DS.attr('string'),
+
+ isLeafQueue: function() {
+ var len = this.get("children.length");
+ if (!len) {
+ return true;
+ }
+ return len <= 0;
+ }.property("children"),
+
+ capacitiesBarChartData: function() {
+ return [
+ {
+ label: "Steady Fair Memory",
+ value: this.get("steadyFairResources.memory")
+ },
+ {
+ label: "Used Memory",
+ value: this.get("usedResources.memory")
+ },
+ {
+ label: "Maximum Memory",
+ value: this.get("maxResources.memory")
+ }
+ ];
+ }.property("maxResources.memory", "usedResources.memory", "maxResources.memory"),
+
+ numOfApplicationsDonutChartData: function() {
+ return [
+ {
+ label: "Pending Apps",
+ value: this.get("numPendingApplications") || 0 // TODO, fix the REST API so root will return #applications as well.
+ },
+ {
+ label: "Active Apps",
+ value: this.get("numActiveApplications") || 0
+ }
+ ];
+ }.property()
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fifo-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fifo-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fifo-queue.js
new file mode 100644
index 0000000..2386dc4
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fifo-queue.js
@@ -0,0 +1,52 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+
+export default DS.Model.extend({
+ name: DS.attr('string'),
+ capacity: DS.attr('number'),
+ usedCapacity: DS.attr('number'),
+ state: DS.attr('string'),
+ minQueueMemoryCapacity: DS.attr('number'),
+ maxQueueMemoryCapacity: DS.attr('number'),
+ numNodes: DS.attr('number'),
+ usedNodeCapacity: DS.attr('number'),
+ availNodeCapacity: DS.attr('number'),
+ totalNodeCapacity: DS.attr('number'),
+ numContainers: DS.attr('number'),
+ type: DS.attr('string'),
+
+ capacitiesBarChartData: function() {
+ return [
+ {
+ label: "Available Capacity",
+ value: this.get("availNodeCapacity")
+ },
+ {
+ label: "Used Capacity",
+ value: this.get("usedNodeCapacity")
+ },
+ {
+ label: "Total Capacity",
+ value: this.get("totalNodeCapacity")
+ }
+ ];
+ }.property("availNodeCapacity", "usedNodeCapacity", "totalNodeCapacity")
+
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/yarn-queue.js
new file mode 100644
index 0000000..dcf5f48
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/yarn-queue.js
@@ -0,0 +1,23 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+
+export default DS.Model.extend({
+ type: DS.attr('string')
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js
index b5db17d..3c6abd4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js
@@ -28,7 +28,7 @@ export default AbstractRoute.extend({
{
state: "RUNNING"
}),
- queues: this.store.query('yarn-queue', {}),
+ queues: this.store.query('yarn-queue.yarn-queue', {}),
});
},
@@ -39,6 +39,6 @@ export default AbstractRoute.extend({
unloadAll() {
this.store.unloadAll('ClusterMetric');
this.store.unloadAll('yarn-app');
- this.store.unloadAll('yarn-queue');
+ this.store.unloadAll('yarn-queue.yarn-queue');
}
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
index 1c4546c..cd4ed09 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
@@ -22,22 +22,28 @@ import AbstractRoute from './abstract';
export default AbstractRoute.extend({
model(param) {
- return Ember.RSVP.hash({
- selected : param.queue_name,
- queues: this.store.query('yarn-queue', {}),
- selectedQueue : undefined,
- apps: this.store.query('yarn-app', {
- queue: param.queue_name
- })
- });
+ return Ember.RSVP.hash({
+ selected : param.queue_name,
+ queues: this.store.query("yarn-queue.yarn-queue", {}).then((model) => {
+ let type = model.get('firstObject').get('type');
+ return this.store.query("yarn-queue." + type + "-queue", {});
+ }),
+ selectedQueue : undefined,
+ apps: this.store.query('yarn-app', {
+ queue: param.queue_name
+ })
+ });
},
afterModel(model) {
- model.selectedQueue = this.store.peekRecord('yarn-queue', model.selected);
+ var type = model.queues.get('firstObject').constructor.modelName;
+ model.selectedQueue = this.store.peekRecord(type, model.selected);
},
unloadAll() {
- this.store.unloadAll('yarn-queue');
+ this.store.unloadAll('yarn-queue.capacity-queue');
+ this.store.unloadAll('yarn-queue.fair-queue');
+ this.store.unloadAll('yarn-queue.fifo-queue');
this.store.unloadAll('yarn-app');
}
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
index e4f145d..7d8a200 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
@@ -30,17 +30,23 @@ export default AbstractRoute.extend({
}
return Ember.RSVP.hash({
selected : queueName,
- queues: this.store.query('yarn-queue', {}),
+ queues: this.store.query("yarn-queue.yarn-queue", {}).then((model) => {
+ let type = model.get('firstObject').get('type');
+ return this.store.query("yarn-queue." + type + "-queue", {});
+ }),
selectedQueue : undefined
});
},
afterModel(model) {
- model.selectedQueue = this.store.peekRecord('yarn-queue', model.selected);
+ var type = model.queues.get('firstObject').constructor.modelName;
+ model.selectedQueue = this.store.peekRecord(type, model.selected);
},
unloadAll() {
- this.store.unloadAll('yarn-queue');
+ this.store.unloadAll('yarn-queue.capacity-queue');
+ this.store.unloadAll('yarn-queue.fair-queue');
+ this.store.unloadAll('yarn-queue.fifo-queue');
this.store.unloadAll('yarn-app');
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/index.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/index.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/index.js
deleted file mode 100644
index 436c6d8..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 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.
- */
-
-import Ember from 'ember';
-
-export default Ember.Route.extend({
- beforeModel() {
- this.transitionTo('yarn-queues.root');
- }
-});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/queues-selector.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/queues-selector.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/queues-selector.js
deleted file mode 100644
index 5d14c6f..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/queues-selector.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 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.
- */
-
-import Ember from 'ember';
-
-export default Ember.Route.extend({
- model() {
- return this.store.findAll('yarn-queue');
- },
-});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
deleted file mode 100644
index 4fc1a29..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * 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.
- */
-
-import DS from 'ember-data';
-
-export default DS.JSONAPISerializer.extend({
-
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
- var children = [];
- if (payload.queues) {
- payload.queues.queue.forEach(function(queue) {
- children.push(queue.queueName);
- });
- }
-
- var includedData = [];
- var relationshipUserData = [];
-
- // update user models
- if (payload.users && payload.users.user) {
- payload.users.user.forEach(function(u) {
- includedData.push({
- type: "YarnUser",
- id: u.username + "_" + payload.queueName,
- attributes: {
- name: u.username,
- queueName: payload.queueName,
- usedMemoryMB: u.resourcesUsed.memory || 0,
- usedVCore: u.resourcesUsed.vCores || 0,
- }
- });
-
- relationshipUserData.push({
- type: "YarnUser",
- id: u.username + "_" + payload.queueName,
- });
- });
- }
-
-
- var fixedPayload = {
- id: id,
- type: primaryModelClass.modelName, // yarn-queue
- attributes: {
- name: payload.queueName,
- parent: payload.myParent,
- children: children,
- capacity: payload.capacity,
- usedCapacity: payload.usedCapacity,
- maxCapacity: payload.maxCapacity,
- absCapacity: payload.absoluteCapacity,
- absMaxCapacity: payload.absoluteMaxCapacity,
- absUsedCapacity: payload.absoluteUsedCapacity,
- state: payload.state,
- userLimit: payload.userLimit,
- userLimitFactor: payload.userLimitFactor,
- preemptionDisabled: payload.preemptionDisabled,
- numPendingApplications: payload.numPendingApplications,
- numActiveApplications: payload.numActiveApplications,
- },
- // Relationships
- relationships: {
- users: {
- data: relationshipUserData
- }
- }
- };
-
- return {
- queue: this._super(store, primaryModelClass, fixedPayload, id, requestType),
- includedData: includedData
- };
- },
-
- handleQueue(store, primaryModelClass, payload, id, requestType) {
- var data = [];
- var includedData = [];
- var result = this.normalizeSingleResponse(store, primaryModelClass,
- payload, id, requestType);
-
- data.push(result.queue);
- includedData = includedData.concat(result.includedData);
-
- if (payload.queues) {
- for (var i = 0; i < payload.queues.queue.length; i++) {
- var queue = payload.queues.queue[i];
- queue.myParent = payload.queueName;
- var childResult = this.handleQueue(store, primaryModelClass, queue,
- queue.queueName,
- requestType);
-
- data = data.concat(childResult.data);
- includedData = includedData.concat(childResult.includedData);
- }
- }
-
- return {
- data: data,
- includedData: includedData
- };
- },
-
- normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
- var normalizedArrayResponse = {};
- var result = this.handleQueue(store, primaryModelClass,
- payload.scheduler.schedulerInfo, "root", requestType);
-
- normalizedArrayResponse.data = result.data;
- normalizedArrayResponse.included = result.includedData;
-
- return normalizedArrayResponse;
- }
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js
new file mode 100644
index 0000000..c7350ef
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js
@@ -0,0 +1,128 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+
+export default DS.JSONAPISerializer.extend({
+
+ normalizeSingleResponse(store, primaryModelClass, payload, id,
+ requestType) {
+ var children = [];
+ if (payload.queues) {
+ payload.queues.queue.forEach(function(queue) {
+ children.push(queue.queueName);
+ });
+ }
+
+ var includedData = [];
+ var relationshipUserData = [];
+
+ // update user models
+ if (payload.users && payload.users.user) {
+ payload.users.user.forEach(function(u) {
+ includedData.push({
+ type: "YarnUser",
+ id: u.username + "_" + payload.queueName,
+ attributes: {
+ name: u.username,
+ queueName: payload.queueName,
+ usedMemoryMB: u.resourcesUsed.memory || 0,
+ usedVCore: u.resourcesUsed.vCores || 0,
+ }
+ });
+
+ relationshipUserData.push({
+ type: "YarnUser",
+ id: u.username + "_" + payload.queueName,
+ });
+ });
+ }
+
+ var fixedPayload = {
+ id: id,
+ type: primaryModelClass.modelName, // yarn-queue
+ attributes: {
+ name: payload.queueName,
+ parent: payload.myParent,
+ children: children,
+ capacity: payload.capacity,
+ usedCapacity: payload.usedCapacity,
+ maxCapacity: payload.maxCapacity,
+ absCapacity: payload.absoluteCapacity,
+ absMaxCapacity: payload.absoluteMaxCapacity,
+ absUsedCapacity: payload.absoluteUsedCapacity,
+ state: payload.state,
+ userLimit: payload.userLimit,
+ userLimitFactor: payload.userLimitFactor,
+ preemptionDisabled: payload.preemptionDisabled,
+ numPendingApplications: payload.numPendingApplications,
+ numActiveApplications: payload.numActiveApplications,
+ type: "capacity",
+ },
+ // Relationships
+ relationships: {
+ users: {
+ data: relationshipUserData
+ }
+ }
+ };
+ return {
+ queue: this._super(store, primaryModelClass, fixedPayload, id, requestType),
+ includedData: includedData
+ };
+ },
+
+ handleQueue(store, primaryModelClass, payload, id, requestType) {
+ var data = [];
+ var includedData = [];
+ var result = this.normalizeSingleResponse(store, primaryModelClass,
+ payload, id, requestType);
+
+ data.push(result.queue);
+ includedData = includedData.concat(result.includedData);
+
+ if (payload.queues) {
+ for (var i = 0; i < payload.queues.queue.length; i++) {
+ var queue = payload.queues.queue[i];
+ queue.myParent = payload.queueName;
+ var childResult = this.handleQueue(store, primaryModelClass, queue,
+ queue.queueName,
+ requestType);
+
+ data = data.concat(childResult.data);
+ includedData = includedData.concat(childResult.includedData);
+ }
+ }
+
+ return {
+ data: data,
+ includedData: includedData
+ };
+ },
+
+ normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+ var normalizedArrayResponse = {};
+ var result = this.handleQueue(store, primaryModelClass,
+ payload.scheduler.schedulerInfo, "root", requestType);
+
+ normalizedArrayResponse.data = result.data;
+ normalizedArrayResponse.included = result.includedData;
+
+ return normalizedArrayResponse;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fair-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fair-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fair-queue.js
new file mode 100644
index 0000000..2215d2d
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fair-queue.js
@@ -0,0 +1,92 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+
+export default DS.JSONAPISerializer.extend({
+
+ normalizeSingleResponse(store, primaryModelClass, payload, id,
+ requestType) {
+ var children = [];
+ if (payload.childQueues) {
+ payload.childQueues.queue.forEach(function(queue) {
+ children.push(queue.queueName);
+ });
+ }
+
+ var fixedPayload = {
+ id: id,
+ type: primaryModelClass.modelName,
+ attributes: {
+ name: payload.queueName,
+ parent: payload.myParent,
+ children: children,
+ maxApps: payload.maxApps,
+ minResources: payload.minResources,
+ maxResources: payload.maxResources,
+ usedResources: payload.usedResources,
+ demandResources: payload.demandResources,
+ steadyFairResources: payload.steadyFairResources,
+ fairResources: payload.fairResources,
+ clusterResources: payload.clusterResources,
+ pendingContainers: payload.pendingContainers,
+ allocatedContainers: payload.allocatedContainers,
+ reservedContainers: payload.reservedContainers,
+ schedulingPolicy: payload.schedulingPolicy,
+ preemptable: payload.preemptable,
+ numPendingApplications: payload.numPendingApps,
+ numActiveApplications: payload.numActiveApps,
+ type: "fair",
+ },
+ };
+ return this._super(store, primaryModelClass, fixedPayload, id, requestType);
+ },
+
+ handleQueue(store, primaryModelClass, payload, id, requestType) {
+ var data = [];
+ var includedData = [];
+ if(!payload) return data;
+ var result = this.normalizeSingleResponse(store, primaryModelClass,
+ payload, id, requestType);
+
+ data.push(result);
+
+ if (payload.childQueues) {
+ for (var i = 0; i < payload.childQueues.queue.length; i++) {
+ var queue = payload.childQueues.queue[i];
+ queue.myParent = payload.queueName;
+ var childResult = this.handleQueue(store, primaryModelClass, queue,
+ queue.queueName,
+ requestType);
+
+ data = data.concat(childResult);
+ }
+ }
+
+ return data;
+ },
+
+ normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+ var normalizedArrayResponse = {};
+ var result = this.handleQueue(store, primaryModelClass,
+ payload.scheduler.schedulerInfo.rootQueue, "root", requestType);
+
+ normalizedArrayResponse.data = result;
+ return normalizedArrayResponse;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fifo-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fifo-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fifo-queue.js
new file mode 100644
index 0000000..297ec18
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fifo-queue.js
@@ -0,0 +1,59 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+
+export default DS.JSONAPISerializer.extend({
+
+ normalizeSingleResponse(store, primaryModelClass, payload, id,
+ requestType) {
+
+ var fixedPayload = {
+ id: id,
+ type: primaryModelClass.modelName,
+ attributes: {
+ name: id,
+ capacity: payload.capacity * 100,
+ usedCapacity: payload.usedCapacity * 100,
+ usedNodeCapacity: payload.usedNodeCapacity,
+ availNodeCapacity: payload.availNodeCapacity,
+ totalNodeCapacity: payload.totalNodeCapacity,
+ numNodes: payload.numNodes,
+ numContainers: payload.numContainers,
+ state: payload.qstate,
+ minQueueMemoryCapacity: payload.minQueueMemoryCapacity,
+ maxQueueMemoryCapacity: payload.maxQueueMemoryCapacity,
+ type: "fifo",
+ },
+
+ };
+
+ return this._super(store, primaryModelClass, fixedPayload, id,
+ requestType);
+ },
+
+ normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+ var normalizedArrayResponse = {};
+ normalizedArrayResponse.data = [
+ this.normalizeSingleResponse(store, primaryModelClass,
+ payload.scheduler.schedulerInfo, "root", requestType)
+ ];
+
+ return normalizedArrayResponse;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/yarn-queue.js
new file mode 100644
index 0000000..b2e0f2f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/yarn-queue.js
@@ -0,0 +1,47 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+
+export default DS.JSONAPISerializer.extend({
+
+ normalizeSingleResponse(store, primaryModelClass, payload, id,
+ requestType) {
+
+ var fixedPayload = {
+ id: id,
+ type: primaryModelClass.modelName,
+ attributes: {
+ type: payload.type.split(/(?=[A-Z])/)[0]
+ }
+ };
+ return this._super(store, primaryModelClass, fixedPayload, id,
+ requestType);
+ },
+
+ normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+ var normalizedArrayResponse = {};
+
+ normalizedArrayResponse.data = [
+ this.normalizeSingleResponse(store, primaryModelClass,
+ payload.scheduler.schedulerInfo, "root", requestType)
+ ];
+
+ return normalizedArrayResponse;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-configuration-table.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-configuration-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-configuration-table.hbs
deleted file mode 100644
index 17a1e1a..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-configuration-table.hbs
+++ /dev/null
@@ -1,54 +0,0 @@
-{{!
- * 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.
-}}
-
-<table id="queue-configuration-table" class="table table-striped table-bordered" cellspacing="0" width="100%" height="100%">
- <thead>
- <tr>
- <td><b>Configurations</b></td>
- <td>Value</td>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>Configured Capacity</td>
- <td>{{queue.capacity}}</td>
- </tr>
- <tr>
- <td>Configured Max Capacity</td>
- <td>{{queue.maxCapacity}}</td>
- </tr>
- <tr>
- <td>State</td>
- <td>{{queue.state}}</td>
- </tr>
- {{#if queue.isLeafQueue}}
- <tr>
- <td>User Limit Percent</td>
- <td>{{queue.userLimit}}</td>
- </tr>
- <tr>
- <td>User Limit Factor</td>
- <td>{{queue.userLimitFactor}}</td>
- </tr>
- <tr>
- <td>Preemption Disabled</td>
- <td>{{queue.preemptionDisabled}}</td>
- </tr>
- {{/if}}
- </tbody>
-</table>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-navigator.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-navigator.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-navigator.hbs
index d8dd236..e3b0a90 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-navigator.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-navigator.hbs
@@ -20,9 +20,12 @@
<div class="row">
<div class="col-md-12 container-fluid">
<div class="panel panel-default" id="tree-selector-container">
- {{tree-selector model=model parentId="tree-selector-container" selected=selected}}
+ <div class="panel-heading">
+ Scheduler: {{model.firstObject.type}}
+ </div>
+ {{tree-selector model=model parentId="tree-selector-container" selected=selected used=used max=max}}
</div>
</div>
</div>
-{{outlet}}
\ No newline at end of file
+{{outlet}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-conf-table.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-conf-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-conf-table.hbs
new file mode 100644
index 0000000..3f6017f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-conf-table.hbs
@@ -0,0 +1,54 @@
+{{!
+ * 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.
+}}
+
+<table id="queue-configuration-table" class="table table-striped table-bordered" cellspacing="0" width="100%" height="100%">
+ <thead>
+ <tr>
+ <td><b>Configurations</b></td>
+ <td>Value</td>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Configured Capacity</td>
+ <td>{{queue.capacity}}</td>
+ </tr>
+ <tr>
+ <td>Configured Max Capacity</td>
+ <td>{{queue.maxCapacity}}</td>
+ </tr>
+ <tr>
+ <td>State</td>
+ <td>{{queue.state}}</td>
+ </tr>
+ {{#if queue.isLeafQueue}}
+ <tr>
+ <td>User Limit Percent</td>
+ <td>{{queue.userLimit}}</td>
+ </tr>
+ <tr>
+ <td>User Limit Factor</td>
+ <td>{{queue.userLimitFactor}}</td>
+ </tr>
+ <tr>
+ <td>Preemption Disabled</td>
+ <td>{{queue.preemptionDisabled}}</td>
+ </tr>
+ {{/if}}
+ </tbody>
+</table>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs
new file mode 100644
index 0000000..7d44e69
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs
@@ -0,0 +1,84 @@
+{{!
+ * 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.
+}}
+
+<div class="row">
+
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Queue Capacities: {{model.selected}}
+ </div>
+ <div class="container-fluid" id="capacity-bar-chart">
+ <br/>
+ {{bar-chart data=model.selectedQueue.capacitiesBarChartData
+ title=""
+ parentId="capacity-bar-chart"
+ textWidth=170
+ ratio=0.55
+ maxHeight=350}}
+ </div>
+ </div>
+ </div>
+
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Queue Information: {{model.selected}}
+ </div>
+ {{yarn-queue.capacity-queue-conf-table queue=model.selectedQueue}}
+ </div>
+ </div>
+
+</div>
+
+<div class="row">
+
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Running Apps: {{model.selected}}
+ </div>
+ <div class="container-fluid" id="numapplications-donut-chart">
+ {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData
+ showLabels=true
+ parentId="numapplications-donut-chart"
+ ratio=0.6
+ maxHeight=350}}
+ </div>
+ </div>
+ </div>
+
+ {{#if model.selectedQueue.hasUserUsages}}
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ User Usages: {{model.selected}}
+ </div>
+ <div class="container-fluid" id="userusage-donut-chart">
+ {{donut-chart data=model.selectedQueue.userUsagesDonutChartData
+ showLabels=true
+ parentId="userusage-donut-chart"
+ type="memory"
+ ratio=0.6
+ maxHeight=350}}
+ </div>
+ </div>
+ </div>
+ {{/if}}
+
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs
new file mode 100644
index 0000000..8b63b66
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs
@@ -0,0 +1,63 @@
+{{!
+ * 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.
+}}
+
+{{queue-navigator model=model.queues selected=model.selected
+ used="usedCapacity" max="absMaxCapacity"}}
+
+<div class="row">
+ <div class="col-lg-4 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Queue Information: {{model.selected}}
+ </div>
+ {{yarn-queue.capacity-queue-conf-table queue=model.selectedQueue}}
+ </div>
+ </div>
+
+ <div class="col-lg-4 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Queue Capacities: {{model.selected}}
+ </div>
+ <div class="container-fluid" id="capacity-bar-chart">
+ <br/>
+ {{bar-chart data=model.selectedQueue.capacitiesBarChartData
+ title=""
+ parentId="capacity-bar-chart"
+ textWidth=175
+ ratio=0.55
+ maxHeight=350}}
+ </div>
+ </div>
+ </div>
+
+ <div class="col-lg-4 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Running Apps: {{model.selected}}
+ </div>
+ <div class="container-fluid" id="numapplications-donut-chart">
+ {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData
+ showLabels=true
+ parentId="numapplications-donut-chart"
+ ratio=0.6
+ maxHeight=350}}
+ </div>
+ </div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs
new file mode 100644
index 0000000..00fabcc
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs
@@ -0,0 +1,52 @@
+{{!
+ * 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.
+}}
+
+<table id="queue-configuration-table" class="table table-striped table-bordered" cellspacing="0" width="100%" height="100%">
+ <thead>
+ <tr>
+ <td><b>Configurations</b></td>
+ <td>Value</td>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Fair Memory, VCores</td>
+ <td>{{queue.fairResources.memory}} MB, {{queue.fairResources.vCores}}</td>
+ </tr>
+ <tr>
+ <td>Minimum Memory, VCores</td>
+ <td>{{queue.minResources.memory}} MB, {{queue.minResources.vCores}}</td>
+ </tr>
+ <tr>
+ <td>Cluster Memory, VCores</td>
+ <td>{{queue.clusterResources.memory}} MB, {{queue.clusterResources.vCores}}</td>
+ </tr>
+ <tr>
+ <td>Pending, Allocated, Reserved Containers</td>
+ <td>{{queue.pendingContainers}} , {{queue.allocatedContainers}} , {{queue.reservedContainers}}</td>
+ </tr>
+ <tr>
+ <td>Scheduling Policy</td>
+ <td>{{queue.schedulingPolicy}}</td>
+ </tr>
+ <tr>
+ <td>Preemption Enabled</td>
+ <td>{{queue.preemptable}}</td>
+ </tr>
+ </tbody>
+</table>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs
new file mode 100644
index 0000000..a770bfe
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs
@@ -0,0 +1,66 @@
+{{!
+ * 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.
+}}
+
+<div class="row">
+
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Queue Capacities: {{model.selected}}
+ </div>
+ <div class="container-fluid" id="capacity-bar-chart">
+ <br/>
+ {{bar-chart data=model.selectedQueue.capacitiesBarChartData
+ title=""
+ parentId="capacity-bar-chart"
+ textWidth=170
+ ratio=0.55
+ maxHeight=350}}
+ </div>
+ </div>
+ </div>
+
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Queue Information: {{model.selected}}
+ </div>
+ {{yarn-queue.fair-queue-conf-table queue=model.selectedQueue}}
+ </div>
+ </div>
+
+</div>
+
+<div class="row">
+
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Running Apps: {{model.selected}}
+ </div>
+ <div class="container-fluid" id="numapplications-donut-chart">
+ {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData
+ showLabels=true
+ parentId="numapplications-donut-chart"
+ ratio=0.6
+ maxHeight=350}}
+ </div>
+ </div>
+ </div>
+
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs
new file mode 100644
index 0000000..0341108
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs
@@ -0,0 +1,63 @@
+{{!
+ * 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.
+}}
+
+{{queue-navigator model=model.queues selected=model.selected
+ used="usedResources.memory" max="clusterResources.memory"}}
+
+<div class="row">
+ <div class="col-lg-4 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Queue Information: {{model.selected}}
+ </div>
+ {{yarn-queue.fair-queue-conf-table queue=model.selectedQueue}}
+ </div>
+ </div>
+
+ <div class="col-lg-4 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Queue Capacities: {{model.selected}}
+ </div>
+ <div class="container-fluid" id="capacity-bar-chart">
+ <br/>
+ {{bar-chart data=model.selectedQueue.capacitiesBarChartData
+ title=""
+ parentId="capacity-bar-chart"
+ textWidth=150
+ ratio=0.55
+ maxHeight=350}}
+ </div>
+ </div>
+ </div>
+
+ <div class="col-lg-4 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Running Apps: {{model.selected}}
+ </div>
+ <div class="container-fluid" id="numapplications-donut-chart">
+ {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData
+ showLabels=true
+ parentId="numapplications-donut-chart"
+ ratio=0.6
+ maxHeight=350}}
+ </div>
+ </div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-conf-table.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-conf-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-conf-table.hbs
new file mode 100644
index 0000000..4ced3e7
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-conf-table.hbs
@@ -0,0 +1,56 @@
+{{!
+ * 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.
+}}
+
+<table id="queue-configuration-table" class="table table-striped table-bordered" cellspacing="0" width="100%" height="100%">
+ <thead>
+ <tr>
+ <td><b>Configurations</b></td>
+ <td>Value</td>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Configured Capacity</td>
+ <td>{{queue.capacity}}</td>
+ </tr>
+ <tr>
+ <td>Used Capacity</td>
+ <td>{{queue.usedCapacity}}</td>
+ </tr>
+ <tr>
+ <td>State</td>
+ <td>{{queue.state}}</td>
+ </tr>
+ <tr>
+ <td>Minimum Queue Memory Capacity</td>
+ <td>{{queue.minQueueMemoryCapacity}}</td>
+ </tr>
+ <tr>
+ <td>Maximum Queue Memory Capacity</td>
+ <td>{{queue.maxQueueMemoryCapacity}}</td>
+ </tr>
+ <tr>
+ <td>Number of Nodes</td>
+ <td>{{queue.numNodes}}</td>
+ </tr>
+ <tr>
+ <td>Number of Containers</td>
+ <td>{{queue.numContainers}}</td>
+ </tr>
+ </tbody>
+</table>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-info.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-info.hbs
new file mode 100644
index 0000000..7f4e8a7
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-info.hbs
@@ -0,0 +1,47 @@
+{{!
+ * 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.
+}}
+
+<div class="row">
+
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Queue Capacities: {{model.selected}}
+ </div>
+ <div class="container-fluid" id="capacity-bar-chart">
+ <br/>
+ {{bar-chart data=model.selectedQueue.capacitiesBarChartData
+ title=""
+ parentId="capacity-bar-chart"
+ textWidth=170
+ ratio=0.55
+ maxHeight=350}}
+ </div>
+ </div>
+ </div>
+
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Queue Information: {{model.selected}}
+ </div>
+ {{yarn-queue.fifo-queue-conf-table queue=model.selectedQueue}}
+ </div>
+ </div>
+
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue.hbs
new file mode 100644
index 0000000..46d79f0
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue.hbs
@@ -0,0 +1,48 @@
+{{!
+ * 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.
+}}
+
+{{queue-navigator model=model.queues selected=model.selected
+ used="usedNodeCapacity" max="totalNodeCapacity"}}
+
+<div class="row">
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Queue Information: {{model.selected}}
+ </div>
+ {{yarn-queue.fifo-queue-conf-table queue=model.selectedQueue}}
+ </div>
+ </div>
+
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Queue Capacities: {{model.selected}}
+ </div>
+ <div class="container-fluid" id="capacity-bar-chart">
+ <br/>
+ {{bar-chart data=model.selectedQueue.capacitiesBarChartData
+ title=""
+ parentId="capacity-bar-chart"
+ textWidth=150
+ ratio=0.55
+ maxHeight=350}}
+ </div>
+ </div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/info.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/info.hbs
index c112ef9..2f138a7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/info.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/info.hbs
@@ -16,69 +16,10 @@
* limitations under the License.
}}
-<div class="row">
-
- <div class="col-lg-6 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">
- Queue Capacities: {{model.selected}}
- </div>
- <div class="container-fluid" id="capacity-bar-chart">
- <br/>
- {{bar-chart data=model.selectedQueue.capacitiesBarChartData
- title=""
- parentId="capacity-bar-chart"
- textWidth=170
- ratio=0.55
- maxHeight=350}}
- </div>
- </div>
- </div>
-
- <div class="col-lg-6 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">
- Queue Information: {{model.selected}}
- </div>
- {{queue-configuration-table queue=model.selectedQueue}}
- </div>
- </div>
-
-</div>
-
-<div class="row">
-
- <div class="col-lg-6 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">
- Running Apps: {{model.selected}}
- </div>
- <div class="container-fluid" id="numapplications-donut-chart">
- {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData
- showLabels=true
- parentId="numapplications-donut-chart"
- ratio=0.6
- maxHeight=350}}
- </div>
- </div>
- </div>
-
- {{#if model.selectedQueue.hasUserUsages}}
- <div class="col-lg-6 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">
- User Usages: {{model.selected}}
- </div>
- <div class="container-fluid" id="userusage-donut-chart">
- {{donut-chart data=model.selectedQueue.userUsagesDonutChartData
- showLabels=true
- parentId="userusage-donut-chart"
- type="memory"
- ratio=0.6
- maxHeight=350}}
- </div>
- </div>
- </div>
- {{/if}}
-
-</div>
+{{#if (eq model.queues.firstObject.type "capacity")}}
+ {{yarn-queue.capacity-queue-info model=model}}
+{{else if (eq model.queues.firstObject.type "fair")}}
+ {{yarn-queue.fair-queue-info model=model}}
+{{else}}
+ {{yarn-queue.fifo-queue-info model=model}}
+{{/if}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs
index 6dfb220..fccdb5b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs
@@ -17,54 +17,14 @@
}}
{{breadcrumb-bar breadcrumbs=breadcrumbs}}
-
<div class="container-fluid">
- {{queue-navigator model=model.queues selected=model.selected}}
-
- <div class="row">
-
- <div class="col-lg-4 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">
- Queue Information: {{model.selected}}
- </div>
- {{queue-configuration-table queue=model.selectedQueue}}
- </div>
- </div>
-
- <div class="col-lg-4 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">
- Queue Capacities: {{model.selected}}
- </div>
- <div class="container-fluid" id="capacity-bar-chart">
- <br/>
- {{bar-chart data=model.selectedQueue.capacitiesBarChartData
- title=""
- parentId="capacity-bar-chart"
- textWidth=150
- ratio=0.55
- maxHeight=350}}
- </div>
- </div>
- </div>
-
- <div class="col-lg-4 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">
- Running Apps: {{model.selected}}
- </div>
- <div class="container-fluid" id="numapplications-donut-chart">
- {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData
- showLabels=true
- parentId="numapplications-donut-chart"
- ratio=0.6
- maxHeight=350}}
- </div>
- </div>
- </div>
-
- </div>
+ {{#if (eq model.queues.firstObject.type "capacity")}}
+ {{yarn-queue.capacity-queue model=model}}
+ {{else if (eq model.queues.firstObject.type "fair")}}
+ {{yarn-queue.fair-queue model=model}}
+ {{else}}
+ {{yarn-queue.fifo-queue model=model}}
+ {{/if}}
</div>
{{outlet}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
index 6c0cfee..af0cdf4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
@@ -55,7 +55,6 @@ export default {
}
}
- console.log(colors);
return colors;
},
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[05/50] [abbrv] hadoop git commit: YARN-5504. [YARN-3368] Fix YARN UI
build pom.xml (Sreenath Somarajapuram via Sunil G)
Posted by va...@apache.org.
YARN-5504. [YARN-3368] Fix YARN UI build pom.xml (Sreenath Somarajapuram via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ade1dd96
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ade1dd96
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ade1dd96
Branch: refs/heads/YARN-3368_branch2
Commit: ade1dd96b562ddb75c4f432bd2ba8828844f2995
Parents: 1510fea
Author: sunilg <su...@apache.org>
Authored: Thu Aug 25 23:21:29 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
.../hadoop-yarn/hadoop-yarn-ui/pom.xml | 59 +++++---------------
.../src/main/webapp/ember-cli-build.js | 2 +-
.../hadoop-yarn-ui/src/main/webapp/package.json | 3 +-
3 files changed, 17 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ade1dd96/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 7dcc42e..8162bdd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -35,7 +35,7 @@
<node.executable>node</node.executable>
<nodeVersion>v0.12.2</nodeVersion>
<npmVersion>2.10.0</npmVersion>
- <skipTests>false</skipTests>
+ <keep-ui-build-cache>false</keep-ui-build-cache>
</properties>
<build>
@@ -60,19 +60,20 @@
</plugin>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
- <configuration>
- <followSymLinks>false</followSymLinks>
- <filesets>
- <fileset>
- <directory>${basedir}/src/main/webapp/bower_components</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/main/webapp/node_modules</directory>
- </fileset>
- </filesets>
- </configuration>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ <configuration>
+ <skip>${keep-ui-build-cache}</skip>
+ <followSymLinks>false</followSymLinks>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/src/main/webapp/bower_components</directory>
+ </fileset>
+ <fileset>
+ <directory>${basedir}/src/main/webapp/node_modules</directory>
+ </fileset>
+ </filesets>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -126,21 +127,6 @@
</configuration>
</execution>
<execution>
- <phase>generate-sources</phase>
- <id>bower --allow-root install</id>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <workingDirectory>${webappDir}</workingDirectory>
- <executable>bower</executable>
- <arguments>
- <argument>--allow-root</argument>
- <argument>install</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
<id>ember build</id>
<phase>generate-sources</phase>
<goals>
@@ -158,21 +144,6 @@
</configuration>
</execution>
<execution>
- <id>ember test</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <skip>${skipTests}</skip>
- <workingDirectory>${webappDir}</workingDirectory>
- <executable>ember</executable>
- <arguments>
- <argument>test</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
<id>cleanup tmp</id>
<phase>generate-sources</phase>
<goals>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ade1dd96/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
index d21cc3e..7736c75 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
@@ -22,7 +22,7 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app');
module.exports = function(defaults) {
var app = new EmberApp(defaults, {
- // Add options here
+ hinting: false
});
app.import("bower_components/datatables/media/css/jquery.dataTables.min.css");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ade1dd96/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
index baa473a..6a4eb16 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
@@ -9,8 +9,7 @@
},
"scripts": {
"build": "ember build",
- "start": "ember server",
- "test": "ember test"
+ "start": "ember server"
},
"repository": "",
"engines": {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[08/50] [abbrv] hadoop git commit: YARN-5583. [YARN-3368] Fix wrong
paths in .gitignore (Sreenath Somarajapuram via Sunil G)
Posted by va...@apache.org.
YARN-5583. [YARN-3368] Fix wrong paths in .gitignore (Sreenath Somarajapuram via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9e609b80
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9e609b80
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9e609b80
Branch: refs/heads/YARN-3368_branch2
Commit: 9e609b805bc3e8a8ba24d688fe3755d41e253d61
Parents: ade1dd9
Author: sunilg <su...@apache.org>
Authored: Tue Aug 30 20:27:59 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
.gitignore | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e609b80/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 66f7a1f..fb67e69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,8 +37,8 @@ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.sass-cache
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/connect.lock
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/coverage/*
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/libpeerconnection.log
-hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webappnpm-debug.log
-hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapptestem.log
+hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/npm-debug.log
+hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/testem.log
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/dist
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/tmp
yarnregistry.pdf
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[21/50] [abbrv] hadoop git commit: YARN-5779. [YARN-3368] Addendum
patch to document limits/notes of the new YARN UI . (Sunil G via Sreenath
Somarajapuram)
Posted by va...@apache.org.
YARN-5779. [YARN-3368] Addendum patch to document limits/notes of the new YARN UI . (Sunil G via Sreenath Somarajapuram)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6c680322
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6c680322
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6c680322
Branch: refs/heads/YARN-3368_branch2
Commit: 6c6803229160298914c176324bb31c020e33d7aa
Parents: 9ebb57d
Author: Sreenath Somarajapuram <sr...@apache.org>
Authored: Fri Oct 28 18:20:55 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c680322/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
index 9f82031..e7853bf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
@@ -38,6 +38,9 @@ origin (CORS) support.
| `yarn.resourcemanager.webapp.cross-origin.enabled` | true | Enable CORS support for Resource Manager |
| `yarn.nodemanager.webapp.cross-origin.enabled` | true | Enable CORS support for Node Manager |
+Also please ensure that CORS related configurations are enabled in `core-site.xml`.
+Kindly refer [here](https://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-common/HttpAuthentication.html)
+
Use it
-------------
Open your browser, go to `rm-address:8088/ui2` and try it!
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[15/50] [abbrv] hadoop git commit: YARN-5698. [YARN-3368] Launch new
YARN UI under hadoop web app port. (Sunil G via wangda)
Posted by va...@apache.org.
YARN-5698. [YARN-3368] Launch new YARN UI under hadoop web app port. (Sunil G via wangda)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c0c124c2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c0c124c2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c0c124c2
Branch: refs/heads/YARN-3368_branch2
Commit: c0c124c2bf996ca986af02efee57362f7a6835cc
Parents: 8222307
Author: Wangda Tan <wa...@apache.org>
Authored: Wed Oct 12 13:22:20 2016 -0700
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
.../hadoop/yarn/conf/YarnConfiguration.java | 21 ++----
.../org/apache/hadoop/yarn/webapp/WebApps.java | 8 +++
.../src/main/resources/yarn-default.xml | 20 ++----
.../server/resourcemanager/ResourceManager.java | 70 +++++++++++---------
.../src/main/webapp/config/default-config.js | 4 +-
5 files changed, 57 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0c124c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index 224e030..69dd080 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -301,25 +301,12 @@ public class YarnConfiguration extends Configuration {
/**
* Enable YARN WebApp V2.
*/
- public static final String RM_WEBAPP_UI2_ENABLE = RM_PREFIX
+ public static final String YARN_WEBAPP_UI2_ENABLE = "yarn."
+ "webapp.ui2.enable";
- public static final boolean DEFAULT_RM_WEBAPP_UI2_ENABLE = false;
+ public static final boolean DEFAULT_YARN_WEBAPP_UI2_ENABLE = false;
- /** The address of the RM web ui2 application. */
- public static final String RM_WEBAPP_UI2_ADDRESS = RM_PREFIX
- + "webapp.ui2.address";
-
- public static final int DEFAULT_RM_WEBAPP_UI2_PORT = 8288;
- public static final String DEFAULT_RM_WEBAPP_UI2_ADDRESS = "0.0.0.0:" +
- DEFAULT_RM_WEBAPP_UI2_PORT;
-
- /** The https address of the RM web ui2 application.*/
- public static final String RM_WEBAPP_UI2_HTTPS_ADDRESS =
- RM_PREFIX + "webapp.ui2.https.address";
-
- public static final int DEFAULT_RM_WEBAPP_UI2_HTTPS_PORT = 8290;
- public static final String DEFAULT_RM_WEBAPP_UI2_HTTPS_ADDRESS = "0.0.0.0:"
- + DEFAULT_RM_WEBAPP_UI2_HTTPS_PORT;
+ public static final String YARN_WEBAPP_UI2_WARFILE_PATH = "yarn."
+ + "webapp.ui2.war-file-path";
public static final String RM_RESOURCE_TRACKER_ADDRESS =
RM_PREFIX + "resource-tracker.address";
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0c124c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
index 9c96339..0dc6354 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
@@ -44,6 +44,7 @@ import org.apache.hadoop.security.http.RestCsrfPreventionFilter;
import org.apache.hadoop.security.http.XFrameOptionsFilter;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+import org.mortbay.jetty.webapp.WebAppContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -393,8 +394,15 @@ public class WebApps {
}
public WebApp start(WebApp webapp) {
+ return start(webapp, null);
+ }
+
+ public WebApp start(WebApp webapp, WebAppContext ui2Context) {
WebApp webApp = build(webapp);
HttpServer2 httpServer = webApp.httpServer();
+ if (ui2Context != null) {
+ httpServer.addContext(ui2Context, true);
+ }
try {
httpServer.start();
LOG.info("Web app " + name + " started at "
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0c124c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index 159c04b..a5f5698 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -199,28 +199,16 @@
<property>
<description>To enable RM web ui2 application.</description>
- <name>yarn.resourcemanager.webapp.ui2.enable</name>
+ <name>yarn.webapp.ui2.enable</name>
<value>false</value>
</property>
<property>
<description>
- The http address of the RM web ui2 application.
- If only a host is provided as the value,
- the webapp will be served on a random port.
- </description>
- <name>yarn.resourcemanager.webapp.ui2.address</name>
- <value>${yarn.resourcemanager.hostname}:8288</value>
- </property>
-
- <property>
- <description>
- The https address of the RM web ui2 application.
- If only a host is provided as the value,
- the webapp will be served on a random port.
+ Explicitly provide WAR file path for ui2 if needed.
</description>
- <name>yarn.resourcemanager.webapp.ui2.https.address</name>
- <value>${yarn.resourcemanager.hostname}:8290</value>
+ <name>yarn.webapp.ui2.war-file-path</name>
+ <value></value>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0c124c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
index a26bc0c..6c013c6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
@@ -46,6 +46,8 @@ import org.apache.hadoop.util.ReflectionUtils;
import org.apache.hadoop.util.ShutdownHookManager;
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.curator.ZKCuratorManager;
+import org.apache.hadoop.util.VersionInfo;
+import org.apache.hadoop.util.ZKUtil;
import org.apache.hadoop.yarn.YarnUncaughtExceptionHandler;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -110,6 +112,7 @@ import org.apache.hadoop.yarn.webapp.WebApps;
import org.apache.hadoop.yarn.webapp.WebApps.Builder;
import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
import org.apache.zookeeper.server.auth.DigestAuthenticationProvider;
+import org.mortbay.jetty.webapp.WebAppContext;
import java.util.concurrent.atomic.AtomicBoolean;
import com.google.common.annotations.VisibleForTesting;
@@ -118,6 +121,8 @@ import java.io.InputStream;
import java.io.PrintStream;
import java.net.InetSocketAddress;
import java.net.URI;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.nio.charset.Charset;
import java.security.PrivilegedExceptionAction;
import java.security.SecureRandom;
@@ -145,6 +150,11 @@ public class ResourceManager extends CompositeService implements Recoverable {
private static final Log LOG = LogFactory.getLog(ResourceManager.class);
private static long clusterTimeStamp = System.currentTimeMillis();
+ /*
+ * UI2 webapp name
+ */
+ public static final String UI2_WEBAPP_NAME = "/ui2";
+
/**
* "Always On" services. Services that need to run always irrespective of
* the HA state of the RM.
@@ -1037,26 +1047,6 @@ public class ResourceManager extends CompositeService implements Recoverable {
return builder;
}
- protected void startWebAppV2() throws IOException {
- Configuration config = getConfig();
- final InetSocketAddress httpAddr = config.getSocketAddr(
- YarnConfiguration.RM_WEBAPP_UI2_ADDRESS,
- YarnConfiguration.DEFAULT_RM_WEBAPP_UI2_ADDRESS,
- YarnConfiguration.DEFAULT_RM_WEBAPP_UI2_PORT);
- final InetSocketAddress httpsAddr = config.getSocketAddr(
- YarnConfiguration.RM_WEBAPP_UI2_HTTPS_ADDRESS,
- YarnConfiguration.DEFAULT_RM_WEBAPP_UI2_HTTPS_ADDRESS,
- YarnConfiguration.DEFAULT_RM_WEBAPP_UI2_HTTPS_PORT);
-
- HttpServer2.Builder builder = httpServerTemplateForRM(config, httpAddr,
- httpsAddr, "rm");
-
- HttpServer2 infoServer = builder.build();
- infoServer.start();
-
- LOG.info("Web server init done");
- }
-
protected void startWepApp() {
Configuration conf = getConfig();
@@ -1090,7 +1080,35 @@ public class ResourceManager extends CompositeService implements Recoverable {
String[] proxyParts = proxyHostAndPort.split(":");
builder.withAttribute(WebAppProxy.PROXY_HOST_ATTRIBUTE, proxyParts[0]);
}
- webApp = builder.start(new RMWebApp(this));
+
+ WebAppContext uiWebAppContext = null;
+ if (getConfig().getBoolean(YarnConfiguration.YARN_WEBAPP_UI2_ENABLE,
+ YarnConfiguration.DEFAULT_YARN_WEBAPP_UI2_ENABLE)) {
+ String webPath = UI2_WEBAPP_NAME;
+ String onDiskPath = getConfig()
+ .get(YarnConfiguration.YARN_WEBAPP_UI2_WARFILE_PATH);
+
+ if (null == onDiskPath) {
+ String war = "hadoop-yarn-ui-" + VersionInfo.getVersion() + ".war";
+ URLClassLoader cl = (URLClassLoader) ClassLoader.getSystemClassLoader();
+ URL url = cl.findResource(war);
+
+ if (null == url) {
+ onDiskPath = "";
+ } else {
+ onDiskPath = url.getFile();
+ }
+
+ LOG.info(
+ "New web UI war file name:" + war + ", and path:" + onDiskPath);
+ }
+
+ uiWebAppContext = new WebAppContext();
+ uiWebAppContext.setContextPath(webPath);
+ uiWebAppContext.setWar(onDiskPath);
+ }
+
+ webApp = builder.start(new RMWebApp(this), uiWebAppContext);
}
/**
@@ -1192,16 +1210,6 @@ public class ResourceManager extends CompositeService implements Recoverable {
transitionToActive();
}
- if (getConfig().getBoolean(YarnConfiguration.RM_WEBAPP_UI2_ENABLE,
- YarnConfiguration.DEFAULT_RM_WEBAPP_UI2_ENABLE)) {
- try {
- startWebAppV2();
- LOG.info("Yarn WebApp UI 2 is started");
- } catch (Exception e) {
- LOG.error("Failed to start Yarn web app v2:" + e.getMessage());
- }
- }
-
startWepApp();
if (getConfig().getBoolean(YarnConfiguration.IS_MINI_YARN_CLUSTER,
false)) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0c124c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
index 92d0721..c5dbbea 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
@@ -18,7 +18,7 @@
module.exports = { // Yarn UI App configurations
hosts: {
- localBaseAddress: "localhost:1337",
+ localBaseAddress: "",
timelineWebAddress: "localhost:8188",
rmWebAddress: "localhost:8088",
protocolScheme: "http:"
@@ -29,4 +29,4 @@ module.exports = { // Yarn UI App configurations
metrics: 'ws/v1/cluster/metrics',
node: 'ws/v1/node'
},
-};
\ No newline at end of file
+};
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[46/50] [abbrv] hadoop git commit: YARN-6631. Refactor loader.js in
new Yarn UI. Contributed by Akhil P B.
Posted by va...@apache.org.
YARN-6631. Refactor loader.js in new Yarn UI. Contributed by Akhil P B.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/16357413
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/16357413
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/16357413
Branch: refs/heads/YARN-3368_branch2
Commit: 16357413908c8f04a9ebe384fadc502800bc514b
Parents: 6232c3a
Author: Sunil G <su...@apache.org>
Authored: Thu Aug 10 11:53:26 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:49 2017 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/initializers/loader.js | 42 +++++++++-----------
1 file changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/16357413/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
index aa8fb07..55f6e1b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
@@ -20,25 +20,27 @@
import Ember from 'ember';
-function getTimeLineURL() {
- return '/conf?name=yarn.timeline-service.webapp.address';
+function getTimeLineURL(rmhost) {
+ var url = window.location.protocol + '//' +
+ (ENV.hosts.localBaseAddress? ENV.hosts.localBaseAddress + '/' : '') + rmhost;
+
+ url += '/conf?name=yarn.timeline-service.webapp.address';
+ Ember.Logger.log("Get Timeline Address URL: " + url);
+ return url;
}
function updateConfigs(application) {
var hostname = window.location.hostname;
- var rmhost = hostname +
- (window.location.port ? ':' + window.location.port: '');
-
- Ember.Logger.log("RM Address:" + rmhost);
+ var rmhost = hostname + (window.location.port ? ':' + window.location.port: '');
if(!ENV.hosts.rmWebAddress) {
- ENV = {
- hosts: {
- rmWebAddress: rmhost,
- },
- };
+ ENV.hosts.rmWebAddress = rmhost;
+ } else {
+ rmhost = ENV.hosts.rmWebAddress;
}
+ Ember.Logger.log("RM Address: " + rmhost);
+
if(!ENV.hosts.timelineWebAddress) {
var timelinehost = "";
$.ajax({
@@ -46,7 +48,7 @@ function updateConfigs(application) {
dataType: 'json',
async: true,
context: this,
- url: getTimeLineURL(),
+ url: getTimeLineURL(rmhost),
success: function(data) {
timelinehost = data.property.value;
ENV.hosts.timelineWebAddress = timelinehost;
@@ -54,24 +56,18 @@ function updateConfigs(application) {
var address = timelinehost.split(":")[0];
var port = timelinehost.split(":")[1];
- Ember.Logger.log("Timeline Address from RM:" + address + ":" + port);
+ Ember.Logger.log("Timeline Address from RM: " + timelinehost);
if(address === "0.0.0.0" || address === "localhost") {
var updatedAddress = hostname + ":" + port;
-
- /* Timeline v2 is not supporting CORS, so make as default*/
- ENV = {
- hosts: {
- rmWebAddress: rmhost,
- timelineWebAddress: updatedAddress,
- },
- };
- Ember.Logger.log("Timeline Updated Address:" + updatedAddress);
+ ENV.hosts.timelineWebAddress = updatedAddress;
+ Ember.Logger.log("Timeline Updated Address: " + updatedAddress);
}
application.advanceReadiness();
- },
+ }
});
} else {
+ Ember.Logger.log("Timeline Address: " + ENV.hosts.timelineWebAddress);
application.advanceReadiness();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[47/50] [abbrv] hadoop git commit: Updating dependencies to work on
branch-2
Posted by va...@apache.org.
Updating dependencies to work on branch-2
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6232c3ae
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6232c3ae
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6232c3ae
Branch: refs/heads/YARN-3368_branch2
Commit: 6232c3aef34ad2603f7fb9fc9183f94d294b79e0
Parents: 3aa8111
Author: vrushali <vr...@apache.org>
Authored: Tue Oct 10 16:59:38 2017 -0700
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:49 2017 +0530
----------------------------------------------------------------------
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml | 13 +------------
.../hadoop-yarn-ui/src/main/webapp/bower.json | 2 ++
.../hadoop-yarn-ui/src/main/webapp/package.json | 4 ++--
3 files changed, 5 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6232c3ae/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 5f546ef..032a9a2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -129,9 +129,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
<!-- Install Node, Yarn, Bower & dependencies -->
<plugin>
<groupId>com.github.eirslett</groupId>
@@ -171,16 +168,8 @@
<arguments>install</arguments>
</configuration>
<goals>
- <goal>exec</goal>
+ <goal>bower</goal>
</goals>
- <configuration>
- <workingDirectory>${webappTgtDir}</workingDirectory>
- <executable>bower</executable>
- <arguments>
- <argument>--allow-root</argument>
- <argument>install</argument>
- </arguments>
- </configuration>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6232c3ae/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
index fe5f289..e1ab943 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
@@ -12,6 +12,8 @@
"loader.js": "3.3.0",
"qunit": "1.19.0",
"jquery-ui": "1.11.4",
+ "moment": "2.12.0",
+ "moment-timezone": "0.5.0",
"more-js": "0.8.2",
"bootstrap": "3.3.6",
"d3": "~3.5.6",
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6232c3ae/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
index 2b454aa..235233c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
@@ -23,7 +23,7 @@
"bower-shrinkwrap-resolver-ext": "0.1.0",
"broccoli-asset-rev": "2.4.2",
"broccoli-funnel": "1.0.1",
- "em-table": "0.7.0",
+ "broccoli-merge-trees": "1.1.1",
"ember-array-contains-helper": "1.0.2",
"ember-bootstrap": "0.5.1",
"ember-cli": "1.13.14",
@@ -55,7 +55,7 @@
"dependencies": {
"em-helpers": "^0.8.0",
"em-table": "^0.7.0",
- "ember-cli-moment-shim": "^3.0.1",
+ "ember-cli-moment-shim": "0.7.3",
"ember-cli-numeral": "^0.2.0"
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[04/50] [abbrv] hadoop git commit: YARN-5598. [YARN-3368] Fix
create-release to be able to generate bits for the new yarn-ui (Wangda Tan
via Sunil G)
Posted by va...@apache.org.
YARN-5598. [YARN-3368] Fix create-release to be able to generate bits for the new yarn-ui (Wangda Tan via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b428cf89
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b428cf89
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b428cf89
Branch: refs/heads/YARN-3368_branch2
Commit: b428cf8985d727d6e4eb893272471294634aa7a9
Parents: 542f661
Author: sunilg <su...@apache.org>
Authored: Tue Sep 6 23:15:59 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
dev-support/bin/create-release | 2 +-
dev-support/create-release.sh | 144 ------------------------------------
dev-support/docker/Dockerfile | 6 +-
3 files changed, 6 insertions(+), 146 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b428cf89/dev-support/bin/create-release
----------------------------------------------------------------------
diff --git a/dev-support/bin/create-release b/dev-support/bin/create-release
index 8b138e5..39c9133 100755
--- a/dev-support/bin/create-release
+++ b/dev-support/bin/create-release
@@ -541,7 +541,7 @@ function makearelease
# shellcheck disable=SC2046
run_and_redirect "${LOGDIR}/mvn_install.log" \
"${MVN}" "${MVN_ARGS[@]}" install \
- -Pdist,src \
+ -Pdist,src,yarn-ui \
"${signflags[@]}" \
-DskipTests -Dtar $(hadoop_native_flags)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b428cf89/dev-support/create-release.sh
----------------------------------------------------------------------
diff --git a/dev-support/create-release.sh b/dev-support/create-release.sh
deleted file mode 100755
index 792a805..0000000
--- a/dev-support/create-release.sh
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/bash
-# 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.
-
-
-# Function to probe the exit code of the script commands,
-# and stop in the case of failure with an contextual error
-# message.
-run() {
- echo "\$ ${@}"
- "${@}"
- exitCode=$?
- if [[ $exitCode != 0 ]]; then
- echo
- echo "Failed! running ${@} in `pwd`"
- echo
- exit $exitCode
- fi
-}
-
-doMD5() {
- MD5CMD="md5sum"
- which $MD5CMD
- if [[ $? != 0 ]]; then
- MD5CMD="md5"
- fi
- run $MD5CMD ${1} > ${1}.md5
-}
-
-# If provided, the created release artifacts will be tagged with it
-# (use RC#, i.e: RC0). Do not use a label to create the final release
-# artifact.
-RC_LABEL=$1
-
-# Extract Hadoop version from POM
-HADOOP_VERSION=`cat pom.xml | grep "<version>" | head -1 | sed 's|^ *<version>||' | sed 's|</version>.*$||'`
-
-# Setup git
-GIT=${GIT:-git}
-
-echo
-echo "*****************************************************************"
-echo
-echo "Hadoop version to create release artifacts: ${HADOOP_VERSION}"
-echo
-echo "Release Candidate Label: ${RC_LABEL}"
-echo
-echo "*****************************************************************"
-echo
-
-if [[ ! -z ${RC_LABEL} ]]; then
- RC_LABEL="-${RC_LABEL}"
-fi
-
-# Get Maven command
-if [ -z "$MAVEN_HOME" ]; then
- MVN=mvn
-else
- MVN=$MAVEN_HOME/bin/mvn
-fi
-
-ARTIFACTS_DIR="target/artifacts"
-
-# git clean to clear any remnants from previous build
-run ${GIT} clean -xdf
-
-# mvn clean for sanity
-run ${MVN} clean
-
-# Create staging dir for release artifacts
-run mkdir -p ${ARTIFACTS_DIR}
-
-# Create RAT report
-run ${MVN} apache-rat:check
-
-# Create SRC and BIN tarballs for release,
-# Using 'install’ goal instead of 'package' so artifacts are available
-# in the Maven local cache for the site generation
-run ${MVN} install -Pdist,src,native,yarn-ui -DskipTests -Dtar
-
-# Create site for release
-run ${MVN} site site:stage -Pdist -Psrc
-run mkdir -p target/staging/hadoop-project/hadoop-project-dist/hadoop-yarn
-run mkdir -p target/staging/hadoop-project/hadoop-project-dist/hadoop-mapreduce
-run cp ./hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html target/staging/hadoop-project/hadoop-project-dist/hadoop-common/
-run cp ./hadoop-common-project/hadoop-common/CHANGES.txt target/staging/hadoop-project/hadoop-project-dist/hadoop-common/
-run cp ./hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt target/staging/hadoop-project/hadoop-project-dist/hadoop-hdfs/
-run cp ./hadoop-yarn-project/CHANGES.txt target/staging/hadoop-project/hadoop-project-dist/hadoop-yarn/
-run cp ./hadoop-mapreduce-project/CHANGES.txt target/staging/hadoop-project/hadoop-project-dist/hadoop-mapreduce/
-run mv target/staging/hadoop-project target/r${HADOOP_VERSION}/
-run cd target/
-run tar czf hadoop-site-${HADOOP_VERSION}.tar.gz r${HADOOP_VERSION}/*
-run cd ..
-
-# Stage RAT report
-find . -name rat.txt | xargs -I% cat % > ${ARTIFACTS_DIR}/hadoop-${HADOOP_VERSION}${RC_LABEL}-rat.txt
-
-# Stage CHANGES.txt files
-run cp ./hadoop-common-project/hadoop-common/CHANGES.txt ${ARTIFACTS_DIR}/CHANGES-COMMON-${HADOOP_VERSION}${RC_LABEL}.txt
-run cp ./hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ${ARTIFACTS_DIR}/CHANGES-HDFS-${HADOOP_VERSION}${RC_LABEL}.txt
-run cp ./hadoop-mapreduce-project/CHANGES.txt ${ARTIFACTS_DIR}/CHANGES-MAPREDUCE-${HADOOP_VERSION}${RC_LABEL}.txt
-run cp ./hadoop-yarn-project/CHANGES.txt ${ARTIFACTS_DIR}/CHANGES-YARN-${HADOOP_VERSION}${RC_LABEL}.txt
-
-# Prepare and stage BIN tarball
-run cd hadoop-dist/target/
-run tar -xzf hadoop-${HADOOP_VERSION}.tar.gz
-run cp -r ../../target/r${HADOOP_VERSION}/* hadoop-${HADOOP_VERSION}/share/doc/hadoop/
-run tar -czf hadoop-${HADOOP_VERSION}.tar.gz hadoop-${HADOOP_VERSION}
-run cd ../..
-run mv hadoop-dist/target/hadoop-${HADOOP_VERSION}.tar.gz ${ARTIFACTS_DIR}/hadoop-${HADOOP_VERSION}${RC_LABEL}.tar.gz
-
-# Stage SRC tarball
-run mv hadoop-dist/target/hadoop-${HADOOP_VERSION}-src.tar.gz ${ARTIFACTS_DIR}/hadoop-${HADOOP_VERSION}${RC_LABEL}-src.tar.gz
-
-# Stage SITE tarball
-run mv target/hadoop-site-${HADOOP_VERSION}.tar.gz ${ARTIFACTS_DIR}/hadoop-${HADOOP_VERSION}${RC_LABEL}-site.tar.gz
-
-# MD5 SRC and BIN tarballs
-doMD5 ${ARTIFACTS_DIR}/hadoop-${HADOOP_VERSION}${RC_LABEL}.tar.gz
-doMD5 ${ARTIFACTS_DIR}/hadoop-${HADOOP_VERSION}${RC_LABEL}-src.tar.gz
-
-run cd ${ARTIFACTS_DIR}
-ARTIFACTS_DIR=`pwd`
-echo
-echo "Congratulations, you have successfully built the release"
-echo "artifacts for Apache Hadoop ${HADOOP_VERSION}${RC_LABEL}"
-echo
-echo "The artifacts for this run are available at ${ARTIFACTS_DIR}:"
-run ls -1 ${ARTIFACTS_DIR}
-echo
-echo "Remember to sign them before staging them on the open"
-echo
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b428cf89/dev-support/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 706ddb0..6bba5a8 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -129,7 +129,11 @@ ENV MAVEN_OPTS -Xms256m -Xmx512m
###
# Install node js tools for web UI frameowkr
###
-RUN apt-get -y install nodejs && ln -s /usr/bin/nodejs /usr/bin/node && apt-get -y install npm && npm install -g bower
+RUN apt-get -y install nodejs && \
+ ln -s /usr/bin/nodejs /usr/bin/node && \
+ apt-get -y install npm && \
+ npm install -g bower && \
+ npm install -g ember-cli
###
# Everything past this point is either not needed for testing or breaks Yetus.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[39/50] [abbrv] hadoop git commit: YARN-5705. Show timeline data from
ATS v2 in new web UI. Contributed by Akhil PB.
Posted by va...@apache.org.
YARN-5705. Show timeline data from ATS v2 in new web 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/dd40f6f0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd40f6f0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd40f6f0
Branch: refs/heads/YARN-3368_branch2
Commit: dd40f6f0cc3c6cade4143a9fa772dce868f9be99
Parents: 458ba54
Author: Sunil G <su...@apache.org>
Authored: Sun May 21 18:09:13 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:49 2017 +0530
----------------------------------------------------------------------
.../webapp/app/adapters/yarn-app-attempt.js | 4 +-
.../webapp/app/adapters/yarn-app-flowrun.js | 33 +++
.../webapp/app/adapters/yarn-app-timeline.js | 35 +++
.../main/webapp/app/adapters/yarn-container.js | 18 +-
.../src/main/webapp/app/adapters/yarn-entity.js | 35 +++
.../webapp/app/adapters/yarn-flow-activity.js | 30 +++
.../webapp/app/adapters/yarn-flowrun-brief.js | 32 +++
.../main/webapp/app/adapters/yarn-flowrun.js | 38 +++
.../app/adapters/yarn-timeline-appattempt.js | 41 +++
.../app/adapters/yarn-timeline-container.js | 40 +++
.../main/webapp/app/components/nodes-heatmap.js | 18 +-
.../webapp/app/components/simple-bar-chart.js | 206 +++++++++++++++
.../webapp/app/components/sunburst-chart.js | 261 +++++++++++++++++++
.../webapp/app/controllers/yarn-apps/apps.js | 1 -
.../app/controllers/yarn-apps/services.js | 1 -
.../app/controllers/yarn-flow-activity.js | 125 +++++++++
.../main/webapp/app/controllers/yarn-flow.js | 36 +++
.../webapp/app/controllers/yarn-flow/info.js | 66 +++++
.../webapp/app/controllers/yarn-flow/runs.js | 178 +++++++++++++
.../main/webapp/app/controllers/yarn-flowrun.js | 50 ++++
.../webapp/app/controllers/yarn-flowrun/info.js | 157 +++++++++++
.../app/controllers/yarn-flowrun/metrics.js | 126 +++++++++
.../webapp/app/controllers/yarn-services.js | 12 +-
.../src/main/webapp/app/mixins/app-attempt.js | 66 +++++
.../main/webapp/app/models/yarn-app-attempt.js | 11 +-
.../main/webapp/app/models/yarn-app-flowrun.js | 52 ++++
.../main/webapp/app/models/yarn-app-timeline.js | 105 ++++++++
.../main/webapp/app/models/yarn-container.js | 9 +-
.../src/main/webapp/app/models/yarn-entity.js | 26 ++
.../webapp/app/models/yarn-flow-activity.js | 28 ++
.../webapp/app/models/yarn-flowrun-brief.js | 70 +++++
.../src/main/webapp/app/models/yarn-flowrun.js | 32 +++
.../app/models/yarn-timeline-appattempt.js | 143 ++++++++++
.../app/models/yarn-timeline-container.js | 63 +++++
.../src/main/webapp/app/router.js | 12 +
.../main/webapp/app/routes/timeline-error.js | 29 +++
.../main/webapp/app/routes/yarn-app-attempt.js | 32 +--
.../main/webapp/app/routes/yarn-app-attempts.js | 13 +-
.../src/main/webapp/app/routes/yarn-app.js | 18 +-
.../webapp/app/routes/yarn-flow-activity.js | 37 +++
.../src/main/webapp/app/routes/yarn-flow.js | 53 ++++
.../main/webapp/app/routes/yarn-flow/info.js | 22 ++
.../main/webapp/app/routes/yarn-flow/runs.js | 22 ++
.../webapp/app/routes/yarn-flowrun-metric.js | 107 ++++++++
.../src/main/webapp/app/routes/yarn-flowrun.js | 58 +++++
.../main/webapp/app/routes/yarn-flowrun/info.js | 22 ++
.../webapp/app/routes/yarn-flowrun/metrics.js | 22 ++
.../webapp/app/serializers/yarn-app-flowrun.js | 64 +++++
.../webapp/app/serializers/yarn-app-timeline.js | 76 ++++++
.../src/main/webapp/app/serializers/yarn-app.js | 3 +-
.../main/webapp/app/serializers/yarn-entity.js | 51 ++++
.../app/serializers/yarn-flow-activity.js | 54 ++++
.../app/serializers/yarn-flowrun-brief.js | 64 +++++
.../main/webapp/app/serializers/yarn-flowrun.js | 63 +++++
.../main/webapp/app/serializers/yarn-queue.js | 22 +-
.../app/serializers/yarn-timeline-appattempt.js | 69 +++++
.../app/serializers/yarn-timeline-container.js | 71 +++++
.../src/main/webapp/app/styles/app.css | 83 ++++++
.../main/webapp/app/templates/application.hbs | 6 +-
.../webapp/app/templates/timeline-error.hbs | 22 ++
.../webapp/app/templates/yarn-app-attempt.hbs | 46 ++--
.../webapp/app/templates/yarn-app-attempts.hbs | 7 +-
.../src/main/webapp/app/templates/yarn-app.hbs | 51 +---
.../src/main/webapp/app/templates/yarn-apps.hbs | 4 +-
.../webapp/app/templates/yarn-flow-activity.hbs | 45 ++++
.../src/main/webapp/app/templates/yarn-flow.hbs | 49 ++++
.../webapp/app/templates/yarn-flow/info.hbs | 53 ++++
.../webapp/app/templates/yarn-flow/runs.hbs | 131 ++++++++++
.../app/templates/yarn-flowrun-metric.hbs | 34 +++
.../main/webapp/app/templates/yarn-flowrun.hbs | 49 ++++
.../webapp/app/templates/yarn-flowrun/info.hbs | 128 +++++++++
.../app/templates/yarn-flowrun/metrics.hbs | 34 +++
.../main/webapp/app/templates/yarn-services.hbs | 2 +-
.../src/main/webapp/app/utils/converter.js | 22 +-
.../src/main/webapp/app/utils/error-utils.js | 58 +++++
.../src/main/webapp/config/default-config.js | 3 +-
.../hadoop-yarn-ui/src/main/webapp/package.json | 1 +
.../components/simple-bar-chart-test.js | 43 +++
.../unit/adapters/yarn-app-timeline-test.js | 30 +++
.../adapters/yarn-timeline-appattempt-test.js | 30 +++
.../adapters/yarn-timeline-container-test.js | 30 +++
.../unit/controllers/yarn-flow/info-test.js | 30 +++
.../unit/controllers/yarn-flow/runs-test.js | 30 +++
.../unit/controllers/yarn-flowrun/info-test.js | 30 +++
.../controllers/yarn-flowrun/metrics-test.js | 30 +++
.../tests/unit/mixins/app-attempt-test.js | 30 +++
.../webapp/tests/unit/mixins/charts-test.js | 30 ---
.../tests/unit/models/yarn-app-timeline-test.js | 30 +++
.../models/yarn-timeline-appattempt-test.js | 30 +++
.../unit/models/yarn-timeline-container-test.js | 30 +++
.../tests/unit/routes/timeline-error-test.js | 29 +++
.../tests/unit/routes/yarn-flow/info-test.js | 29 +++
.../tests/unit/routes/yarn-flow/runs-test.js | 29 +++
.../tests/unit/routes/yarn-flowrun/info-test.js | 29 +++
.../unit/routes/yarn-flowrun/metrics-test.js | 29 +++
.../unit/serializers/yarn-app-timeline-test.js | 33 +++
.../yarn-timeline-appattempt-test.js | 33 +++
.../serializers/yarn-timeline-container-test.js | 33 +++
98 files changed, 4408 insertions(+), 199 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
index 2389f16..d5f3d0c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
@@ -26,7 +26,9 @@ export default AbstractAdapter.extend({
urlForQuery(query/*, modelName*/) {
var url = this._buildURL();
- return url + '/apps/' + query.appId + "/appattempts";
+ var appId = query.appId;
+ delete query.appId;
+ return url + '/apps/' + appId + "/appattempts";
},
urlForFindRecord(id/*, modelName, snapshot*/) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-flowrun.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-flowrun.js
new file mode 100644
index 0000000..23ecd1b
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-flowrun.js
@@ -0,0 +1,33 @@
+/**
+ * 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.
+ */
+
+import AbstractAdapter from './abstract';
+
+export default AbstractAdapter.extend({
+ address: "timelineWebAddress",
+ restNameSpace: "timelineV2",
+ serverName: "ATS",
+
+ urlForQuery(query/*, modelName*/){
+ var url = this._buildURL();
+ var flowrunUid = query['flowrunUid'];
+ delete query.flowrunUid;
+ url = url + '/run-uid/' + flowrunUid + '/apps?fields=ALL';
+ return url;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-timeline.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-timeline.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-timeline.js
new file mode 100644
index 0000000..831649c
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-timeline.js
@@ -0,0 +1,35 @@
+/**
+ * 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.
+ */
+
+import AbstractAdapter from './abstract';
+
+export default AbstractAdapter.extend({
+ address: "timelineWebAddress",
+ restNameSpace: "timelineV2",
+ serverName: "ATS",
+
+ urlForFindRecord(id/*, modelName, snapshot*/) {
+ var url = this._buildURL();
+ url = url + '/apps/' + id + '?fields=ALL';
+ return url;
+ },
+
+ pathForType(/*modelName*/) {
+ return 'apps';
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
index 348a805..476c9be 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
@@ -25,31 +25,17 @@ export default DS.JSONAPIAdapter.extend({
},
host: function() {
- return undefined;
+ return this.get(`hosts.rmWebAddress`);
}.property(),
namespace: function() {
- return undefined;
+ return this.get(`env.app.namespaces.cluster`);
}.property(),
urlForQuery(query/*, modelName*/) {
- var rmHosts = this.get(`hosts.rmWebAddress`);
- var tsHosts = this.get(`hosts.timelineWebAddress`);
- var rmNamespaces = this.get(`env.app.namespaces.cluster`);
- var tsNamespaces = this.get(`env.app.namespaces.timeline`);
-
- if (query.is_rm) {
- this.set("host", rmHosts);
- this.set("namespace", rmNamespaces);
- } else {
- this.set("host", tsHosts);
- this.set("namespace", tsNamespaces);
- }
-
var url = this._buildURL();
url = url + '/apps/' + Converter.attemptIdToAppId(query.app_attempt_id) +
"/appattempts/" + query.app_attempt_id + "/containers";
- console.log(url);
return url;
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-entity.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-entity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-entity.js
new file mode 100644
index 0000000..3d7338f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-entity.js
@@ -0,0 +1,35 @@
+/**
+ * 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.
+ */
+
+import AbstractAdapter from './abstract';
+
+export default AbstractAdapter.extend({
+ address: "timelineWebAddress",
+ restNameSpace: "timelineV2",
+ serverName: "ATS",
+
+ urlForQuery(query/*, modelName*/){
+ var url = this._buildURL();
+ var appUid = query.app_uid;
+ var entityType = query.entity_type;
+ delete query.app_uid;
+ delete query.entity_type;
+ url = url + '/app-uid/' + appUid + '/entities/' + entityType + '?fields=INFO';
+ return url;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flow-activity.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flow-activity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flow-activity.js
new file mode 100644
index 0000000..a8c436a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flow-activity.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+
+import AbstractAdapter from './abstract';
+
+export default AbstractAdapter.extend({
+ address: "timelineWebAddress",
+ restNameSpace: "timelineV2",
+ serverName: "ATS",
+
+ pathForType(/*modelName*/) {
+ return 'flows'; // move to some common place, return path by modelname.
+ },
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun-brief.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun-brief.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun-brief.js
new file mode 100644
index 0000000..ea9c6cb
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun-brief.js
@@ -0,0 +1,32 @@
+/**
+ * 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.
+ */
+
+import AbstractAdapter from './abstract';
+
+export default AbstractAdapter.extend({
+ address: "timelineWebAddress",
+ restNameSpace: "timelineV2",
+ serverName: "ATS",
+
+ urlForQuery(query/*, modelName*/){
+ var url = this._buildURL();
+ var flowuid = query['flowuid'];
+ delete query.flowuid;
+ return url + '/flow-uid/' + flowuid + '/runs?fields=ALL';
+ },
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun.js
new file mode 100644
index 0000000..9163c83
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun.js
@@ -0,0 +1,38 @@
+/**
+ * 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.
+ */
+
+
+import AbstractAdapter from './abstract';
+
+export default AbstractAdapter.extend({
+ address: "timelineWebAddress",
+ restNameSpace: "timelineV2",
+ serverName: "ATS",
+
+ urlForQueryRecord(query/*, modelName*/){
+ var url = this._buildURL();
+ var flowrunuid = query.flowrun_uid;
+ delete query.flowrun_uid;
+ url = url + '/run-uid/' + flowrunuid;
+ return url;
+ },
+
+ pathForType(/*modelName*/) {
+ return 'run-uid'; // move to some common place, return path by modelname.
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-appattempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-appattempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-appattempt.js
new file mode 100644
index 0000000..2557a86
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-appattempt.js
@@ -0,0 +1,41 @@
+/**
+ * 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.
+ */
+
+import AbstractAdapter from './abstract';
+import Converter from 'yarn-ui/utils/converter';
+
+export default AbstractAdapter.extend({
+ address: "timelineWebAddress",
+ restNameSpace: "timelineV2",
+ serverName: "ATS",
+
+ urlForQuery(query/*, modelName*/) {
+ var url = this._buildURL();
+ var appId = query.appId;
+ query.fields = 'ALL';
+ delete query.appId;
+ return url + '/apps/' + appId + "/entities/YARN_APPLICATION_ATTEMPT";
+ },
+
+ urlForFindRecord(id/*, modelName, snapshot*/) {
+ var url = this._buildURL();
+ return url + '/apps/' + Converter.attemptIdToAppId(id) +
+ "/entities/YARN_APPLICATION_ATTEMPT/" + id + "?fields=ALL";
+ }
+
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-container.js
new file mode 100644
index 0000000..f47335a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-container.js
@@ -0,0 +1,40 @@
+/**
+ * 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.
+ */
+
+import AbstractAdapter from './abstract';
+import Converter from 'yarn-ui/utils/converter';
+
+export default AbstractAdapter.extend({
+ address: "timelineWebAddress",
+ restNameSpace: "timelineV2",
+ serverName: "ATS",
+
+ urlForQuery(query/*, modelName*/){
+ var url = this._buildURL();
+ var app_attempt_id = query.app_attempt_id;
+ query.fields = 'ALL';
+ delete query.app_attempt_id;
+ url = url + '/apps/' + Converter.attemptIdToAppId(app_attempt_id) +
+ '/entities/YARN_CONTAINER';
+ return url;
+ },
+
+ pathForType(/*modelName*/) {
+ return '';
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
index ef6e46e..3acc5de 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
@@ -52,7 +52,7 @@ export default BaseChartComponent.extend({
bindSelectCategory: function(element, i) {
element.on("click", function() {
- if (this.selectedCategory == i) {
+ if (this.selectedCategory === i) {
// Remove selection for second click
this.selectedCategory = 0;
} else {
@@ -76,7 +76,7 @@ export default BaseChartComponent.extend({
}
var usage = node.get("usedMemoryMB") /
- (node.get("usedMemoryMB") + node.get("availMemoryMB"))
+ (node.get("usedMemoryMB") + node.get("availMemoryMB"));
var lowerLimit = (this.selectedCategory - 1) * 0.2;
var upperLimit = this.selectedCategory * 0.2;
if (lowerLimit <= usage && usage <= upperLimit) {
@@ -116,6 +116,7 @@ export default BaseChartComponent.extend({
var sampleXOffset = (layout.x2 - layout.x1) / 2 - 2.5 * this.SAMPLE_CELL_WIDTH -
2 * this.CELL_MARGIN;
var sampleYOffset = layout.margin * 2;
+ var text;
for (i = 1; i <= 5; i++) {
var ratio = i * 0.2 - 0.1;
@@ -128,7 +129,7 @@ export default BaseChartComponent.extend({
.attr("height", this.SAMPLE_HEIGHT)
.attr("class", "hyperlink");
this.bindSelectCategory(rect, i);
- var text = g.append("text")
+ text = g.append("text")
.text("" + (ratio * 100).toFixed(1) + "% Used")
.attr("y", sampleYOffset + this.SAMPLE_HEIGHT / 2 + 5)
.attr("x", sampleXOffset + this.SAMPLE_CELL_WIDTH / 2)
@@ -137,8 +138,8 @@ export default BaseChartComponent.extend({
sampleXOffset += this.CELL_MARGIN + this.SAMPLE_CELL_WIDTH;
}
- if (this.selectedCategory != 0) {
- var text = g.append("text")
+ if (this.selectedCategory !== 0) {
+ text = g.append("text")
.text("Clear")
.attr("y", sampleYOffset + this.SAMPLE_HEIGHT / 2 + 5)
.attr("x", sampleXOffset + 20)
@@ -149,7 +150,7 @@ export default BaseChartComponent.extend({
var chartXOffset = -1;
for (i = 0; i < racksArray.length; i++) {
- var text = g.append("text")
+ text = g.append("text")
.text(racksArray[i])
.attr("y", yOffset + this.CELL_HEIGHT / 2 + 5)
.attr("x", layout.margin)
@@ -163,7 +164,6 @@ export default BaseChartComponent.extend({
for (var j = 0; j < data.length; j++) {
var rack = data[j].get("rack");
- var host = data[j].get("nodeHostName");
if (rack === racksArray[i]) {
this.addNode(g, xOffset, yOffset, colorFunc, data[j]);
@@ -217,11 +217,11 @@ export default BaseChartComponent.extend({
href = `#/yarn-node/${node_id}/${node_addr}`;
var a = g.append("a")
.attr("href", href);
- var text = a.append("text")
+ a.append("text")
.text(data.get("nodeHostName"))
.attr("y", yOffset + this.CELL_HEIGHT / 2 + 5)
.attr("x", xOffset + this.CELL_WIDTH / 2)
- .attr("class", this.isNodeSelected(data) ? "heatmap-cell" : "heatmap-cell-notselected")
+ .attr("class", this.isNodeSelected(data) ? "heatmap-cell" : "heatmap-cell-notselected");
if (this.isNodeSelected(data)) {
this.bindTP(a, rect);
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-bar-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-bar-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-bar-chart.js
new file mode 100644
index 0000000..8527e91
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-bar-chart.js
@@ -0,0 +1,206 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+ data: [],
+ xAxisTickFormatter: null,
+ yAxisTickFormatter: null,
+ xAxisText: '',
+ yAxisText: '',
+ enableTooltip: true,
+ onBarChartClickCallback: Ember.K,
+ hideTootlipOnBarChartClick: true,
+
+ initChart() {
+ this.height = 400;
+ this.barWidth = 30;
+ this.width = Math.max(500, 40 * this.data.length);
+ },
+
+ drawChart() {
+ var margin = {top: 20, right: 20, bottom: 100, left: 100},
+ axisLabelPadding = 10,
+ width = this.width - margin.left - margin.right - axisLabelPadding,
+ height = this.height - margin.top - margin.bottom - axisLabelPadding,
+ xAxisText = this.xAxisText? this.xAxisText : '',
+ yAxisText = this.yAxisText? this.yAxisText : '',
+ data = this.data,
+ self = this;
+
+ var xScale = d3.scale.ordinal().rangeRoundBands([0, width], 0.1);
+ var yScale = d3.scale.linear().range([height, 0]);
+
+ var xAxis = d3.svg.axis()
+ .scale(xScale)
+ .orient("bottom")
+ .tickFormat(function(tick) {
+ if (self.isFunction(self.xAxisTickFormatter)) {
+ return self.xAxisTickFormatter(tick);
+ } else {
+ return tick;
+ }
+ });
+
+ var yAxis = d3.svg.axis()
+ .scale(yScale)
+ .orient("left")
+ .tickFormat(function(tick) {
+ if (self.isFunction(self.yAxisTickFormatter)) {
+ return self.yAxisTickFormatter(tick);
+ } else {
+ return tick;
+ }
+ });
+
+ var svg = d3.select(this.element)
+ .append("svg")
+ .attr("class", "simple-bar-chart")
+ .attr("width", width + margin.left + margin.right + axisLabelPadding)
+ .attr("height", height + margin.top + margin.bottom + axisLabelPadding)
+ .append("g")
+ .attr("transform", "translate("+(margin.left+axisLabelPadding)+","+(margin.top)+")");
+
+ xScale.domain(data.map(function(d) { return d.label; }));
+ yScale.domain([0, d3.max(data, function(d) { return d.value; })]);
+
+ var gx = svg.append("g")
+ .attr("class", "x axis")
+ .attr("transform", "translate(0," + height + ")")
+ .call(xAxis);
+
+ gx.selectAll("text")
+ .style("text-anchor", "end")
+ .attr("dx", "-.8em")
+ .attr("dy", "-.3em")
+ .attr("transform", "rotate(-60)");
+
+ gx.append("text")
+ .attr("transform", "translate("+(width/2)+","+(margin.bottom)+")")
+ .style("text-anchor", "middle")
+ .text(xAxisText);
+
+ var gy = svg.append("g")
+ .attr("class", "y axis")
+ .call(yAxis);
+
+ gy.append("text")
+ .attr("transform", "translate("+(-margin.left)+","+(height/2)+")rotate(-90)")
+ .style("text-anchor", "middle")
+ .text(yAxisText);
+
+ var barWidth = this.barWidth;
+ var minBarWidth = Math.min(barWidth, xScale.rangeBand());
+ var bars = svg.selectAll("bar")
+ .data(data)
+ .enter().append("rect")
+ .attr("x", function(d) {
+ var padding = 0;
+ var rangeBand = xScale.rangeBand();
+ if ((rangeBand - barWidth) > 0) {
+ padding = (rangeBand - barWidth) / 2;
+ }
+ return xScale(d.label) + padding;
+ })
+ .attr("width", minBarWidth)
+ .attr("y", function() {
+ return yScale(0);
+ })
+ .attr("height", function() {
+ return height - yScale(0);
+ })
+ .on('click', function(d) {
+ if (self.enableTooltip && self.hideTootlipOnBarChartClick) {
+ self.hideTootlip();
+ }
+ if (self.isFunction(self.onBarChartClickCallback)) {
+ self.onBarChartClickCallback(d);
+ }
+ });
+
+ bars.transition()
+ .duration(1000)
+ .delay(100)
+ .attr("y", function(d) {
+ return yScale(d.value);
+ })
+ .attr("height", function(d) {
+ return height - yScale(d.value);
+ });
+
+ if (this.enableTooltip) {
+ this.bindTooltip(bars);
+ }
+ },
+
+ bindTooltip(bars) {
+ var self = this;
+ var tooltip = this.tooltip;
+ if (tooltip) {
+ bars.on("mouseenter", function(d) {
+ tooltip.html(d.tooltip);
+ self.showTooltip();
+ }).on("mousemove", function() {
+ tooltip.style("left", (d3.event.pageX + 5) + "px")
+ .style("top", (d3.event.pageY - 25) + "px");
+ }).on("mouseout", function() {
+ self.hideTootlip();
+ });
+ }
+ },
+
+ initTooltip() {
+ this.tooltip = d3.select("body")
+ .append("div")
+ .attr("class", "tooltip simple-barchart-tooltip")
+ .style("opacity", 1);
+
+ this.hideTootlip();
+ },
+
+ hideTootlip() {
+ if (this.tooltip) {
+ this.tooltip.style("display", "none");
+ }
+ },
+
+ showTooltip() {
+ if (this.tooltip) {
+ this.tooltip.style("display", "block");
+ }
+ },
+
+ isFunction(func) {
+ return Ember.typeOf(func) === "function";
+ },
+
+ didInsertElement() {
+ this.initChart();
+ if (this.enableTooltip) {
+ this.initTooltip();
+ }
+ this.drawChart();
+ },
+
+ willDestroyElement() {
+ if (this.tooltip) {
+ this.tooltip.remove();
+ }
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/sunburst-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/sunburst-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/sunburst-chart.js
new file mode 100644
index 0000000..3a2302a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/sunburst-chart.js
@@ -0,0 +1,261 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+
+ didInsertElement: function() {
+ var json = buildHierarchy(this.get("arr"));
+ createVisualization(json);
+ },
+
+});
+// Dimensions of sunburst.
+var width = 1000;
+var height = 750;
+var radius = Math.min(width, height) / 2;
+// Breadcrumb dimensions: width, height, spacing, width of tip/tail.
+var b = { w: 225, h: 30, s: 3, t: 10 };
+// Total size of all segments; we set this later, after loading the data.
+var totalSize = 0;
+var vis = null;
+var partition = null;
+var arc = null;
+var colors = d3.scale.category20c();
+
+function colorMap(d) {
+ return colors(d.name);
+}
+
+// Given a node in a partition layout, return an array of all of its ancestor
+// nodes, highest first, but excluding the root.
+function getAncestors(node) {
+ var path = [];
+ var current = node;
+ while (current.parent) {
+ path.unshift(current);
+ current = current.parent;
+ }
+ return path;
+}
+
+// Main function to draw and set up the visualization, once we have the data.
+function createVisualization(json) {
+ partition = d3.layout.partition()
+ .size([2 * Math.PI, radius * radius])
+ .value(function(d) { return d.size; });
+ arc = d3.svg.arc()
+ .startAngle(function(d) { return d.x; })
+ .endAngle(function(d) { return d.x + d.dx; })
+ .innerRadius(function(d) { return Math.sqrt(d.y); })
+ .outerRadius(function(d) { return Math.sqrt(d.y + d.dy); });
+ // Basic setup of page elements.
+ initializeBreadcrumbTrail();
+ //drawLegend();
+ //d3.select("#togglelegend").on("click", toggleLegend);
+
+ // Bounding circle underneath the sunburst, to make it easier to detect
+ // when the mouse leaves the parent g.
+ vis = d3.select("#chart").append("svg:svg")
+ .attr("width", width)
+ .attr("height", height)
+ .append("svg:g")
+ .attr("id", "container")
+ .attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
+ vis.append("svg:circle").attr("r", radius)
+ .style("opacity", 0);
+
+ // For efficiency, filter nodes to keep only those large enough to see.
+ var nodes = partition.nodes(json)
+ .filter(function(d) {
+ return (d.dx > 0.005); // 0.005 radians = 0.29 degrees
+ });
+
+ var path = vis.data([json]).selectAll("path")
+ .data(nodes)
+ .enter().append("svg:path")
+ .attr("display", function(d) { return d.depth ? null : "none"; })
+ .attr("d", arc)
+ .attr("fill-rule", "evenodd")
+ .attr("fill", colorMap)
+ .style("opacity", 1)
+ .on("mouseover", mouseover);
+ // Add the mouseleave handler to the bounding circle.
+ d3.select("#container").on("mouseleave", mouseleave);
+
+ // Get total size of the tree = value of root node from partition.
+ totalSize = path.node().__data__.value;
+}
+
+ // Take a 2-column CSV and transform it into a hierarchical structure suitable
+ // for a partition layout. The first column is a sequence of step names, from
+ // root to leaf, separated by hyphens. The second column is a count of how
+ // often that sequence occurred.
+function buildHierarchy(csv) {
+ var root = {"name": "root", "children": []};
+ for (var i = 0; i < csv.length; i++) {
+ var sequence = csv[i][0];
+ var size = +csv[i][1];
+ if (isNaN(size)) { // e.g. if this is a header row
+ continue;
+ }
+ var parts = sequence.split("-");
+ var currentNode = root;
+ for (var j = 0; j < parts.length; j++) {
+ var children = currentNode["children"];
+ var nodeName = parts[j];
+ var childNode;
+ if (j + 1 < parts.length) {
+ // Not yet at the end of the sequence; move down the tree.
+ var foundChild = false;
+ for (var k = 0; k < children.length; k++) {
+ if (children[k]["name"] === nodeName) {
+ childNode = children[k];
+ foundChild = true;
+ break;
+ }
+ }
+ // If we don't already have a child node for this branch, create it.
+ if (!foundChild) {
+ childNode = {"name": nodeName, "children": []};
+ children.push(childNode);
+ }
+ currentNode = childNode;
+ } else {
+ // Reached the end of the sequence; create a leaf node.
+ childNode = {"name": nodeName, "size": size, "children": [], "sequence": sequence};
+ children.push(childNode);
+ }
+ }
+ }
+ return root;
+}
+
+// Fade all but the current sequence, and show it in the breadcrumb trail.
+function mouseover(d) {
+ //var percentage = (100 * d.value / totalSize).toPrecision(3);
+ //var percentageString = percentage + "%";
+ var percentageString = d.value;
+
+ d3.select("#percentage").html('<p align="center" style="font-size: 150%;"><b>' + percentageString +
+ '</b></p><br/><p align="center">(' + d.name + ')</p>');
+ d3.select("#explanation").style("visibility", "");
+
+ var sequenceArray = getAncestors(d);
+ updateBreadcrumbs(sequenceArray, percentageString);
+
+ // Fade all the segments.
+ d3.selectAll("path").style("opacity", 0.2);
+
+ // Then highlight only those that are an ancestor of the current segment.
+ vis.selectAll("path")
+ .filter(function(node) {
+ return (sequenceArray.indexOf(node) >= 0);
+ })
+ .style("opacity", 1);
+}
+
+// Restore everything to full opacity when moving off the visualization.
+function mouseleave() {
+ // Hide the breadcrumb trail
+ d3.select("#trail").style("visibility", "hidden");
+
+ // Deactivate all segments during transition.
+ d3.selectAll("path").on("mouseover", null);
+
+ // Transition each segment to full opacity and then reactivate it.
+ d3.selectAll("path")
+ .transition()
+ .duration(1000)
+ .style("opacity", 1)
+ .each("end", function() {
+ d3.select(this).on("mouseover", mouseover);
+ });
+
+ d3.select("#explanation")
+ .style("visibility", "hidden");
+}
+
+function initializeBreadcrumbTrail() {
+ // Add the svg area.
+ var trail = d3.select("#sequence").append("svg:svg")
+ .attr("width", width)
+ .attr("height", 50)
+ .attr("id", "trail");
+ // Add the label at the end, for the percentage.
+ trail.append("svg:text")
+ .attr("id", "endlabel")
+ .style("fill", "#000");
+}
+
+// Generate a string that describes the points of a breadcrumb polygon.
+function breadcrumbPoints(d, i) {
+ var points = [];
+ points.push("0,0");
+ points.push(b.w + ",0");
+ points.push(b.w + b.t + "," + (b.h / 2));
+ points.push(b.w + "," + b.h);
+ points.push("0," + b.h);
+ if (i > 0) { // Leftmost breadcrumb; don't include 6th vertex.
+ points.push(b.t + "," + (b.h / 2));
+ }
+ return points.join(" ");
+}
+
+// Update the breadcrumb trail to show the current sequence and percentage.
+function updateBreadcrumbs(nodeArray, percentageString) {
+ // Data join; key function combines name and depth (= position in sequence).
+ var g = d3.select("#trail")
+ .selectAll("g")
+ .data(nodeArray, function(d) { return d.name + d.depth; });
+
+ // Add breadcrumb and label for entering nodes.
+ var entering = g.enter().append("svg:g");
+
+ entering.append("svg:polygon")
+ .attr("points", breadcrumbPoints)
+ .attr("fill", colorMap);
+
+ entering.append("svg:text")
+ .attr("x", (b.w + b.t) / 2)
+ .attr("y", b.h / 2)
+ .attr("dy", "0.35em")
+ .attr("text-anchor", "middle")
+ .text(function(d) { return d.name; });
+
+ // Set position for entering and updating nodes.
+ g.attr("transform", function(d, i) {
+ return "translate(" + i * (b.w + b.s) + ", 0)";
+ });
+
+ // Remove exiting nodes.
+ g.exit().remove();
+
+ // Now move and update the percentage at the end.
+ d3.select("#trail").select("#endlabel")
+ .attr("x", (nodeArray.length + 0.5) * (b.w + b.s))
+ .attr("y", b.h / 2)
+ .attr("dy", "0.35em")
+ .attr("text-anchor", "middle")
+ .text(percentageString);
+
+ // Make the breadcrumb trail visible, if it's hidden.
+ d3.select("#trail")
+ .style("visibility", "");
+}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
index 44a7c1c..fffaf17 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
@@ -17,7 +17,6 @@
*/
import Ember from 'ember';
-import ColumnDef from 'em-table/utils/column-definition';
import TableDefinition from 'em-table/utils/table-definition';
import AppTableController from '../app-table-columns';
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
index 44a7c1c..fffaf17 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
@@ -17,7 +17,6 @@
*/
import Ember from 'ember';
-import ColumnDef from 'em-table/utils/column-definition';
import TableDefinition from 'em-table/utils/table-definition';
import AppTableController from '../app-table-columns';
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow-activity.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow-activity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow-activity.js
new file mode 100644
index 0000000..61e7823
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow-activity.js
@@ -0,0 +1,125 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import TableDef from 'em-table/utils/table-definition';
+import ColumnDef from 'em-table/utils/column-definition';
+import lodash from 'lodash/lodash';
+
+function _createColumns() {
+ var columns = [];
+ columns.push({
+ id: 'flowName',
+ headerTitle: 'Flow Name',
+ contentPath: 'flowName',
+ observePath: true,
+ }, {
+ id: 'user',
+ headerTitle: 'User',
+ contentPath: 'user',
+ observePath: true
+ }, {
+ id: 'uid',
+ headerTitle: 'Flow ID',
+ contentPath: 'uid',
+ observePath: true,
+ cellComponentName: 'em-table-linked-cell',
+ minWidth: "300px",
+ getCellContent: function (row) {
+ return {
+ routeName: 'yarn-flow.info',
+ id: row.get('uid'),
+ displayText: row.get('uid')
+ };
+ }
+ }, {
+ id: 'lastExecDate',
+ headerTitle: 'Last Execution Date',
+ contentPath: 'lastExecDate',
+ observePath: true
+ });
+ return ColumnDef.make(columns);
+}
+
+function _getAggregatedFlowsData(flows) {
+ var aggregatedFlows = [];
+ flows = flows? flows.get('content') : [];
+
+ var aggregated = lodash.groupBy(flows, function(flow) {
+ return flow.getRecord().get('uid');
+ });
+
+ lodash.forIn(aggregated, function(flows) {
+ let flowsInAsc = lodash.sortBy(flows, function(flow) {
+ return flow.getRecord().get('lastExecDate');
+ });
+ let flowsInDesc = flowsInAsc.reverse();
+ aggregatedFlows.push(flowsInDesc[0].getRecord());
+ });
+
+ return aggregatedFlows;
+}
+
+function _createRows(flows) {
+ var data = [],
+ aggregatedFlows = null,
+ row = null;
+
+ aggregatedFlows = _getAggregatedFlowsData(flows);
+
+ aggregatedFlows.forEach(function(flow) {
+ row = Ember.Object.create({
+ user: flow.get('user'),
+ flowName: flow.get('flowName'),
+ uid: flow.get('uid'),
+ lastExecDate: flow.get('lastExecDate')
+ });
+ data.push(row);
+ });
+
+ return Ember.A(data);
+}
+
+export default Ember.Controller.extend({
+ breadcrumbs: [{
+ text: "Home",
+ routeName: 'application'
+ }, {
+ text: "Flow Activities",
+ routeName: 'yarn-flow-activity',
+ }],
+
+ columns: _createColumns(),
+
+ rows: Ember.computed('model', function() {
+ return _createRows(this.get('model'));
+ }),
+
+ tableDefinition: TableDef.create({
+ sortColumnId: 'lastExecDate',
+ sortOrder: 'desc'
+ }),
+
+ getLastFlowExecutionInfoByFlowUid: function(uid) {
+ var aggregatedFlows = _getAggregatedFlowsData(this.get('model'));
+ var recent = aggregatedFlows.find(function(flow) {
+ return flow.get('uid') === uid;
+ });
+ return recent;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow.js
new file mode 100644
index 0000000..216ab11
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow.js
@@ -0,0 +1,36 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+ breadcrumbs: Ember.computed("model.flowUid", function() {
+ var flowUid = this.get('model.flowUid');
+ return [{
+ text: "Home",
+ routeName: 'application'
+ }, {
+ text: "Flow Activities",
+ routeName: 'yarn-flow-activity'
+ }, {
+ text: `Flow Info [${flowUid}]`,
+ routeName: 'yarn-flow.info',
+ model: flowUid
+ }];
+ })
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/info.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/info.js
new file mode 100644
index 0000000..fc4dd23
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/info.js
@@ -0,0 +1,66 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import Converter from 'yarn-ui/utils/converter';
+
+export default Ember.Controller.extend({
+ flowUid: function() {
+ return this.get('model.flowUid');
+ }.property('model.flowUid'),
+
+ flowLastExecutionDate: function() {
+ if (this.get('model.lastFlowExecutionInfo')) {
+ return this.get('model.lastFlowExecutionInfo').get('lastExecDate');
+ } else {
+ return '';
+ }
+ }.property('model.lastFlowExecutionInfo'),
+
+ flowInfo: function() {
+ var info = {};
+ var firstRunObj = this.get('model.flowRuns').get('firstObject');
+ info.flowUid = this.get('flowUid');
+ info.flowName = firstRunObj.get('flowName');
+ info.user = firstRunObj.get('user');
+ info.lastExecutionDate = this.get('flowLastExecutionDate');
+ info.firstRunStarted = this.get('earliestStartTime');
+ info.lastRunFinished = this.get('latestFinishTime');
+ return info;
+ }.property('model.flowRuns', 'flowLastExecutionDate'),
+
+ earliestStartTime: function() {
+ var earliestStart = Number.MAX_VALUE;
+ this.get('model.flowRuns').forEach(function(flowrun) {
+ if (flowrun.get('createTimeRaw') < earliestStart) {
+ earliestStart = flowrun.get('createTimeRaw');
+ }
+ });
+ return Converter.timeStampToDate(earliestStart);
+ }.property('model.flowRuns'),
+
+ latestFinishTime: function() {
+ var latestFinish = 0;
+ this.get('model.flowRuns').forEach(function(flowrun) {
+ if (flowrun.get('endTimeRaw') > latestFinish) {
+ latestFinish = flowrun.get('endTimeRaw');
+ }
+ });
+ return Converter.timeStampToDate(latestFinish);
+ }.property('model.flowRuns')
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/runs.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/runs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/runs.js
new file mode 100644
index 0000000..def4c12
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/runs.js
@@ -0,0 +1,178 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import TableDef from 'em-table/utils/table-definition';
+import ColumnDef from 'em-table/utils/column-definition';
+import Converter from 'yarn-ui/utils/converter';
+
+function createColumn() {
+ var columns = [];
+
+ // Generate columns
+ columns.push({
+ id: 'runid',
+ headerTitle: 'Run ID',
+ contentPath: 'runid',
+ cellComponentName: 'em-table-linked-cell',
+ minWidth: "300px",
+ getCellContent: function (row) {
+ return {
+ routeName: 'yarn-flowrun.info',
+ id: row.get('uid'),
+ displayText: row.get('shownid')
+ };
+ }
+ });
+
+ columns.push({
+ id: 'runDurationTs',
+ headerTitle: 'Run Duration',
+ contentPath: 'runDurationTs',
+ getCellContent: function(row) {
+ return Converter.msToElapsedTimeUnit(row.get('runDurationTs'));
+ }
+ });
+
+ columns.push({
+ id: 'cpuVCores',
+ headerTitle: 'CPU VCores',
+ contentPath: 'cpuVCores',
+ getCellContent: function(row) {
+ if (row.get('cpuVCores') > -1) {
+ return row.get('cpuVCores');
+ }
+ return 'N/A';
+ }
+ });
+
+ columns.push({
+ id: 'memoryUsed',
+ headerTitle: 'Memory Used',
+ contentPath: 'memoryUsed',
+ getCellContent: function(row) {
+ if (row.get('memoryUsed') > -1) {
+ return Converter.memoryBytesToMB(row.get('memoryUsed'));
+ }
+ return 'N/A';
+ }
+ });
+
+ columns.push({
+ id: 'createTime',
+ headerTitle: 'Creation Time',
+ contentPath: 'createTime'
+ });
+
+ columns.push({
+ id: 'endTime',
+ headerTitle: 'End Time',
+ contentPath: 'endTime'
+ });
+
+ return ColumnDef.make(columns);
+}
+
+export default Ember.Controller.extend({
+ vizWidgets: {
+ runDuration: true,
+ cpuVcores: false,
+ memoryUsed: false
+ },
+
+ actions: {
+ addVizWidget(widget) {
+ Ember.set(this.vizWidgets, widget, true);
+ },
+
+ removeVizWidget(widget) {
+ Ember.set(this.vizWidgets, widget, false);
+ }
+ },
+
+ columns: createColumn(),
+
+ tableDefinition: TableDef.create({
+ sortColumnId: 'createTime',
+ sortOrder: 'desc'
+ }),
+
+ elapsedTimeVizData: function() {
+ var data = [];
+ this.get('model.flowRuns').forEach(function(run) {
+ var vizData = run.getElapsedTimeVizDataForBarChart();
+ if (vizData.value > 0) {
+ data.push(vizData);
+ }
+ });
+ data = this.getSortedVizDataInDesc(data);
+ return this.getRefactoredVizData(data);
+ }.property('model.flowRuns'),
+
+ elapsedTimeFormatter: function(tick) {
+ return Converter.msToElapsedTimeUnit(tick, true);
+ },
+
+ cpuVCoresVizData: function() {
+ var data = [];
+ this.get('model.flowRuns').forEach(function(run) {
+ var vizData = run.getCpuVCoresVizDataForBarChart();
+ if (vizData.value > 0) {
+ data.push(vizData);
+ }
+ });
+ data = this.getSortedVizDataInDesc(data);
+ return this.getRefactoredVizData(data);
+ }.property('model.flowRuns'),
+
+ memoryVizData: function() {
+ var data = [];
+ this.get('model.flowRuns').forEach(function(run) {
+ var vizData = run.getMemoryVizDataForBarChart();
+ if (vizData.value > 0) {
+ data.push(vizData);
+ }
+ });
+ data = this.getSortedVizDataInDesc(data);
+ return this.getRefactoredVizData(data);
+ }.property('model.flowRuns'),
+
+ memoryFormatter: function(tick) {
+ return Converter.memoryBytesToMB(tick);
+ },
+
+ onBarChartClick: function() {
+ var self = this;
+ return function(data) {
+ self.transitionToRoute('yarn-flowrun.info', data.flowrunUid);
+ };
+ }.property(),
+
+ getSortedVizDataInDesc: function(data) {
+ return data.sort(function(d1, d2) {
+ return d2.value - d1.value;
+ });
+ },
+
+ getRefactoredVizData: function(data) {
+ data.forEach(function(viz, idx) {
+ viz.label = "Run " + (++idx);
+ }, this);
+ return data;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun.js
new file mode 100644
index 0000000..6af87ab
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun.js
@@ -0,0 +1,50 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+ breadcrumbs: Ember.computed('model.flowrun_uid', 'model.parentFlowUid', function() {
+ var flowRunId = this.get('model.flowrun_uid');
+ var parentFlowUid = this.get('model.parentFlowUid');
+ var crumbs = [{
+ text: "Home",
+ routeName: 'application'
+ }, {
+ text: "Flow Activities",
+ routeName: 'yarn-flow-activity'
+ }];
+ if (parentFlowUid) {
+ crumbs.push({
+ text: `Flow Info [${parentFlowUid}]`,
+ routeName: 'yarn-flow.info',
+ model: parentFlowUid
+ }, {
+ text: `Flow Runs [${parentFlowUid}]`,
+ routeName: 'yarn-flow.runs',
+ model: parentFlowUid
+ });
+ }
+ crumbs.push({
+ text: `Run Info [${flowRunId}]`,
+ routeName: 'yarn-flowrun.info',
+ model: flowRunId
+ });
+ return crumbs;
+ })
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js
new file mode 100644
index 0000000..df2f87e
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js
@@ -0,0 +1,157 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import ColumnDef from 'em-table/utils/column-definition';
+import Converter from 'yarn-ui/utils/converter';
+
+function createColumn() {
+ var columns = [];
+
+ // Generate columns
+ columns.push({
+ id: 'appId',
+ headerTitle: 'Application ID',
+ contentPath: 'appId',
+ cellComponentName: 'em-table-linked-cell',
+ minWidth: "300px",
+ getCellContent: function (row) {
+ return {
+ routeName: 'yarn-app',
+ id: row.get('appId'),
+ displayText: row.get('appId')
+ };
+ }
+ });
+
+ columns.push({
+ id: 'appType',
+ headerTitle: 'Application Type',
+ contentPath: 'type'
+ });
+
+ columns.push({
+ id: 'state',
+ headerTitle: 'State',
+ contentPath: 'state',
+ cellComponentName: 'em-table-status-cell',
+ });
+
+ columns.push({
+ id: 'elapsedTs',
+ headerTitle: 'Elapsed Time',
+ contentPath: 'elapsedTs',
+ getCellContent: function(row) {
+ return Converter.msToElapsedTimeUnit(row.get('elapsedTs'));
+ }
+ });
+
+ columns.push({
+ id: 'cpuVCores',
+ headerTitle: 'CPU VCores',
+ contentPath: 'cpuVCores',
+ getCellContent: function(row) {
+ if (row.get('cpuVCores') > -1) {
+ return row.get('cpuVCores');
+ }
+ return 'N/A';
+ }
+ });
+
+ columns.push({
+ id: 'memoryUsed',
+ headerTitle: 'Memory Used',
+ contentPath: 'memoryUsed',
+ getCellContent: function(row) {
+ if (row.get('memoryUsed') > -1) {
+ return Converter.memoryBytesToMB(row.get('memoryUsed'));
+ }
+ return 'N/A';
+ }
+ });
+
+ return ColumnDef.make(columns);
+}
+
+export default Ember.Controller.extend({
+ vizWidgets: {
+ cpuVcores: true,
+ memoryUsed: false
+ },
+
+ actions: {
+ addVizWidget(widget) {
+ Ember.set(this.vizWidgets, widget, true);
+ },
+
+ removeVizWidget(widget) {
+ Ember.set(this.vizWidgets, widget, false);
+ }
+ },
+
+ columns: createColumn(),
+
+ cpuVCoresVizData: function() {
+ var data = [];
+ this.get('model.apps').forEach(function(app) {
+ var vizData = app.getCpuVCoresVizDataForBarChart();
+ if (vizData.value > 0) {
+ data.push(vizData);
+ }
+ });
+ data = this.getSortedVizDataInDesc(data);
+ return this.getRefactoredVizData(data);
+ }.property('model.apps'),
+
+ memoryVizData: function() {
+ var data = [];
+ this.get('model.apps').forEach(function(app) {
+ var vizData = app.getMemoryVizDataForBarChart();
+ if (vizData.value > 0) {
+ data.push(vizData);
+ }
+ });
+ data = this.getSortedVizDataInDesc(data);
+ return this.getRefactoredVizData(data);
+ }.property('model.apps'),
+
+ memoryFormatter: function(tick) {
+ return Converter.memoryBytesToMB(tick);
+ },
+
+ onBarChartClick: function() {
+ var self = this;
+ return function(data) {
+ self.transitionToRoute('yarn-app', data.appId);
+ };
+ }.property(),
+
+ getSortedVizDataInDesc: function(data) {
+ return data.sort(function(d1, d2) {
+ return d2.value - d1.value;
+ });
+ },
+
+ getRefactoredVizData: function(data) {
+ data.forEach(function(viz, idx) {
+ viz.appId = viz.label;
+ viz.label = "App " + (++idx);
+ }, this);
+ return data;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/metrics.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/metrics.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/metrics.js
new file mode 100644
index 0000000..97b1e07
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/metrics.js
@@ -0,0 +1,126 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import ColumnDef from 'em-table/utils/column-definition';
+
+function _createColumns() {
+ var columns = [];
+
+ columns.push({
+ id: 'name',
+ headerTitle: 'Name',
+ contentPath: 'name',
+ observePath: true,
+ cellComponentName: 'em-table-html-cell',
+ getCellContent: function(row) {
+ var plainName = row.name;
+ if (plainName.indexOf('MAP:') > -1 || plainName.indexOf('REDUCE:') > -1) {
+ plainName = plainName.substring(plainName.indexOf(':') + 1);
+ }
+ return `<span>${plainName}</span>`;
+ }
+ }, {
+ id: 'value',
+ headerTitle: 'Value',
+ contentPath: 'value',
+ observePath: true
+ });
+
+ return ColumnDef.make(columns);
+}
+
+export default Ember.Controller.extend({
+ mapMetrics: null,
+ reduceMetrics: null,
+ generalMetrics: null,
+
+ columns: Ember.computed(function() {
+ return _createColumns(this.get('model.flowrun_uid'));
+ }),
+
+ metricsObserver: Ember.observer('model.flowrun', function() {
+ var metrics = this.get('model.flowrun.metrics');
+ var mapConfigs = [],
+ reduceConfigs = [],
+ generalConfigs = [];
+
+ metrics.forEach(function(metric) {
+ let id = metric.id;
+ if (id.startsWith('MAP:')) {
+ mapConfigs.push(metric);
+ } else if (id.startsWith('REDUCE:')) {
+ reduceConfigs.push(metric);
+ } else {
+ generalConfigs.push(metric);
+ }
+ }, this);
+
+ this.set('mapMetrics', mapConfigs);
+ this.set('reduceMetrics', reduceConfigs);
+ this.set('generalMetrics', generalConfigs);
+ }),
+
+ mapConfigRows: Ember.computed('mapMetrics', function() {
+ var row = null,
+ data = [];
+
+ this.get('mapMetrics').forEach(function(map) {
+ let value = map.values[Object.keys(map.values)[0]];
+ row = Ember.Object.create({
+ name: map.id,
+ value: value
+ });
+ data.push(row);
+ }, this);
+
+ return Ember.A(data);
+ }),
+
+ reduceConfigRows: Ember.computed('reduceMetrics', function() {
+ var row = null,
+ data = [];
+
+ this.get('reduceMetrics').forEach(function(map) {
+ let value = map.values[Object.keys(map.values)[0]];
+ row = Ember.Object.create({
+ name: map.id,
+ value: value
+ });
+ data.push(row);
+ }, this);
+
+ return Ember.A(data);
+ }),
+
+ generalConfigRows: Ember.computed('generalMetrics', function() {
+ var row = null,
+ data = [];
+
+ this.get('generalMetrics').forEach(function(map) {
+ let value = map.values[Object.keys(map.values)[0]];
+ row = Ember.Object.create({
+ name: map.id,
+ value: value
+ });
+ data.push(row);
+ }, this);
+
+ return Ember.A(data);
+ })
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
index eeb6205..a2c80f7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
@@ -18,9 +18,19 @@
import Ember from 'ember';
import AppTableController from './app-table-columns';
-
+import TableDefinition from 'em-table/utils/table-definition';
export default AppTableController.extend({
+ queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 'rowCount'],
+ tableDefinition: TableDefinition.create({
+ sortColumnId: 'stTime',
+ sortOrder: 'desc'
+ }),
+ searchText: Ember.computed.alias('tableDefinition.searchText'),
+ sortColumnId: Ember.computed.alias('tableDefinition.sortColumnId'),
+ sortOrder: Ember.computed.alias('tableDefinition.sortOrder'),
+ pageNum: Ember.computed.alias('tableDefinition.pageNum'),
+ rowCount: Ember.computed.alias('tableDefinition.rowCount'),
breadcrumbs: [{
text: "Home",
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/mixins/app-attempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/mixins/app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/mixins/app-attempt.js
new file mode 100644
index 0000000..a90bf36
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/mixins/app-attempt.js
@@ -0,0 +1,66 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Mixin.create({
+ fetchAppInfoFromRMorATS(appId, store) {
+ return new Ember.RSVP.Promise(function(resolve, reject) {
+ store.find('yarn-app', appId).then(function(rmApp) {
+ resolve(rmApp);
+ }, function() {
+ store.find('yarn-app-timeline', appId).then(function(atsApp) {
+ resolve(atsApp);
+ }, function() {
+ console.error('Error:', 'Application not found in RM or ATS for appId: ' + appId);
+ reject(null);
+ });
+ });
+ });
+ },
+
+ fetchAttemptInfoFromRMorATS(attemptId, store) {
+ return new Ember.RSVP.Promise(function(resolve, reject) {
+ store.findRecord('yarn-app-attempt', attemptId, {reload: true}).then(function(rmAttempt) {
+ resolve(rmAttempt);
+ }, function() {
+ store.findRecord('yarn-timeline-appattempt', attemptId, {reload: true}).then(function(atsAttempt) {
+ resolve(atsAttempt);
+ }, function() {
+ console.error('Error:', 'Application attempt not found in RM or ATS for attemptId: ' + attemptId);
+ reject(null);
+ });
+ });
+ });
+ },
+
+ fetchAttemptListFromRMorATS(appId, store) {
+ return new Ember.RSVP.Promise(function(resolve, reject) {
+ store.query('yarn-app-attempt', {appId: appId}).then(function(rmAttempts) {
+ resolve(rmAttempts);
+ }, function() {
+ store.query('yarn-timeline-appattempt', {appId: appId}).then(function(atsAttempts) {
+ resolve(atsAttempts);
+ }, function() {
+ console.error('Error:', 'Application attempts not found in RM or ATS for appId: ' + appId);
+ reject(null);
+ });
+ });
+ });
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
index c83eb2e..dd95765 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
@@ -74,7 +74,7 @@ export default DS.Model.extend({
if (!this.get("containerId")) {
return this.get("id");
}
- return "attempt_" +
+ return "attempt_" +
parseInt(Converter.containerIdToAttemptId(this.get("containerId")).split("_")[3]);
}.property("containerId"),
@@ -119,13 +119,12 @@ export default DS.Model.extend({
if (elapsedMs <= 0) {
elapsedMs = Date.now() - this.get("startTs");
}
-
- return Converter.msToElapsedTime(elapsedMs);
+ return Converter.msToElapsedTimeUnit(elapsedMs);
}.property(),
tooltipLabel: function() {
- return "<p>Id:" + this.get("id") +
- "</p><p>ElapsedTime:" +
+ return "<p>Id:" + this.get("id") +
+ "</p><p>ElapsedTime:" +
String(this.get("elapsedTime")) + "</p>";
}.property(),
@@ -141,4 +140,4 @@ export default DS.Model.extend({
return this.get("state");
}.property(),
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-flowrun.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-flowrun.js
new file mode 100644
index 0000000..a8a7471
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-flowrun.js
@@ -0,0 +1,52 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+import Converter from 'yarn-ui/utils/converter';
+
+export default DS.Model.extend({
+ appId: DS.attr('string'),
+ type: DS.attr('string'),
+ uid: DS.attr('string'),
+ metrics: DS.attr('array'),
+ startedTs: DS.attr('number'),
+ finishedTs: DS.attr('number'),
+ state: DS.attr('string'),
+ cpuVCores: DS.attr('number'),
+ memoryUsed: DS.attr('number'),
+
+ elapsedTs: function() {
+ return this.get('finishedTs') - this.get('startedTs');
+ }.property('startedTs', 'finishedTs'),
+
+ getCpuVCoresVizDataForBarChart: function() {
+ return {
+ label: this.get('appId'),
+ value: this.get('cpuVCores'),
+ tooltip: this.get("appId") + "<br>" + 'CPU VCores: ' + this.get('cpuVCores')
+ };
+ },
+
+ getMemoryVizDataForBarChart: function() {
+ return {
+ label: this.get('appId'),
+ value: this.get('memoryUsed'),
+ tooltip: this.get("appId") + "<br>" + 'Memory Used: ' + Converter.memoryBytesToMB(this.get('memoryUsed'))
+ };
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-timeline.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-timeline.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-timeline.js
new file mode 100644
index 0000000..fa5223f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-timeline.js
@@ -0,0 +1,105 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+import Converter from 'yarn-ui/utils/converter';
+
+export default DS.Model.extend({
+ appName: DS.attr('string'),
+ user: DS.attr('string'),
+ queue: DS.attr('string'),
+ state: DS.attr('string'),
+ startTime: DS.attr('string'),
+ elapsedTime: DS.attr('string'),
+ finalStatus: DS.attr('string'),
+ finishedTime: DS.attr('finishedTime'),
+ progress: DS.attr('number'),
+ diagnostics: DS.attr('string'),
+ amContainerLogs: DS.attr('string'),
+ amHostHttpAddress: DS.attr('string'),
+ logAggregationStatus: DS.attr('string'),
+ unmanagedApplication: DS.attr('string'),
+ amNodeLabelExpression: DS.attr('string'),
+ applicationTags: DS.attr('string'),
+ applicationType: DS.attr('string'),
+ priority: DS.attr('number'),
+ allocatedMB: DS.attr('number'),
+ allocatedVCores: DS.attr('number'),
+ runningContainers: DS.attr('number'),
+ memorySeconds: DS.attr('number'),
+ vcoreSeconds: DS.attr('number'),
+ preemptedResourceMB: DS.attr('number'),
+ preemptedResourceVCores: DS.attr('number'),
+ numNonAMContainerPreempted: DS.attr('number'),
+ numAMContainerPreempted: DS.attr('number'),
+ clusterUsagePercentage: DS.attr('number'),
+ queueUsagePercentage: DS.attr('number'),
+ currentAppAttemptId: DS.attr('string'),
+
+ isFailed: function() {
+ return this.get('finalStatus') === "FAILED";
+ }.property("finalStatus"),
+
+ validatedFinishedTs: function() {
+ if (this.get("finishedTime") < this.get("startTime")) {
+ return "";
+ }
+ return this.get("finishedTime");
+ }.property("finishedTime"),
+
+ formattedElapsedTime: function() {
+ return Converter.msToElapsedTimeUnit(this.get('elapsedTime'));
+ }.property('elapsedTime'),
+
+ allocatedResource: function() {
+ return Converter.resourceToString(this.get("allocatedMB"), this.get("allocatedVCores"));
+ }.property("allocatedMB", "allocatedVCores"),
+
+ preemptedResource: function() {
+ return Converter.resourceToString(this.get("preemptedResourceMB"), this.get("preemptedResourceVCores"));
+ }.property("preemptedResourceMB", "preemptedResourceVCores"),
+
+ aggregatedResourceUsage: function() {
+ return Converter.resourceToString(this.get("memorySeconds"), this.get("vcoreSeconds")) + " (× Secs)";
+ }.property("memorySeconds", "vcoreSeconds"),
+
+ progressStyle: function() {
+ return "width: " + this.get("progress") + "%";
+ }.property("progress"),
+
+ runningContainersNumber: function() {
+ if(this.get("runningContainers") < 0) {
+ return 0;
+ }
+ return this.get("runningContainers");
+ }.property("progress"),
+
+ finalStatusStyle: function() {
+ var style = "default";
+ var finalStatus = this.get("finalStatus");
+ if (finalStatus === "KILLED") {
+ style = "warning";
+ } else if (finalStatus === "FAILED") {
+ style = "danger";
+ } else {
+ style = "success";
+ }
+
+ return "label label-" + style;
+ }.property("finalStatus")
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js
index bd9cea7..7f39345 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js
@@ -52,13 +52,12 @@ export default DS.Model.extend({
if (elapsedMs <= 0) {
elapsedMs = Date.now() - this.get("startTs");
}
-
- return Converter.msToElapsedTime(elapsedMs);
+ return Converter.msToElapsedTimeUnit(elapsedMs);
}.property(),
tooltipLabel: function() {
- return "<p>Id:" + this.get("id") +
- "</p><p>ElapsedTime:" +
+ return "<p>Id:" + this.get("id") +
+ "</p><p>ElapsedTime:" +
String(this.get("elapsedTime")) + "</p>";
}.property(),
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-entity.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-entity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-entity.js
new file mode 100644
index 0000000..a06d6ab
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-entity.js
@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+
+export default DS.Model.extend({
+ entityId: DS.attr('string'),
+ type: DS.attr('string'),
+ uid: DS.attr('string'),
+ metrics: DS.attr('array')
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[23/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to
improve pom for yarn-ui. (Wangda Tan via Sunil G)
Posted by va...@apache.org.
YARN-4849. Addendum patch to improve pom for yarn-ui. (Wangda Tan via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/011402e3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/011402e3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/011402e3
Branch: refs/heads/YARN-3368_branch2
Commit: 011402e304499a56fc8bd0905fa2742956e0f5ca
Parents: 4fba66c
Author: sunilg <su...@apache.org>
Authored: Fri Nov 4 20:24:43 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md | 4 ++++
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/011402e3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
index e7853bf..609ebe1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
@@ -18,6 +18,10 @@
Hadoop: YARN-UI V2
=================
+Prerequisites
+-------------
+Please make sure Hadoop is built by passing -Pyarn-ui to Maven (reference to BUILDING.txt for more details)
+
Configurations
-------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/011402e3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 54bfe3f..5f6eda9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -30,7 +30,7 @@
<packaging>${packaging.type}</packaging>
<properties>
- <packaging.type>war</packaging.type>
+ <packaging.type>pom</packaging.type>
<webappTgtDir>${basedir}/target/src/main/webapp</webappTgtDir>
<node.executable>node</node.executable>
<nodeVersion>v0.12.2</nodeVersion>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[12/50] [abbrv] hadoop git commit: YARN-5779. [YARN-3368] Document
limits/notes of the new YARN UI (Wangda Tan via Sunil G)
Posted by va...@apache.org.
YARN-5779. [YARN-3368] Document limits/notes of the new YARN UI (Wangda Tan via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/43f0627a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/43f0627a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/43f0627a
Branch: refs/heads/YARN-3368_branch2
Commit: 43f0627a8e185a89a6c7a24f8d181637db7845ba
Parents: 29fc43e
Author: sunilg <su...@apache.org>
Authored: Wed Oct 26 21:58:30 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
.../hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/43f0627a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
index f646d3d..9f82031 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
@@ -41,3 +41,8 @@ origin (CORS) support.
Use it
-------------
Open your browser, go to `rm-address:8088/ui2` and try it!
+
+Notes
+-------------
+
+- This UI framework is not verified under security environment, please use with caution under security environment.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[27/50] [abbrv] hadoop git commit: YARN-5650. Render Application
Timeout value in web UI. Contributed by Akhil PB.
Posted by va...@apache.org.
YARN-5650. Render Application Timeout value in web 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/d5271b03
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d5271b03
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d5271b03
Branch: refs/heads/YARN-3368_branch2
Commit: d5271b03d33e17be056f1604b03dea30242649e2
Parents: 011402e
Author: Sunil G <su...@apache.org>
Authored: Mon Dec 19 11:44:03 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../webapp/app/components/app-timeout-bar.js | 60 ++++++++++++++++++++
.../src/main/webapp/app/models/yarn-app.js | 2 +
.../src/main/webapp/app/serializers/yarn-app.js | 21 +++++--
.../templates/components/app-timeout-bar.hbs | 34 +++++++++++
.../src/main/webapp/app/templates/yarn-app.hbs | 10 +++-
.../src/main/webapp/app/utils/converter.js | 3 +
.../components/app-timeout-bar-test.js | 34 +++++++++++
7 files changed, 157 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5271b03/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-timeout-bar.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-timeout-bar.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-timeout-bar.js
new file mode 100644
index 0000000..0eac827
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-timeout-bar.js
@@ -0,0 +1,60 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import Converter from 'yarn-ui/utils/converter';
+
+export default Ember.Component.extend({
+ app: null,
+
+ appTimeoutValue: function() {
+ var timeoutValueInSecs = this.get("app.remainingTimeoutInSeconds");
+ if (timeoutValueInSecs > -1) {
+ return Converter.msToElapsedTime(timeoutValueInSecs * 1000);
+ } else {
+ return timeoutValueInSecs;
+ }
+ }.property("app.remainingTimeoutInSeconds"),
+
+ isAppTimedOut: function() {
+ if (this.get("app.remainingTimeoutInSeconds") > 0) {
+ return false;
+ } else {
+ return true;
+ }
+ }.property("app.remainingTimeoutInSeconds"),
+
+ appTimeoutBarStyle: function() {
+ var remainingInSecs = this.get("app.remainingTimeoutInSeconds"),
+ expiryTimestamp = Converter.dateToTimeStamp(this.get("app.applicationExpiryTime")),
+ expiryInSecs = expiryTimestamp / 1000,
+ startTimestamp = Converter.dateToTimeStamp(this.get("app.startTime")),
+ startInSecs = startTimestamp / 1000,
+ totalRunInSecs = 0,
+ appRunDurationInSecs = 0,
+ width = 0;
+
+ if (remainingInSecs > 0) {
+ totalRunInSecs = expiryInSecs - startInSecs;
+ appRunDurationInSecs = totalRunInSecs - remainingInSecs;
+ width = appRunDurationInSecs / totalRunInSecs * 100;
+ }
+
+ return "width: " + width + "%";
+ }.property("app.remainingTimeoutInSeconds", "app.applicationExpiryTime", "app.startTime")
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5271b03/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 8b5474f..4138a87 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
@@ -50,6 +50,8 @@ export default DS.Model.extend({
clusterUsagePercentage: DS.attr('number'),
queueUsagePercentage: DS.attr('number'),
currentAppAttemptId: DS.attr('string'),
+ remainingTimeoutInSeconds: DS.attr('number'),
+ applicationExpiryTime: DS.attr('string'),
isFailed: function() {
return this.get('finalStatus') == "FAILED"
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5271b03/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 427c3d8..fdba04a 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
@@ -23,9 +23,18 @@ export default DS.JSONAPISerializer.extend({
internalNormalizeSingleResponse(store, primaryModelClass, payload, id,
requestType) {
if (payload.app) {
- payload = payload.app;
+ payload = payload.app;
}
-
+
+ var timeoutInSecs = -1;
+ var appExpiryTime = Converter.timeStampToDate(payload.finishedTime);
+ if (payload.timeouts && payload.timeouts.timeout && payload.timeouts.timeout[0]) {
+ timeoutInSecs = payload.timeouts.timeout[0].remainingTimeInSeconds;
+ if (timeoutInSecs > -1) {
+ appExpiryTime = Converter.isoDateToDate(payload.timeouts.timeout[0].expiryTime);
+ }
+ }
+
var fixedPayload = {
id: id,
type: primaryModelClass.modelName, // yarn-app
@@ -58,7 +67,9 @@ export default DS.JSONAPISerializer.extend({
numAMContainerPreempted: payload.numAMContainerPreempted,
clusterUsagePercentage: payload.clusterUsagePercentage,
queueUsagePercentage: payload.queueUsagePercentage,
- currentAppAttemptId: payload.currentAppAttemptId
+ currentAppAttemptId: payload.currentAppAttemptId,
+ remainingTimeoutInSeconds: timeoutInSecs,
+ applicationExpiryTime: appExpiryTime
}
};
@@ -67,7 +78,7 @@ export default DS.JSONAPISerializer.extend({
normalizeSingleResponse(store, primaryModelClass, payload, id,
requestType) {
- var p = this.internalNormalizeSingleResponse(store,
+ var p = this.internalNormalizeSingleResponse(store,
primaryModelClass, payload, id, requestType);
return { data: p };
},
@@ -90,4 +101,4 @@ export default DS.JSONAPISerializer.extend({
return normalizedArrayResponse;
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5271b03/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-timeout-bar.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-timeout-bar.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-timeout-bar.hbs
new file mode 100644
index 0000000..acbe0b2
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-timeout-bar.hbs
@@ -0,0 +1,34 @@
+{{!
+ * 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.
+}}
+
+<div class="app-timeout-wrapper">
+ {{#unless isAppTimedOut}}
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <label>Application will be timed out after <span class="text-danger">{{appTimeoutValue}}</span></label>
+ <div class="progress">
+ <div class="progress-bar progress-bar-danger progress-bar-striped active" style="{{appTimeoutBarStyle}}"></div>
+ </div>
+ <div>
+ <label class="pull-left">{{app.startTime}}</label>
+ <label class="pull-right">{{app.applicationExpiryTime}}</label>
+ </div>
+ </div>
+ </div>
+ {{/unless}}
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5271b03/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 acf00d1..578cc95 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
@@ -46,6 +46,12 @@
<div class="col-md-10 container-fluid">
<div class="row">
+ <div class="col-md-12">
+ {{app-timeout-bar app=model.app}}
+ </div>
+ </div>
+
+ <div class="row">
<div class="col-md-12 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">Basic Info</div>
@@ -116,10 +122,10 @@
</div>
{{else}}
<div class="panel panel-default">
- <div class="panel-body">
+ <div class="panel-heading">
Diagnostics
</div>
- <div class="panel-footer">{{model.app.diagnostics}}</div>
+ <div class="panel-body">{{model.app.diagnostics}}</div>
</div>
{{/if}}
</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5271b03/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
index 6fd9d30..fb6b61c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
@@ -91,6 +91,9 @@ export default {
return ts;
}
},
+ isoDateToDate: function(isoDate) {
+ return moment(isoDate).format("YYYY/MM/DD HH:mm:ss");
+ },
splitForContainerLogs: function(id) {
if (id) {
var splits = id.split(Constants.PARAM_SEPARATOR);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5271b03/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/app-timeout-bar-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/app-timeout-bar-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/app-timeout-bar-test.js
new file mode 100644
index 0000000..fb2a73a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/app-timeout-bar-test.js
@@ -0,0 +1,34 @@
+/**
+ * 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.
+ */
+
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+
+moduleForComponent('app-timeout-bar', 'Integration | Component | app timeout bar', {
+ integration: true
+});
+
+test('it renders', function(assert) {
+
+ // Set any properties with this.set('myProperty', 'value');
+ // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+
+ this.render(hbs`{{app-timeout-bar}}`);
+
+ assert.equal(this.$().text().trim(), '');
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[28/50] [abbrv] hadoop git commit: YARN-5912. Fix breadcrumb issues
for various pages in new YARN UI. Contributed by Akhil P B.
Posted by va...@apache.org.
YARN-5912. Fix breadcrumb issues for various pages in new YARN UI. Contributed by Akhil P B.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9071c712
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9071c712
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9071c712
Branch: refs/heads/YARN-3368_branch2
Commit: 9071c712d964501197428fa348cd7bb9914a0e59
Parents: 2c93e8e
Author: Sunil G <su...@apache.org>
Authored: Tue Feb 14 22:29:21 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../webapp/app/controllers/yarn-app-attempt.js | 2 +-
.../webapp/app/controllers/yarn-app-attempts.js | 2 +-
.../src/main/webapp/app/controllers/yarn-app.js | 2 +-
.../main/webapp/app/controllers/yarn-apps.js | 2 +-
.../app/controllers/yarn-container-log.js | 7 +++-
.../webapp/app/controllers/yarn-node-app.js | 7 +++-
.../webapp/app/controllers/yarn-node-apps.js | 2 +-
.../app/controllers/yarn-node-container.js | 39 ++++++++++++++++++++
.../app/controllers/yarn-node-containers.js | 2 +-
.../main/webapp/app/controllers/yarn-node.js | 2 +-
.../webapp/app/controllers/yarn-services.js | 2 +-
.../src/main/webapp/app/models/yarn-app.js | 2 +-
.../src/main/webapp/app/routes/yarn-node-app.js | 2 +-
.../webapp/app/routes/yarn-node-container.js | 2 +-
.../controllers/yarn-node-container-test.js | 30 +++++++++++++++
15 files changed, 90 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
index a458842..4c02361 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
routeName: 'application'
},{
text: "Applications",
- routeName: 'yarn-apps'
+ routeName: 'yarn-apps.apps'
}, {
text: `App [${appId}]`,
routeName: 'yarn-app',
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
index 9ebc2a6..92de2f9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
routeName: 'application'
},{
text: "Applications",
- routeName: 'yarn-apps'
+ routeName: 'yarn-apps.apps'
}, {
text: `App [${appId}]`,
routeName: 'yarn-app',
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/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 309c895..9c1cb5d 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
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
routeName: 'application'
},{
text: "Applications",
- routeName: 'yarn-apps'
+ routeName: 'yarn-apps.apps'
}, {
text: `App [${appId}]`,
routeName: 'yarn-app',
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js
index 396f83b..18bf682 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js
@@ -25,7 +25,7 @@ export default Ember.Controller.extend({
routeName: 'application'
}, {
text: "Applications",
- routeName: 'yarn-apps',
+ routeName: 'yarn-apps.apps',
}]
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-container-log.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-container-log.js
index 3352eaf..db7470d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-container-log.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-container-log.js
@@ -27,11 +27,14 @@ export default Ember.Controller.extend({
text: "Home",
routeName: 'application'
}, {
+ text: "Nodes",
+ routeName: 'yarn-nodes.table'
+ }, {
text: `Node [ ${nodeInfo.id} ]`,
- href: `/#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`,
+ href: `#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`,
}, {
text: `Container [ ${containerInfo.id} ]`,
- href: `/#/yarn-node-container/${nodeInfo.id}/${nodeInfo.addr}/${containerInfo.id}`,
+ href: `#/yarn-node-container/${nodeInfo.id}/${nodeInfo.addr}/${containerInfo.id}`,
}, {
text: "Log",
}];
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-app.js
index 76da281..3dc09fc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-app.js
@@ -26,10 +26,13 @@ export default Ember.Controller.extend({
text: "Home",
routeName: 'application'
}, {
+ text: "Nodes",
+ routeName: 'yarn-nodes.table'
+ }, {
text: `Node [ ${nodeInfo.id} ]`,
- href: `/#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`,
+ href: `#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`,
}, {
- text: "Application",
+ text: `Application [ ${nodeInfo.appId} ]`,
}];
})
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
index 6e67ab0..6f53e74 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
@@ -30,7 +30,7 @@ export default Ember.Controller.extend({
routeName: 'yarn-nodes.table'
}, {
text: `Node [ ${nodeInfo.id} ]`,
- href: `/#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`,
+ href: `#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`
}, {
text: "Applications",
}];
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-container.js
new file mode 100644
index 0000000..afcd518
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-container.js
@@ -0,0 +1,39 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+
+ breadcrumbs: Ember.computed("model.nodeInfo", function () {
+ var nodeInfo = this.get("model.nodeInfo");
+ return [{
+ text: "Home",
+ routeName: 'application'
+ },{
+ text: "Nodes",
+ routeName: 'yarn-nodes.table'
+ }, {
+ text: `Node [ ${nodeInfo.id} ]`,
+ href: `#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`
+ }, {
+ text: `Container [ ${nodeInfo.containerId} ]`
+ }];
+ })
+
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
index abe4098..21d50a3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
@@ -30,7 +30,7 @@ export default Ember.Controller.extend({
routeName: 'yarn-nodes.table'
}, {
text: `Node [ ${nodeInfo.id} ]`,
- href: `/#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`,
+ href: `#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`
}, {
text: "Containers",
}];
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
index 0661415..55d9b3e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
@@ -30,7 +30,7 @@ export default Ember.Controller.extend({
routeName: 'yarn-nodes.table'
}, {
text: `Node [ ${nodeInfo.id} ]`,
- href: `/#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`,
+ href: `#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`,
}];
})
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
index 597962a..75bebf6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
@@ -25,7 +25,7 @@ export default Ember.Controller.extend({
routeName: 'application'
}, {
text: "Applications",
- routeName: 'yarn-apps',
+ routeName: 'yarn-apps.apps',
}, {
text: "Long Running Services",
routeName: 'yarn-services',
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/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 ea1334f..1366357 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
@@ -54,7 +54,7 @@ export default DS.Model.extend({
applicationExpiryTime: DS.attr('string'),
isFailed: function() {
- return this.get('finalStatus') == "FAILED";
+ return this.get('finalStatus') === "FAILED";
}.property("finalStatus"),
validatedFinishedTs: function() {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-app.js
index 0a11930..8b2ad80 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-app.js
@@ -25,7 +25,7 @@ export default AbstractRoute.extend({
return Ember.RSVP.hash({
nodeApp: this.store.queryRecord('yarn-node-app',
{ nodeAddr : param.node_addr, appId: param.app_id }),
- nodeInfo: { id: param.node_id, addr: param.node_addr }
+ nodeInfo: { id: param.node_id, addr: param.node_addr, appId: param.app_id }
});
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-container.js
index b7a79de..5708fea 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-container.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-container.js
@@ -26,7 +26,7 @@ export default AbstractRoute.extend({
return Ember.RSVP.hash({
nodeContainer: this.store.queryRecord('yarn-node-container',
{ nodeHttpAddr: param.node_addr, containerId: param.container_id }),
- nodeInfo: { id: param.node_id, addr: param.node_addr }
+ nodeInfo: { id: param.node_id, addr: param.node_addr, containerId: param.container_id }
});
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-container-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-container-test.js
new file mode 100644
index 0000000..c35e413
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-container-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('controller:yarn-node-container', 'Unit | Controller | yarn node container', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let controller = this.subject();
+ assert.ok(controller);
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[34/50] [abbrv] hadoop git commit: YARN-6258. localBaseAddress for CORS proxy configuration is not working when suffixed with forward slash in new YARN UI. Contributed by Gergely Novák.
Posted by va...@apache.org.
YARN-6258. localBaseAddress for CORS proxy configuration is not working when suffixed with forward slash in new YARN UI. Contributed by Gergely Novák.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/deef8d54
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/deef8d54
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/deef8d54
Branch: refs/heads/YARN-3368_branch2
Commit: deef8d544698fe9c1adfae7b27a343a30b05ce0e
Parents: 16cc282
Author: Sunil G <su...@apache.org>
Authored: Fri Apr 7 11:42:50 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../hadoop-yarn-ui/src/main/webapp/app/services/hosts.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/deef8d54/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
index 19863e1..807844e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
@@ -61,7 +61,11 @@ export default Ember.Service.extend({
},
localBaseAddress: Ember.computed(function () {
- return this.localAddress();
+ var url = this.localAddress();
+ if (url.endsWith('/')) {
+ url = url.slice(0, -1);
+ }
+ return url;
}),
timelineWebAddress: Ember.computed(function () {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[26/50] [abbrv] hadoop git commit: YARN-5866. Fix few issues reported
by jshint in new YARN UI. Contributed by Akhil P B.
Posted by va...@apache.org.
YARN-5866. Fix few issues reported by jshint in new YARN UI. Contributed by Akhil P B.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0d1a53ad
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0d1a53ad
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0d1a53ad
Branch: refs/heads/YARN-3368_branch2
Commit: 0d1a53ad8e01ae4fa7b3de46f60363a14d95f8b8
Parents: d5271b0
Author: Sunil G <su...@apache.org>
Authored: Tue Jan 31 14:18:31 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../hadoop-yarn-ui/src/main/webapp/.jshintrc | 5 ++-
.../src/main/webapp/app/adapters/abstract.js | 1 +
.../main/webapp/app/adapters/cluster-info.js | 4 +--
.../main/webapp/app/adapters/cluster-metric.js | 4 +--
.../webapp/app/adapters/yarn-app-attempt.js | 4 +--
.../src/main/webapp/app/adapters/yarn-app.js | 6 ++--
.../webapp/app/adapters/yarn-container-log.js | 4 +--
.../main/webapp/app/adapters/yarn-container.js | 12 +++----
.../src/main/webapp/app/adapters/yarn-node.js | 4 +--
.../src/main/webapp/app/adapters/yarn-queue.js | 4 +--
.../main/webapp/app/adapters/yarn-rm-node.js | 6 ++--
.../app/components/app-usage-donut-chart.js | 6 ++--
.../src/main/webapp/app/components/bar-chart.js | 36 +++++++++-----------
.../app/components/base-chart-component.js | 8 ++---
.../app/components/base-usage-donut-chart.js | 11 +++---
.../main/webapp/app/components/donut-chart.js | 10 +++---
.../main/webapp/app/components/nodes-heatmap.js | 21 ++++++------
...er-app-memusage-by-nodes-stacked-barchart.js | 4 +--
...app-ncontainers-by-nodes-stacked-barchart.js | 4 +--
.../app/components/queue-usage-donut-chart.js | 4 +--
.../main/webapp/app/components/queue-view.js | 11 +++---
.../main/webapp/app/components/simple-table.js | 6 ++--
.../webapp/app/components/stacked-barchart.js | 23 +++++++------
.../main/webapp/app/components/timeline-view.js | 25 ++++++++------
.../main/webapp/app/components/tree-selector.js | 33 +++++++++---------
.../main/webapp/app/controllers/application.js | 8 ++---
.../src/main/webapp/app/helpers/divide.js | 2 +-
.../main/webapp/app/helpers/log-files-comma.js | 5 ++-
.../src/main/webapp/app/helpers/node-link.js | 2 +-
.../src/main/webapp/app/helpers/node-menu.js | 10 +++---
.../src/main/webapp/app/helpers/node-name.js | 4 +--
.../src/main/webapp/app/initializers/loader.js | 8 +++--
.../main/webapp/app/models/yarn-app-attempt.js | 17 ++++-----
.../src/main/webapp/app/models/yarn-app.js | 8 ++---
.../src/main/webapp/app/models/yarn-node-app.js | 8 ++---
.../webapp/app/models/yarn-node-container.js | 12 +++----
.../src/main/webapp/app/models/yarn-queue.js | 14 ++++----
.../src/main/webapp/app/models/yarn-rm-node.js | 10 +++---
.../src/main/webapp/app/models/yarn-user.js | 2 +-
.../src/main/webapp/app/routes/application.js | 3 +-
.../main/webapp/app/routes/yarn-app-attempts.js | 2 --
.../src/main/webapp/app/routes/yarn-app.js | 2 +-
.../webapp/app/routes/yarn-container-log.js | 2 +-
.../main/webapp/app/routes/yarn-queues/index.js | 2 ++
.../webapp/app/serializers/yarn-app-attempt.js | 23 ++++++-------
.../src/main/webapp/app/serializers/yarn-app.js | 13 +++----
.../app/serializers/yarn-container-log.js | 3 +-
.../webapp/app/serializers/yarn-container.js | 22 +++++-------
.../webapp/app/serializers/yarn-node-app.js | 24 ++-----------
.../app/serializers/yarn-node-container.js | 7 ++--
.../main/webapp/app/serializers/yarn-node.js | 8 ++---
.../main/webapp/app/serializers/yarn-queue.js | 10 +++---
.../main/webapp/app/serializers/yarn-rm-node.js | 7 ++--
.../src/main/webapp/app/utils/color-utils.js | 6 ++--
.../src/main/webapp/app/utils/converter.js | 2 +-
.../main/webapp/app/utils/href-address-utils.js | 2 --
.../src/main/webapp/app/utils/mock.js | 4 +--
.../src/main/webapp/app/utils/sorter.js | 8 ++---
.../src/main/webapp/ember-cli-build.js | 2 +-
.../unit/models/yarn-container-log-test.js | 1 +
.../tests/unit/models/yarn-node-app-test.js | 1 +
.../unit/models/yarn-node-container-test.js | 1 +
.../webapp/tests/unit/models/yarn-node-test.js | 1 +
.../tests/unit/models/yarn-rm-node-test.js | 1 +
.../unit/routes/yarn-container-log-test.js | 24 ++++++-------
.../tests/unit/routes/yarn-node-app-test.js | 28 +++++++--------
.../tests/unit/routes/yarn-node-apps-test.js | 30 ++++++++--------
.../unit/routes/yarn-node-container-test.js | 28 +++++++--------
.../unit/routes/yarn-node-containers-test.js | 30 ++++++++--------
.../webapp/tests/unit/routes/yarn-node-test.js | 4 +--
.../webapp/tests/unit/routes/yarn-nodes-test.js | 2 +-
71 files changed, 313 insertions(+), 356 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
index 08096ef..63cfe40 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
@@ -2,7 +2,10 @@
"predef": [
"document",
"window",
- "-Promise"
+ "-Promise",
+ "d3",
+ "$",
+ "moment"
],
"browser": true,
"boss": true,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/abstract.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/abstract.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/abstract.js
index c7e5c36..0db27a6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/abstract.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/abstract.js
@@ -16,6 +16,7 @@
* limitations under the License.
*/
import Ember from 'ember';
+import DS from 'ember-data';
export default DS.JSONAPIAdapter.extend({
address: null, //Must be set by inheriting classes
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-info.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-info.js
index f79df92..0665499 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-info.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-info.js
@@ -24,7 +24,7 @@ export default AbstractAdapter.extend({
serverName: "RM",
// Any cluster-info specific adapter changes must be added here
- pathForType(modelName) {
+ pathForType(/*modelName*/) {
return ''; // move to some common place, return path by modelname.
- },
+ }
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-metric.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-metric.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-metric.js
index 8325a4c..f431340 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-metric.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-metric.js
@@ -24,7 +24,7 @@ export default AbstractAdapter.extend({
serverName: "RM",
// Any cluster-metric specific adapter changes must be added here
- pathForType(modelName) {
+ pathForType(/*modelName*/) {
return ''; // move to some common place, return path by modelname.
- },
+ }
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
index 78f5e02..2389f16 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
@@ -24,12 +24,12 @@ export default AbstractAdapter.extend({
restNameSpace: "cluster",
serverName: "RM",
- urlForQuery(query, modelName) {
+ urlForQuery(query/*, modelName*/) {
var url = this._buildURL();
return url + '/apps/' + query.appId + "/appattempts";
},
- urlForFindRecord(id, modelName, snapshot) {
+ urlForFindRecord(id/*, modelName, snapshot*/) {
var url = this._buildURL();
return url + '/apps/' +
Converter.attemptIdToAppId(id) + "/appattempts/" + id;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
index 67a2847..b34c606 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
@@ -23,7 +23,7 @@ export default AbstractAdapter.extend({
restNameSpace: "cluster",
serverName: "RM",
- urlForQuery(query, modelName) {
+ urlForQuery(query/*, modelName*/) {
var url = this._buildURL();
if (query.state) {
url = url + '/apps/?state=' + query.state;
@@ -31,13 +31,13 @@ export default AbstractAdapter.extend({
return url;
},
- urlForFindRecord(id, modelName, snapshot) {
+ urlForFindRecord(id/*, modelName, snapshot*/) {
var url = this._buildURL();
url = url + '/apps/' + id;
return url;
},
- pathForType(modelName) {
+ pathForType(/*modelName*/) {
return 'apps'; // move to some common place, return path by modelname.
},
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-log.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-log.js
index 9f2d5d7..8d1b12b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-log.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-log.js
@@ -37,7 +37,7 @@ export default DS.RESTAdapter.extend({
return this.get(`env.app.namespaces.node`);
}),
- urlForFindRecord(id, modelName, snapshot) {
+ urlForFindRecord(id/*, modelName, snapshot*/) {
var splits = Converter.splitForContainerLogs(id);
var nodeHttpAddr = splits[0];
var containerId = splits[1];
@@ -68,7 +68,7 @@ export default DS.RESTAdapter.extend({
hash.context = this;
var headers = Ember.get(this, 'headers');
- if (headers != undefined) {
+ if (headers !== undefined) {
hash.beforeSend = function (xhr) {
Object.keys(headers).forEach(function (key) {
return xhr.setRequestHeader(key, headers[key]);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
index fd6a6f8..348a805 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
@@ -25,14 +25,14 @@ export default DS.JSONAPIAdapter.extend({
},
host: function() {
- return undefined
+ return undefined;
}.property(),
namespace: function() {
- return undefined
+ return undefined;
}.property(),
- urlForQuery(query, modelName) {
+ urlForQuery(query/*, modelName*/) {
var rmHosts = this.get(`hosts.rmWebAddress`);
var tsHosts = this.get(`hosts.timelineWebAddress`);
var rmNamespaces = this.get(`env.app.namespaces.cluster`);
@@ -47,8 +47,8 @@ export default DS.JSONAPIAdapter.extend({
}
var url = this._buildURL();
- url = url + '/apps/' + Converter.attemptIdToAppId(query.app_attempt_id)
- + "/appattempts/" + query.app_attempt_id + "/containers";
+ url = url + '/apps/' + Converter.attemptIdToAppId(query.app_attempt_id) +
+ "/appattempts/" + query.app_attempt_id + "/containers";
console.log(url);
return url;
},
@@ -58,6 +58,6 @@ export default DS.JSONAPIAdapter.extend({
hash.crossDomain = true;
hash.xhrFields = {withCredentials: true};
hash.targetServer = "RM";
- return this._super(url, method, hash);
+ return this._super(url, method, hash);
}
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
index 5bcfc9a..1436bc1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
@@ -24,10 +24,10 @@ export default AbstractAdapter.extend({
restNameSpace: "node",
serverName: "NM",
- urlForFindRecord(id, modelName, snapshot) {
+ urlForFindRecord(id/*, modelName, snapshot*/) {
var url = this._buildURL();
url = url.replace("{nodeAddress}", id);
return url;
- },
+ }
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
index 41cd442..f2017df 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
@@ -23,8 +23,8 @@ export default AbstractAdapter.extend({
restNameSpace: "cluster",
serverName: "RM",
- pathForType(modelName) {
+ pathForType(/*modelName*/) {
return 'scheduler'; // move to some common place, return path by modelname.
- },
+ }
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-node.js
index a24c399..6783ded 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-node.js
@@ -23,14 +23,14 @@ export default AbstractAdapter.extend({
restNameSpace: "cluster",
serverName: "RM",
- pathForType(modelName) {
+ pathForType(/*modelName*/) {
return 'nodes';
},
- urlForFindRecord(id, modelName, snapshot) {
+ urlForFindRecord(id/*, modelName, snapshot*/) {
var url = this._buildURL();
url = url + "/nodes/" + id;
return url;
- },
+ }
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
index 90f41fc..274c219 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import Ember from 'ember';
-import DonutChart from 'yarn-ui/components/donut-chart';
import BaseUsageDonutChart from 'yarn-ui/components/base-usage-donut-chart';
import ColorUtils from 'yarn-ui/utils/color-utils';
import HrefAddressUtils from 'yarn-ui/utils/href-address-utils';
@@ -52,11 +50,11 @@ export default BaseUsageDonutChart.extend({
usageByApps.push({
label: "Available",
value: avail.toFixed(4)
- })
+ });
this.colors = ColorUtils.getColors(usageByApps.length, ["others", "good"], true);
this.renderDonutChart(usageByApps, this.get("title"), this.get("showLabels"),
this.get("middleLabel"), "100%", "%");
},
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
index a5c49a9..05d78eb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
@@ -55,17 +55,15 @@ export default BaseChartComponent.extend({
.domain([0, maxValue])
.range([0, maxBarWidth]);
+ var getBarText = function(i) {
+ return data[i].label;
+ };
// show bar text
- for (var i = 0; i < data.length; i++) {
+ for (i = 0; i < data.length; i++) {
g.append("text")
- .text(
- function() {
- return data[i].label;
- })
- .attr("y", function() {
- return layout.y1 + singleBarHeight / 2 + layout.margin + (gap +
- singleBarHeight) * i + 30;
- })
+ .text(getBarText(i))
+ .attr("y", layout.y1 + singleBarHeight / 2 + layout.margin +
+ (gap + singleBarHeight) * i + 30)
.attr("x", layout.x1 + layout.margin);
}
@@ -96,17 +94,15 @@ export default BaseChartComponent.extend({
return w;
});
+ var getBarValue = function(i) {
+ return data[i].value;
+ };
// show bar value
- for (var i = 0; i < data.length; i++) {
+ for (i = 0; i < data.length; i++) {
g.append("text")
- .text(
- function() {
- return data[i].value;
- })
- .attr("y", function() {
- return layout.y1 + singleBarHeight / 2 + layout.margin + (gap +
- singleBarHeight) * i + 30;
- })
+ .text(getBarValue(i))
+ .attr("y", layout.y1 + singleBarHeight / 2 + layout.margin +
+ (gap + singleBarHeight) * i + 30)
.attr("x", layout.x1 + layout.margin + textWidth + 15 + xScaler(data[i].value));
}
},
@@ -123,5 +119,5 @@ export default BaseChartComponent.extend({
didInsertElement: function() {
this.initChart();
this.draw();
- },
-})
\ No newline at end of file
+ }
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
index d221488..d11a532 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
@@ -96,7 +96,7 @@ export default Ember.Component.extend({
},
bindTooltip: function(d) {
- d.on("mouseover", function(d) {
+ d.on("mouseover", function() {
this.tooltip
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
@@ -108,16 +108,16 @@ export default Ember.Component.extend({
data = d.data;
}
- this.tooltip.style("opacity", .9);
+ this.tooltip.style("opacity", 0.9);
var value = data.value;
- if (this.get("type") == "memory") {
+ if (this.get("type") === "memory") {
value = Converter.memoryToSimpliedUnit(value);
}
this.tooltip.html(data.label + " = " + value)
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
}.bind(this))
- .on("mouseout", function(d) {
+ .on("mouseout", function() {
this.tooltip.style("opacity", 0);
}.bind(this));
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-usage-donut-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-usage-donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-usage-donut-chart.js
index bec06c9..201ae6c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-usage-donut-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-usage-donut-chart.js
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import Ember from 'ember';
import DonutChart from 'yarn-ui/components/donut-chart';
export default DonutChart.extend({
@@ -29,15 +28,15 @@ export default DonutChart.extend({
var others = {
label: "Used by others",
value: 0
- }
+ };
- for (var i = nItemsKept; i < usages.length; i++) {
+ for (i = nItemsKept; i < usages.length; i++) {
others.value += Number(usages[i].value);
}
others.value = others.value.toFixed(2);
- arr.push(others)
+ arr.push(others);
return arr;
- },
-})
\ No newline at end of file
+ }
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
index a2a21b3..e5699b4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
@@ -41,7 +41,7 @@ export default BaseChartComponent.extend({
}
if (!middleValue) {
- if (this.get("type") == "memory") {
+ if (this.get("type") === "memory") {
middleValue = Converter.memoryToSimpliedUnit(total);
} else {
middleValue = total;
@@ -111,7 +111,7 @@ export default BaseChartComponent.extend({
if (allZero) {
return this.colors[i];
}
- }.bind(this))
+ }.bind(this));
this.bindTooltip(path);
path.on("click", function (d) {
var data = d.data;
@@ -119,7 +119,7 @@ export default BaseChartComponent.extend({
this.tooltip.remove();
document.location.href = data.link;
}
- }.bind(this))
+ }.bind(this));
// Show labels
if (showLabels) {
@@ -147,7 +147,7 @@ export default BaseChartComponent.extend({
})
.text(function(d) {
var value = d.value;
- if (this.get("type") == "memory") {
+ if (this.get("type") === "memory") {
value = Converter.memoryToSimpliedUnit(value);
}
return d.label + ' = ' + value + suffix;
@@ -190,4 +190,4 @@ export default BaseChartComponent.extend({
this.initChart();
this.draw();
},
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
index af8ceb3..5652834 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
@@ -17,7 +17,6 @@
*/
import BaseChartComponent from 'yarn-ui/components/base-chart-component';
-import Mock from 'yarn-ui/utils/mock';
export default BaseChartComponent.extend({
CELL_WIDTH: 250,
@@ -39,7 +38,7 @@ export default BaseChartComponent.extend({
// Handle pie chart case
var text = element.attr("tooltiptext");
- this.tooltip.style("opacity", .9);
+ this.tooltip.style("opacity", 0.9);
this.tooltip.html(text)
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
@@ -82,10 +81,10 @@ export default BaseChartComponent.extend({
2 * this.CELL_MARGIN;
var sampleYOffset = layout.margin * 2;
- for (var i = 1; i <= 5; i++) {
+ for (i = 1; i <= 5; i++) {
var ratio = i * 0.2 - 0.1;
- var rect = g.append("rect")
+ g.append("rect")
.attr("x", sampleXOffset)
.attr("y", sampleYOffset)
.attr("fill", colorFunc(ratio))
@@ -101,14 +100,14 @@ export default BaseChartComponent.extend({
var chartXOffset = -1;
- for (var i = 0; i < racksArray.length; i++) {
+ for (i = 0; i < racksArray.length; i++) {
var text = g.append("text")
.text(racksArray[i])
.attr("y", yOffset + this.CELL_HEIGHT / 2 + 5)
.attr("x", layout.margin)
.attr("class", "heatmap-rack");
- if (-1 == chartXOffset) {
+ if (-1 === chartXOffset) {
chartXOffset = layout.margin + text.node().getComputedTextLength() + 30;
}
@@ -118,10 +117,10 @@ export default BaseChartComponent.extend({
var rack = data[j].get("rack");
var host = data[j].get("nodeHostName");
- if (rack == racksArray[i]) {
+ if (rack === racksArray[i]) {
if (!rack.includes(this.filter) && !host.includes(this.filter)) {
this.addNode(g, xOffset, yOffset, colorFunc, data[j], false);
- var text = g.append("text")
+ g.append("text")
.text(host)
.attr("y", yOffset + this.CELL_HEIGHT / 2 + 5)
.attr("x", xOffset + this.CELL_WIDTH / 2)
@@ -151,7 +150,7 @@ export default BaseChartComponent.extend({
xOffset += this.CELL_MARGIN + this.CELL_WIDTH;
}
- if (xOffset != chartXOffset) {
+ if (xOffset !== chartXOffset) {
xOffset = chartXOffset;
yOffset += this.CELL_MARGIN + this.CELL_HEIGHT;
}
@@ -182,7 +181,7 @@ export default BaseChartComponent.extend({
},
addPlaceholderNode: function(g, xOffset, yOffset) {
- var rect = g.append("rect")
+ g.append("rect")
.attr("y", yOffset)
.attr("x", xOffset)
.attr("height", this.CELL_HEIGHT)
@@ -206,4 +205,4 @@ export default BaseChartComponent.extend({
this.didInsertElement();
}
}
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-memusage-by-nodes-stacked-barchart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-memusage-by-nodes-stacked-barchart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-memusage-by-nodes-stacked-barchart.js
index 7feb7bb..65cbaf5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-memusage-by-nodes-stacked-barchart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-memusage-by-nodes-stacked-barchart.js
@@ -28,7 +28,7 @@ export default StackedBarchart.extend({
{
used: Number(n.get("usedMemoryMB")),
avail: Number(n.get("availMemoryMB"))
- }
+ };
});
containers.forEach(function(c) {
@@ -85,4 +85,4 @@ export default StackedBarchart.extend({
data, this.get("title"), ["Used by this app", "Used by other apps",
"Available"]);
},
-})
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-ncontainers-by-nodes-stacked-barchart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-ncontainers-by-nodes-stacked-barchart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-ncontainers-by-nodes-stacked-barchart.js
index 251f557..4e45052 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-ncontainers-by-nodes-stacked-barchart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-ncontainers-by-nodes-stacked-barchart.js
@@ -29,7 +29,7 @@ export default StackedBarchart.extend({
containers.forEach(function(c) {
var nodeId = c.get("assignedNodeId");
var n = nodeToContainers[nodeId];
- if (undefined != n) {
+ if (undefined !== n) {
nodeToContainers[nodeId] += 1;
}
});
@@ -64,4 +64,4 @@ export default StackedBarchart.extend({
this.show(
data, this.get("title"), ["Running containers from this app"]);
},
-})
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-usage-donut-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-usage-donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-usage-donut-chart.js
index f5e7574..c939aaf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-usage-donut-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-usage-donut-chart.js
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import Ember from 'ember';
-import DonutChart from 'yarn-ui/components/donut-chart';
import BaseUsageDonutChart from 'yarn-ui/components/base-usage-donut-chart';
import ColorUtils from 'yarn-ui/utils/color-utils';
import HrefAddressUtils from 'yarn-ui/utils/href-address-utils';
@@ -66,4 +64,4 @@ export default BaseUsageDonutChart.extend({
this.initChart();
this.draw();
},
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-view.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-view.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-view.js
index adedf9a..f5fb68d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-view.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-view.js
@@ -92,7 +92,7 @@ export default Ember.Component.extend(ChartUtilsMixin, {
circle.on('mouseover', function () {
}.bind(this));
circle.on('mouseout', function () {
- if (circle != this.queues.selectedQueueCircle) {
+ if (circle !== this.queues.selectedQueueCircle) {
circle.style("fill", this.queueColors[0]);
}
}.bind(this));
@@ -143,7 +143,6 @@ export default Ember.Component.extend(ChartUtilsMixin, {
// render queues
this.queues.dataGroup = this.canvas.svg.append("g")
.attr("id", "queues-g");
- var rootQueue = undefined;
if (this.queues.data) {
this.renderQueue(this.queues.data['root'], 0, 0);
@@ -185,7 +184,7 @@ export default Ember.Component.extend(ChartUtilsMixin, {
/*
* data = [{label="xx", value=},{...}]
*/
- renderTable: function (data, title, layout) {
+ renderTable: function (data) {
d3.select("#main-svg")
.append('table')
.selectAll('tr')
@@ -254,7 +253,7 @@ export default Ember.Component.extend(ChartUtilsMixin, {
for (var queueName in this.queues.data) {
var q = this.queues.data[queueName];
if ((!q.get("children")) || q.get("children")
- .length == 0) {
+ .length === 0) {
// it's a leafqueue
leafQueueUsedCaps.push({
label: q.get("name"),
@@ -274,10 +273,10 @@ export default Ember.Component.extend(ChartUtilsMixin, {
var queue = this.queues.data[queueName];
var idx = 0;
- if (queue.get("name") == "root") {
+ if (queue.get("name") === "root") {
this.renderLeafQueueUsedCapacities(this.getLayout(idx++));
}
- if (queue.get("name") != "root") {
+ if (queue.get("name") !== "root") {
this.renderQueueCapacities(queue, this.getLayout(idx++));
}
if (queue.get("children") && queue.get("children")
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-table.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-table.js
index 359583d..c5dadc3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-table.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-table.js
@@ -48,11 +48,11 @@ export default Ember.Component.extend({
var cols = this.get("colsOrder").split(' ');
for (i = 0; i < cols.length; i++) {
var col = cols[i].split(',');
- if (col.length != 2) {
+ if (col.length !== 2) {
continue;
}
var order = col[1].trim();
- if (order != 'asc' && order != 'desc') {
+ if (order !== 'asc' && order !== 'desc') {
continue;
}
var colOrder = [];
@@ -61,7 +61,7 @@ export default Ember.Component.extend({
orderArr.push(colOrder);
}
}
- if (orderArr.length == 0) {
+ if (orderArr.length === 0) {
var defaultOrder = [0, 'asc'];
orderArr.push(defaultOrder);
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/stacked-barchart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/stacked-barchart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/stacked-barchart.js
index 4a121fe..e57d747 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/stacked-barchart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/stacked-barchart.js
@@ -17,7 +17,6 @@
*/
import BaseChartComponent from 'yarn-ui/components/base-chart-component';
-import Mock from 'yarn-ui/utils/mock';
export default BaseChartComponent.extend({
MAX_BAR_HEIGHT: 120,
@@ -37,7 +36,7 @@ export default BaseChartComponent.extend({
// Handle pie chart case
var text = element.attr("tooltiptext");
- this.tooltip.style("opacity", .9);
+ this.tooltip.style("opacity", 0.9);
this.tooltip.html(text)
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
@@ -99,9 +98,13 @@ export default BaseChartComponent.extend({
var maxValue = 0;
var maxN = 0;
- for (var i = 0; i < data.length; i++) {
+
+ var i = 0;
+ var j = 0;
+
+ for (i = 0; i < data.length; i++) {
var total = 0;
- for (var j = 0; j < data[i].length; j++) {
+ for (j = 0; j < data[i].length; j++) {
total += data[i][j].value;
}
@@ -121,14 +124,14 @@ export default BaseChartComponent.extend({
return b[0].value - a[0].value;
});
- for (var i = 0; i < data.length; i++) {
- if (i % nBarPerRow == 0) {
+ for (i = 0; i < data.length; i++) {
+ if (i % nBarPerRow === 0) {
xOffset = layout.margin;
yOffset += layout.margin + height;
}
var leftTopY = yOffset;
- for (var j = 0; j < data[i].length; j++) {
+ for (j = 0; j < data[i].length; j++) {
var dy = data[i][j].value * height / maxValue;
if (dy > 0) {
leftTopY = leftTopY - dy;
@@ -148,7 +151,7 @@ export default BaseChartComponent.extend({
}
}
- if (data[i].length == 1) {
+ if (data[i].length === 1) {
g.append("text")
.text(data[i][0].value)
.attr("y", leftTopY - 10)
@@ -165,7 +168,7 @@ export default BaseChartComponent.extend({
this.renderTitleAndBG(g, title, layout, false);
},
- draw: function(data, title, textWidth) {
+ draw: function() {
this.initChart(true);
//Mock.initMockNodesData(this);
@@ -195,4 +198,4 @@ export default BaseChartComponent.extend({
this.didInsertElement();
}
}
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
----------------------------------------------------------------------
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 516b114..d730a43 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
@@ -41,13 +41,15 @@ export default Ember.Component.extend({
}.property(),
setSelected: function(d) {
- if (this._selected == d) {
+ var dom;
+
+ if (this._selected === d) {
return;
}
// restore color
if (this._selected) {
- var dom = d3.select("#timeline-bar-" + this._selected.get("id"));
+ dom = d3.select("#timeline-bar-" + this._selected.get("id"));
dom.attr("fill", this.colors[0]);
}
@@ -164,19 +166,19 @@ export default Ember.Component.extend({
.attr("y", function(d, i) {
return border + (gap + singleBarHeight) * i;
})
- .attr("x", function(d, i) {
+ .attr("x", function(d) {
return border + textWidth + xScaler(d.get("startTs"));
})
.attr("height", singleBarHeight)
- .attr("fill", function(d, i) {
+ .attr("fill", function() {
return this.colors[0];
}.bind(this))
- .attr("width", function(d, i) {
+ .attr("width", function(d) {
var finishedTs = xScaler(d.get("finishedTs"));
finishedTs = finishedTs > 0 ? finishedTs : xScaler(end);
return finishedTs - xScaler(d.get("startTs"));
})
- .attr("id", function(d, i) {
+ .attr("id", function(d) {
return "timeline-bar-" + d.get("id");
});
bar.on("click", function(d) {
@@ -198,18 +200,18 @@ export default Ember.Component.extend({
},
bindTooltip: function(d) {
- d.on("mouseover", function(d) {
+ d.on("mouseover", function() {
this.tooltip
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
}.bind(this))
.on("mousemove", function(d) {
- this.tooltip.style("opacity", .9);
+ this.tooltip.style("opacity", 0.9);
this.tooltip.html(d.get("tooltipLabel"))
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
}.bind(this))
- .on("mouseout", function(d) {
+ .on("mouseout", function() {
this.tooltip.style("opacity", 0);
}.bind(this));
},
@@ -244,7 +246,7 @@ export default Ember.Component.extend({
}.bind(this));
}
- if(this.modelArr.length == 0) {
+ if(this.modelArr.length === 0) {
return;
}
@@ -254,8 +256,9 @@ export default Ember.Component.extend({
return tsA - tsB;
});
+ var begin = 0;
if (this.modelArr.length > 0) {
- var begin = this.modelArr[0].get("startTs");
+ begin = this.modelArr[0].get("startTs");
}
var end = 0;
for (var i = 0; i < this.modelArr.length; i++) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
index 5e7cfa0..c9e735d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
@@ -51,7 +51,7 @@ export default Ember.Component.extend({
this.map[o.id] = o;
}.bind(this));
- var selected = this.get("selected");
+ // var selected = this.get("selected");
this.initQueue("root", 1, this.treeData);
},
@@ -125,9 +125,9 @@ export default Ember.Component.extend({
// Enter any new nodes at the parent's previous position.
var nodeEnter = node.enter().append("g")
.attr("class", "node")
- .attr("transform", function(d) { return "translate(" + source.y0 + "," + source.x0 + ")"; })
- .on("mouseover", function(d,i){
- if (d.queueData.get("name") != this.get("selected")) {
+ .attr("transform", function() { return "translate(" + source.y0 + "," + source.x0 + ")"; })
+ .on("mouseover", function(d){
+ if (d.queueData.get("name") !== this.get("selected")) {
document.location.href = "#/yarn-queues/" + d.queueData.get("name");
}
@@ -161,10 +161,10 @@ export default Ember.Component.extend({
// append percentage
nodeEnter.append("text")
- .attr("x", function(d) { return 0; })
+ .attr("x", function() { return 0; })
.attr("dy", ".35em")
.attr("fill", "white")
- .attr("text-anchor", function(d) { return "middle"; })
+ .attr("text-anchor", function() { return "middle"; })
.text(function(d) {
var usedCap = d.queueData.get("usedCapacity");
if (usedCap >= 100.0) {
@@ -195,14 +195,14 @@ export default Ember.Component.extend({
return "#/yarn-queues/" + d.queueData.get("name");
})
.style("stroke-width", function(d) {
- if (d.queueData.get("name") == this.get("selected")) {
+ if (d.queueData.get("name") === this.get("selected")) {
return 7;
} else {
return 2;
}
}.bind(this))
.style("stroke", function(d) {
- if (d.queueData.get("name") == this.get("selected")) {
+ if (d.queueData.get("name") === this.get("selected")) {
return "gray";
} else {
return "gray";
@@ -215,7 +215,7 @@ export default Ember.Component.extend({
// Transition exiting nodes to the parent's new position.
var nodeExit = node.exit().transition()
.duration(duration)
- .attr("transform", function(d) { return "translate(" + source.y + "," + source.x + ")"; })
+ .attr("transform", function() { return "translate(" + source.y + "," + source.x + ")"; })
.remove();
nodeExit.select("circle")
@@ -231,9 +231,9 @@ export default Ember.Component.extend({
// Enter any new links at the parent's previous position.
link.enter().insert("path", "g")
.attr("class", "link")
- .attr("d", function(d) {
- var o = {x: source.x0, y: source.y0};
- return diagonal({source: o, target: o});
+ .attr("d", function() {
+ var o = {x: source.x0, y: source.y0};
+ return diagonal({source: o, target: o});
});
// Transition links to their new position.
@@ -244,9 +244,9 @@ export default Ember.Component.extend({
// Transition exiting nodes to the parent's new position.
link.exit().transition()
.duration(duration)
- .attr("d", function(d) {
- var o = {x: source.x, y: source.y};
- return diagonal({source: o, target: o});
+ .attr("d", function() {
+ var o = {x: source.x, y: source.y};
+ return diagonal({source: o, target: o});
})
.remove();
@@ -265,7 +265,6 @@ export default Ember.Component.extend({
var treeHeight = this.numOfLeafQueue * INBETWEEN_HEIGHT;
var width = treeWidth + margin.left + margin.right;
var height = treeHeight + margin.top + margin.bottom;
- var layout = { };
if (this.mainSvg) {
this.mainSvg.remove();
@@ -287,7 +286,7 @@ export default Ember.Component.extend({
root.x0 = height / 2;
root.y0 = 0;
- d3.select(self.frameElement).style("height", height);
+ d3.select(window.frameElement).style("height", height);
this.update(root, root, tree, diagonal);
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
index 2effb13..08ca5a6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
@@ -29,22 +29,22 @@ export default Ember.Controller.extend({
outputMainMenu: function(){
var path = this.get('currentPath');
var html = '<li';
- if (path == 'yarn-queue') {
+ if (path === 'yarn-queue') {
html = html + ' class="active"';
}
html = html + '><a href="yarn-queue/root">Queues<span class="sr-only">' +
'(current)</span></a></li><li';
- if (path.lastIndexOf('yarn-app', 0) == 0) {
+ if (path.lastIndexOf('yarn-app', 0) === 0) {
html = html + ' class="active"';
}
html = html + '><a href="yarn-apps">Applications<span class="sr-only">' +
'(current)</span></a></li><li';
- if (path == 'cluster-overview') {
+ if (path === 'cluster-overview') {
html = html + ' class="active"';
}
html = html + '><a href="cluster-overview">Cluster Overview<span class=' +
'"sr-only">(current)</span></a></li><li';
- if (path.lastIndexOf('yarn-node', 0) == 0) {
+ if (path.lastIndexOf('yarn-node', 0) === 0) {
html = html + ' class="active"';
}
html = html + '><a href="yarn-nodes">Nodes<span class="sr-only">' +
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/divide.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/divide.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/divide.js
index fcf64dd..437def8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/divide.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/divide.js
@@ -24,7 +24,7 @@ import Ember from 'ember';
export default Ember.Helper.helper(function(params,hash) {
var num = hash.num;
var den = hash.den;
- if (den == 0) {
+ if (den === 0) {
return 0;
}
return Math.floor(num/den);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
index 192e1ed..78dcf25 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
@@ -27,19 +27,18 @@ export default Ember.Helper.helper(function(params,hash) {
return "";
}
var logFilesLen = logFiles.length;
- if (logFilesLen == 0) {
+ if (logFilesLen === 0) {
return "";
}
var nodeId = hash.nodeId;
var nodeAddr = hash.nodeAddr;
var containerId = hash.containerId;
var html = '<td>';
- var logFilesCommaSeparated = "";
for (var i = 0; i < logFilesLen; i++) {
html = html + '<a href="#/yarn-container-log/' + nodeId + '/' +
nodeAddr + '/' + containerId + '/' + logFiles[i] + '">' + logFiles[i] +
'</a>';
- if (i != logFilesLen - 1) {
+ if (i !== logFilesLen - 1) {
html = html + ",";
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-link.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-link.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-link.js
index e524f08..d71ac77 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-link.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-link.js
@@ -26,7 +26,7 @@ export default Ember.Helper.helper(function(params,hash) {
var nodeHTTPAddress = hash.nodeHTTPAddress;
var nodeId = hash.nodeId;
var html = '<td>';
- if (nodeState == "SHUTDOWN" || nodeState == "LOST") {
+ if (nodeState === "SHUTDOWN" || nodeState === "LOST") {
html = html + nodeHTTPAddress;
} else {
html = html + '<a href="#/yarn-node/' + nodeId + "/" + nodeHTTPAddress + '">' +
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js
index d4a73a4..e1eba5a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js
@@ -25,7 +25,7 @@ export default Ember.Helper.helper(function(params,hash) {
// Place a menu within a panel inside col-md-2 container.
var nodeIdSplitAtPort = hash.nodeId;
var portIndex = nodeIdSplitAtPort.indexOf(':');
- if (portIndex != -1) {
+ if (portIndex !== -1) {
nodeIdSplitAtPort = nodeIdSplitAtPort.substring(0, portIndex) +
':​' + nodeIdSplitAtPort.substring(portIndex + 1);
}
@@ -35,7 +35,7 @@ export default Ember.Helper.helper(function(params,hash) {
var len = splitsAlongDots.length;
for (var i = 0; i < len; i++) {
normalizedNodeId = normalizedNodeId + splitsAlongDots[i];
- if (i != len - 1) {
+ if (i !== len - 1) {
normalizedNodeId = normalizedNodeId + '.​';
}
}
@@ -47,17 +47,17 @@ export default Ember.Helper.helper(function(params,hash) {
'<div class="panel-heading"><h4>Node Manager<br>(' + normalizedNodeId + ')</h4></div>'+
'<div class="panel-body"><ul class="nav nav-pills nav-stacked" id="stacked-menu">' +
'<ul class="nav nav-pills nav-stacked collapse in"><li';
- if (hash.path == 'yarn-node') {
+ if (hash.path === 'yarn-node') {
html = html + ' class="active"';
}
html = html + '><a href="#/yarn-node/' + hash.nodeId + '/' + hash.nodeAddr +
'">Node Information</a></li><li';
- if (hash.path == 'yarn-node-apps') {
+ if (hash.path === 'yarn-node-apps') {
html = html + ' class="active"';
}
html = html + '><a href="#/yarn-node-apps/' + hash.nodeId + '/' + hash.nodeAddr +
'">List of Applications</a></li><li';
- if (hash.path == 'yarn-node-containers') {
+ if (hash.path === 'yarn-node-containers') {
html = html + ' class="active"';
}
html = html + '><a href="#/yarn-node-containers/' +hash.nodeId + '/' + hash.nodeAddr +
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-name.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-name.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-name.js
index 56ce373..75bc017 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-name.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-name.js
@@ -23,7 +23,7 @@ export function nodeName(params/*, hash*/) {
console.log('nodes-uid', params[0]);
var nodeIdSplitAtPort = params[0];
var portIndex = nodeIdSplitAtPort.indexOf(':');
- if (portIndex != -1) {
+ if (portIndex !== -1) {
nodeIdSplitAtPort = nodeIdSplitAtPort.substring(0, portIndex) +
':​' + nodeIdSplitAtPort.substring(portIndex + 1);
}
@@ -33,7 +33,7 @@ export function nodeName(params/*, hash*/) {
var len = splitsAlongDots.length;
for (var i = 0; i < len; i++) {
normalizedNodeId = normalizedNodeId + splitsAlongDots[i];
- if (i != len - 1) {
+ if (i !== len - 1) {
normalizedNodeId = normalizedNodeId + '.​';
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
index 08e4dbd..aa8fb07 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
@@ -16,8 +16,11 @@
* limitations under the License.
*/
+/* globals ENV: true */
-function getTimeLineURL(parameters) {
+import Ember from 'ember';
+
+function getTimeLineURL() {
return '/conf?name=yarn.timeline-service.webapp.address';
}
@@ -37,7 +40,6 @@ function updateConfigs(application) {
}
if(!ENV.hosts.timelineWebAddress) {
- var result = [];
var timelinehost = "";
$.ajax({
type: 'GET',
@@ -54,7 +56,7 @@ function updateConfigs(application) {
Ember.Logger.log("Timeline Address from RM:" + address + ":" + port);
- if(address == "0.0.0.0" || address == "localhost") {
+ if(address === "0.0.0.0" || address === "localhost") {
var updatedAddress = hostname + ":" + port;
/* Timeline v2 is not supporting CORS, so make as default*/
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
index f30d143..c83eb2e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import Ember from 'ember';
import DS from 'ember-data';
import Converter from 'yarn-ui/utils/converter';
@@ -45,8 +46,8 @@ export default DS.Model.extend({
attemptStartedTime: function() {
var startTime = this.get("startTime");
// If startTime variable is not present, get from startedTime
- if (startTime == undefined ||
- startTime == "Invalid date") {
+ if (startTime === undefined ||
+ startTime === "Invalid date") {
startTime = this.get("startedTime");
}
@@ -80,7 +81,7 @@ export default DS.Model.extend({
appMasterContainerId: function() {
var id = this.get("containerId");
// If containerId variable is not present, get from amContainerId
- if (id == undefined) {
+ if (id === undefined) {
id = this.get("amContainerId");
}
return id;
@@ -89,16 +90,16 @@ export default DS.Model.extend({
IsAmNodeUrl: function() {
var url = this.get("nodeHttpAddress");
// If nodeHttpAddress variable is not present, hardcode it.
- if (url == undefined) {
+ if (url === undefined) {
url = "Not Available";
}
- return url != "Not Available";
+ return url !== "Not Available";
}.property("nodeHttpAddress"),
amNodeId : function() {
var id = this.get("nodeId");
// If nodeId variable is not present, get from host
- if (id == undefined) {
+ if (id === undefined) {
id = this.get("hosts");
}
return id;
@@ -107,10 +108,10 @@ export default DS.Model.extend({
IsLinkAvailable: function() {
var url = this.get("logsLink");
// If logsLink variable is not present, hardcode its.
- if (url == undefined) {
+ if (url === undefined) {
url = "Not Available";
}
- return url != "Not Available";
+ return url !== "Not Available";
}.property("logsLink"),
elapsedTime: function() {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/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 4138a87..ea1334f 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
@@ -54,7 +54,7 @@ export default DS.Model.extend({
applicationExpiryTime: DS.attr('string'),
isFailed: function() {
- return this.get('finalStatus') == "FAILED"
+ return this.get('finalStatus') == "FAILED";
}.property("finalStatus"),
validatedFinishedTs: function() {
@@ -91,11 +91,11 @@ export default DS.Model.extend({
var finalStatus = this.get("finalStatus");
var style = "";
- if (finalStatus == "KILLED") {
+ if (finalStatus === "KILLED") {
style = "warning";
- } else if (finalStatus == "FAILED") {
+ } else if (finalStatus === "FAILED") {
style = "danger";
- } else if (finalStatus == "SUCCEEDED") {
+ } else if (finalStatus === "SUCCEEDED") {
style = "success";
} else {
style = "default";
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-app.js
index 6dc69ae..bc2447f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-app.js
@@ -27,16 +27,16 @@ export default DS.Model.extend({
* Indicates no rows were retrieved from backend
*/
isDummyApp: function() {
- return this.get('id') == "dummy";
+ return this.get('id') === "dummy";
}.property("id"),
appStateStyle: function() {
var style = "default";
var appState = this.get("state");
- if (appState == "RUNNING" || appState == "FINISHING_CONTAINERS_WAIT" ||
- appState == "APPLICATION_RESOURCES_CLEANINGUP") {
+ if (appState === "RUNNING" || appState === "FINISHING_CONTAINERS_WAIT" ||
+ appState === "APPLICATION_RESOURCES_CLEANINGUP") {
style = "primary";
- } else if (appState == "FINISHED") {
+ } else if (appState === "FINISHED") {
style = "success";
}
return "label label-" + style;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container.js
index 3ba3216..40e8447 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container.js
@@ -32,24 +32,24 @@ export default DS.Model.extend({
* Indicates that there was no container retrieved from backend.
*/
isDummyContainer: function() {
- return this.get('id') == "dummy";
+ return this.get('id') === "dummy";
}.property("id"),
containerStateStyle: function() {
var style = "primary";
var containerState = this.get('state');
var containerExitCode = this.get('exitCode');
- if (containerState == "DONE") {
- if (containerExitCode == "0") {
+ if (containerState === "DONE") {
+ if (parseInt(containerExitCode) === 0) {
style = "success";
- } else if (containerExitCode != "N/A") {
+ } else if (containerExitCode !== "N/A") {
style = "danger";
}
}
- if (containerState == "EXITED_WITH_SUCCESS") {
+ if (containerState === "EXITED_WITH_SUCCESS") {
style = "success";
}
- if (containerState == "EXITED_WITH_FAILURE") {
+ if (containerState === "EXITED_WITH_FAILURE") {
style = "danger";
}
return "label label-" + style;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js
index 7de4ccc..27c48f7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue.js
@@ -48,17 +48,17 @@ export default DS.Model.extend({
return [
{
label: "Absolute Capacity",
- value: this.get("name") == "root" ? 100 : this.get("absCapacity")
+ value: this.get("name") === "root" ? 100 : this.get("absCapacity")
},
{
label: "Absolute Used",
- value: this.get("name") == "root" ? this.get("usedCapacity") : this.get("absUsedCapacity")
+ value: this.get("name") === "root" ? this.get("usedCapacity") : this.get("absUsedCapacity")
},
{
label: "Absolute Max Capacity",
- value: this.get("name") == "root" ? 100 : this.get("absMaxCapacity")
+ value: this.get("name") === "root" ? 100 : this.get("absMaxCapacity")
}
- ]
+ ];
}.property("absCapacity", "absUsedCapacity", "absMaxCapacity"),
userUsagesDonutChartData: function() {
@@ -68,7 +68,7 @@ export default DS.Model.extend({
data.push({
label: o.get("name"),
value: o.get("usedMemoryMB")
- })
+ });
});
}
@@ -89,6 +89,6 @@ export default DS.Model.extend({
label: "Active Apps",
value: this.get("numActiveApplications") || 0
}
- ]
- }.property(),
+ ];
+ }.property()
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
index a15a20f..c7875b4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
@@ -47,18 +47,18 @@ export default DS.Model.extend({
* Indicates no rows were retrieved from backend
*/
isDummyNode: function() {
- return this.get('id') == "dummy";
+ return this.get('id') === "dummy";
}.property("id"),
nodeStateStyle: function() {
var style = "default";
var nodeState = this.get("state");
- if (nodeState == "REBOOTED") {
+ if (nodeState === "REBOOTED") {
style = "warning";
- } else if (nodeState == "UNHEALTHY" || nodeState == "DECOMMISSIONED" ||
- nodeState == "LOST" || nodeState == "SHUTDOWN") {
+ } else if (nodeState === "UNHEALTHY" || nodeState === "DECOMMISSIONED" ||
+ nodeState === "LOST" || nodeState === "SHUTDOWN") {
style = "danger";
- } else if (nodeState == "RUNNING") {
+ } else if (nodeState === "RUNNING") {
style = "success";
}
return "label label-" + style;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-user.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-user.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-user.js
index 7cfd182..84b0fab 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-user.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-user.js
@@ -23,4 +23,4 @@ export default DS.Model.extend({
queueName: DS.attr('string'),
usedMemoryMB: DS.attr('number'),
usedVCore: DS.attr('number')
-})
\ No newline at end of file
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
index 07b3792..1fd11e6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
@@ -29,8 +29,7 @@ export default Ember.Route.extend({
error: function (error) {
Ember.Logger.log(error.stack);
- if (error && error.errors[0] &&
- error.errors[0].status == 404) {
+ if (error && error.errors[0] && parseInt(error.errors[0].status) === 404) {
this.intermediateTransitionTo('/notfound');
} else {
this.intermediateTransitionTo('/error');
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
index 121debf..78ff1c9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import Ember from 'ember';
-
import AbstractRoute from './abstract';
export default AbstractRoute.extend({
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
index 000b02f..86d845c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
@@ -25,7 +25,7 @@ export default AbstractRoute.extend({
return Ember.RSVP.hash({
app: this.store.find('yarn-app', param.app_id),
- rmContainers: this.store.find('yarn-app', param.app_id).then(function(app) {
+ rmContainers: this.store.find('yarn-app', param.app_id).then(function() {
return this.store.query('yarn-app-attempt', {appId: param.app_id}).then(function (attempts) {
if (attempts && attempts.get('firstObject')) {
var appAttemptId = attempts.get('firstObject').get('appAttemptId');
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-container-log.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-container-log.js
index 9e4c7d3..8562bf5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-container-log.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-container-log.js
@@ -49,7 +49,7 @@ export default AbstractRoute.extend({
afterModel(model) {
// Handle errors and redirect if promise is rejected.
if (model.errors && model.errors[0]) {
- if (model.errors[0].status == 404) {
+ if (parseInt(model.errors[0].status) === 404) {
this.replaceWith('/notfound');
} else {
this.replaceWith('/error');
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/index.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/index.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/index.js
index 4ab5716..436c6d8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/index.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues/index.js
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+import Ember from 'ember';
+
export default Ember.Route.extend({
beforeModel() {
this.transitionTo('yarn-queues.root');
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js
index 3de377a..f8f598b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js
@@ -20,13 +20,12 @@ import DS from 'ember-data';
import Converter from 'yarn-ui/utils/converter';
export default DS.JSONAPISerializer.extend({
- internalNormalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
-
+ internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+
if (payload.appAttempt) {
- payload = payload.appAttempt;
+ payload = payload.appAttempt;
}
-
+
var fixedPayload = {
id: payload.appAttemptId,
type: primaryModelClass.modelName, // yarn-app
@@ -48,15 +47,13 @@ export default DS.JSONAPISerializer.extend({
return fixedPayload;
},
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
- var p = this.internalNormalizeSingleResponse(store,
- primaryModelClass, payload, id, requestType);
+ normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+ var p = this.internalNormalizeSingleResponse(store,
+ primaryModelClass, payload);
return { data: p };
},
- normalizeArrayResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// return expected is { data: [ {}, {} ] }
var normalizedArrayResponse = {};
@@ -65,11 +62,11 @@ export default DS.JSONAPISerializer.extend({
// need some error handling for ex apps or app may not be defined.
normalizedArrayResponse.data = payload.appAttempts.appAttempt.map(singleApp => {
return this.internalNormalizeSingleResponse(store, primaryModelClass,
- singleApp, singleApp.id, requestType);
+ singleApp);
}, this);
} else {
normalizedArrayResponse.data = [];
}
return normalizedArrayResponse;
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/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 fdba04a..7c82ec2 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
@@ -20,8 +20,7 @@ import DS from 'ember-data';
import Converter from 'yarn-ui/utils/converter';
export default DS.JSONAPISerializer.extend({
- internalNormalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ internalNormalizeSingleResponse(store, primaryModelClass, payload, id) {
if (payload.app) {
payload = payload.app;
}
@@ -76,15 +75,13 @@ export default DS.JSONAPISerializer.extend({
return fixedPayload;
},
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
var p = this.internalNormalizeSingleResponse(store,
- primaryModelClass, payload, id, requestType);
+ primaryModelClass, payload, id);
return { data: p };
},
- normalizeArrayResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// return expected is { data: [ {}, {} ] }
var normalizedArrayResponse = {};
@@ -93,7 +90,7 @@ export default DS.JSONAPISerializer.extend({
if(payload.apps && payload.apps.app) {
normalizedArrayResponse.data = payload.apps.app.map(singleApp => {
return this.internalNormalizeSingleResponse(store, primaryModelClass,
- singleApp, singleApp.id, requestType);
+ singleApp, singleApp.id);
}, this);
} else {
normalizedArrayResponse.data = [];
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container-log.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container-log.js
index 9e10615..2aacf72 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container-log.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container-log.js
@@ -20,8 +20,7 @@ import DS from 'ember-data';
import Converter from 'yarn-ui/utils/converter';
export default DS.JSONAPISerializer.extend({
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
// Convert plain text response into JSON.
// ID is of the form nodeAddress!containerId!fileName
var splits = Converter.splitForContainerLogs(id);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js
index b9b923d..8ccff07 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js
@@ -20,9 +20,8 @@ import DS from 'ember-data';
import Converter from 'yarn-ui/utils/converter';
export default DS.JSONAPISerializer.extend({
- internalNormalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
-
+ internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+
var fixedPayload = {
id: payload.containerId,
type: primaryModelClass.modelName, // yarn-app
@@ -44,15 +43,13 @@ export default DS.JSONAPISerializer.extend({
return fixedPayload;
},
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
- var p = this.internalNormalizeSingleResponse(store,
- primaryModelClass, payload, id, requestType);
+ normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+ var p = this.internalNormalizeSingleResponse(store,
+ primaryModelClass, payload);
return { data: p };
},
- normalizeArrayResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// return expected is { data: [ {}, {} ] }
var normalizedArrayResponse = {};
@@ -62,12 +59,11 @@ export default DS.JSONAPISerializer.extend({
// need some error handling for ex apps or app may not be defined.
normalizedArrayResponse.data = payload.container.map(singleContainer => {
return this.internalNormalizeSingleResponse(store, primaryModelClass,
- singleContainer, singleContainer.id, requestType);
+ singleContainer);
}, this);
} else {
normalizedArrayResponse.data = [this.internalNormalizeSingleResponse(
- store, primaryModelClass, payload.container, payload.container.id,
- requestType)];
+ store, primaryModelClass, payload.container)];
}
return normalizedArrayResponse;
} else {
@@ -76,4 +72,4 @@ export default DS.JSONAPISerializer.extend({
return normalizedArrayResponse;
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
index 3dfd776..9f6c425 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
@@ -15,26 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * 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.
- */
import DS from 'ember-data';
-import Ember from 'ember';
export default DS.JSONAPISerializer.extend({
internalNormalizeSingleResponse(store, primaryModelClass, payload) {
@@ -55,16 +37,14 @@ export default DS.JSONAPISerializer.extend({
return fixedPayload;
},
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// payload is of the form {"app":{}}
var p = this.internalNormalizeSingleResponse(store,
primaryModelClass, payload);
return { data: p };
},
- normalizeArrayResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// expected return response is of the form { data: [ {}, {} ] }
var normalizedArrayResponse = {};
// payload is of the form { "apps" : { "app": [ {},{},{} ] } }
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
index bf19ad7..7e78987 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
@@ -17,7 +17,6 @@
*/
import DS from 'ember-data';
-import Ember from 'ember';
export default DS.JSONAPISerializer.extend({
internalNormalizeSingleResponse(store, primaryModelClass, payload) {
@@ -42,16 +41,14 @@ export default DS.JSONAPISerializer.extend({
return fixedPayload;
},
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// payload is of the form {"container":{}}
var p = this.internalNormalizeSingleResponse(store,
primaryModelClass, payload);
return { data: p };
},
- normalizeArrayResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// expected return response is of the form { data: [ {}, {} ] }
var normalizedArrayResponse = {};
if (payload.containers && payload.containers.container) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
index 19308e2..0d9faec 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
@@ -20,8 +20,7 @@ import DS from 'ember-data';
import Converter from 'yarn-ui/utils/converter';
export default DS.JSONAPISerializer.extend({
- internalNormalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ internalNormalizeSingleResponse(store, primaryModelClass, payload, id) {
if (payload.nodeInfo) {
payload = payload.nodeInfo;
}
@@ -46,11 +45,10 @@ export default DS.JSONAPISerializer.extend({
return fixedPayload;
},
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
// payload is of the form {"nodeInfo":{}}
var p = this.internalNormalizeSingleResponse(store,
- primaryModelClass, payload, id, requestType);
+ primaryModelClass, payload, id);
return { data: p };
},
});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[24/50] [abbrv] hadoop git commit: YARN-5785. [YARN-3368] Accessing
applications and containers list from Node page is throwing few exceptions in
console. (Akhil P B and Sreenath Somarajapuram via Sunil G)
Posted by va...@apache.org.
YARN-5785. [YARN-3368] Accessing applications and containers list from Node page is throwing few exceptions in console. (Akhil P B and Sreenath Somarajapuram via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4fba66c2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4fba66c2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4fba66c2
Branch: refs/heads/YARN-3368_branch2
Commit: 4fba66c28e0b1848251bffc643a690838989bf60
Parents: 6c68032
Author: sunilg <su...@apache.org>
Authored: Fri Oct 28 19:56:18 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/adapters/yarn-node-app.js | 12 ++----------
.../src/main/webapp/app/adapters/yarn-node-container.js | 12 ++----------
.../src/main/webapp/app/adapters/yarn-node.js | 5 +----
.../src/main/webapp/app/serializers/yarn-node-app.js | 2 +-
.../main/webapp/app/serializers/yarn-node-container.js | 2 +-
.../src/main/webapp/config/default-config.js | 2 +-
6 files changed, 8 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fba66c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-app.js
index eaddfcb..6d69828 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-app.js
@@ -25,22 +25,14 @@ export default AbstractAdapter.extend({
serverName: "NM",
urlForQuery(query) {
- var extension = this.get("host").split('/').pop();
- if (extension != query.nodeAddr) {
- this.host = this.get("host") + query.nodeAddr;
- }
var url = this._buildURL();
- url = url + "/apps";
+ url = url.replace("{nodeAddress}", query.nodeAddr) + "/apps";
return url;
},
urlForQueryRecord: function (query) {
- var extension = this.get("host").split('/').pop();
- if (extension != query.nodeAddr) {
- this.host = this.get("host") + query.nodeAddr;
- }
var url = this._buildURL();
- url = url + "/apps/" + query.appId;
+ url = url.replace("{nodeAddress}", query.nodeAddr) + "/apps/" + query.appId;
return url;
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fba66c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container.js
index 56c4bcd..0fff047 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container.js
@@ -25,22 +25,14 @@ export default AbstractAdapter.extend({
serverName: "NM",
urlForQuery(query) {
- var extension = this.get("host").split('/').pop();
- if (extension != query.nodeHttpAddr) {
- this.host = this.get("host") + query.nodeHttpAddr;
- }
var url = this._buildURL();
- url = url + "/containers";
+ url = url.replace("{nodeAddress}", query.nodeHttpAddr) + "/containers";
return url;
},
urlForQueryRecord(query) {
- var extension = this.get("host").split('/').pop();
- if (extension != query.nodeHttpAddr) {
- this.host = this.get("host") + query.nodeHttpAddr;
- }
var url = this._buildURL();
- url = url + "/containers/" + query.containerId;
+ url = url.replace("{nodeAddress}", query.nodeHttpAddr) + "/containers/" + query.containerId;
return url;
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fba66c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
index 7a0fc4a..5bcfc9a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
@@ -25,11 +25,8 @@ export default AbstractAdapter.extend({
serverName: "NM",
urlForFindRecord(id, modelName, snapshot) {
- var extension = this.get("host").split('/').pop();
- if (extension != id) {
- this.host = this.get("host") + id;
- }
var url = this._buildURL();
+ url = url.replace("{nodeAddress}", id);
return url;
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fba66c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
index 5945813..3dfd776 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
@@ -68,7 +68,7 @@ export default DS.JSONAPISerializer.extend({
// expected return response is of the form { data: [ {}, {} ] }
var normalizedArrayResponse = {};
// payload is of the form { "apps" : { "app": [ {},{},{} ] } }
- if (payload.apps) {
+ if (payload.apps && payload.apps.app) {
normalizedArrayResponse.data = payload.apps.app.map(singleApp => {
return this.internalNormalizeSingleResponse(store, primaryModelClass,
singleApp);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fba66c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
index a104f1e..bf19ad7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
@@ -54,7 +54,7 @@ export default DS.JSONAPISerializer.extend({
requestType) {
// expected return response is of the form { data: [ {}, {} ] }
var normalizedArrayResponse = {};
- if (payload.containers) {
+ if (payload.containers && payload.containers.container) {
// payload is of the form { "containers" : { "container": [ {},{},{} ] } }
normalizedArrayResponse.data =
payload.containers.container.map(singleContainer => {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fba66c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
index c5dbbea..70d4ebc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
@@ -27,6 +27,6 @@ module.exports = { // Yarn UI App configurations
timeline: 'ws/v1/applicationhistory',
cluster: 'ws/v1/cluster',
metrics: 'ws/v1/cluster/metrics',
- node: 'ws/v1/node'
+ node: '{nodeAddress}/ws/v1/node'
},
};
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[18/50] [abbrv] hadoop git commit: YARN-6291. Introduce query parameters (sort, filter, etc.) for tables to keep state on refresh/navigation in new YARN UI. Contributed by Gergely Novák.
Posted by va...@apache.org.
YARN-6291. Introduce query parameters (sort, filter, etc.) for tables to keep state on refresh/navigation in new YARN UI. Contributed by Gergely Novák.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/458ba54e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/458ba54e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/458ba54e
Branch: refs/heads/YARN-3368_branch2
Commit: 458ba54ea5fee0f2abf041e020f8c28fcc6d8650
Parents: c069f4f
Author: Sunil G <su...@apache.org>
Authored: Mon Apr 24 13:28:57 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/controllers/yarn-apps/apps.js | 10 ++++++++++
.../src/main/webapp/app/controllers/yarn-apps/services.js | 10 ++++++++++
.../src/main/webapp/app/controllers/yarn-nodes/table.js | 8 ++++++++
.../src/main/webapp/app/templates/yarn-apps/apps.hbs | 2 +-
.../src/main/webapp/app/templates/yarn-apps/services.hbs | 2 +-
.../src/main/webapp/app/templates/yarn-nodes/table.hbs | 2 +-
6 files changed, 31 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/458ba54e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
index 0b0be20..44a7c1c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
@@ -16,7 +16,17 @@
* limitations under the License.
*/
+import Ember from 'ember';
+import ColumnDef from 'em-table/utils/column-definition';
+import TableDefinition from 'em-table/utils/table-definition';
import AppTableController from '../app-table-columns';
export default AppTableController.extend({
+ queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 'rowCount'],
+ tableDefinition: TableDefinition.create(),
+ searchText: Ember.computed.alias('tableDefinition.searchText'),
+ sortColumnId: Ember.computed.alias('tableDefinition.sortColumnId'),
+ sortOrder: Ember.computed.alias('tableDefinition.sortOrder'),
+ pageNum: Ember.computed.alias('tableDefinition.pageNum'),
+ rowCount: Ember.computed.alias('tableDefinition.rowCount')
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/458ba54e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
index 0b0be20..44a7c1c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
@@ -16,7 +16,17 @@
* limitations under the License.
*/
+import Ember from 'ember';
+import ColumnDef from 'em-table/utils/column-definition';
+import TableDefinition from 'em-table/utils/table-definition';
import AppTableController from '../app-table-columns';
export default AppTableController.extend({
+ queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 'rowCount'],
+ tableDefinition: TableDefinition.create(),
+ searchText: Ember.computed.alias('tableDefinition.searchText'),
+ sortColumnId: Ember.computed.alias('tableDefinition.sortColumnId'),
+ sortOrder: Ember.computed.alias('tableDefinition.sortOrder'),
+ pageNum: Ember.computed.alias('tableDefinition.pageNum'),
+ rowCount: Ember.computed.alias('tableDefinition.rowCount')
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/458ba54e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
index 3b7b0f6..3fae596 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
@@ -19,8 +19,16 @@
import Ember from 'ember';
import ColumnDef from 'em-table/utils/column-definition';
+import TableDefinition from 'em-table/utils/table-definition';
export default Ember.Controller.extend({
+ queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 'rowCount'],
+ tableDefinition: TableDefinition.create(),
+ searchText: Ember.computed.alias('tableDefinition.searchText'),
+ sortColumnId: Ember.computed.alias('tableDefinition.sortColumnId'),
+ sortOrder: Ember.computed.alias('tableDefinition.sortOrder'),
+ pageNum: Ember.computed.alias('tableDefinition.pageNum'),
+ rowCount: Ember.computed.alias('tableDefinition.rowCount'),
columns: function() {
var colums = [];
colums.push({
http://git-wip-us.apache.org/repos/asf/hadoop/blob/458ba54e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/apps.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/apps.hbs
index 8c72ce4..f740083 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/apps.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/apps.hbs
@@ -20,7 +20,7 @@
<h4 align="center">Loading...</h4>
{{else}}
{{#if model.apps}}
- {{em-table columns=columns rows=model.apps}}
+ {{em-table columns=columns rows=model.apps definition=tableDefinition}}
{{else}}
<h4 align="center">Could not find any applications from this cluster</h4>
{{/if}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/458ba54e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/services.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/services.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/services.hbs
index 7556908..d56762c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/services.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/services.hbs
@@ -17,7 +17,7 @@
--}}
{{#if model.apps}}
- {{em-table columns=columns rows=model.apps}}
+ {{em-table columns=columns rows=model.apps definition=tableDefinition}}
{{else}}
<h4 align="center">Could not find any applications from this cluster</h4>
{{/if}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/458ba54e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
index 79d721b..6ebcae2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
@@ -18,7 +18,7 @@
<div class="row">
<div class="col-md-12">
{{#if model.nodes}}
- {{em-table columns=columns rows=model.nodes}}
+ {{em-table columns=columns rows=model.nodes definition=tableDefinition}}
{{else}}
<h4 align="center">No nodes found on this cluster</h4>
{{/if}}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[29/50] [abbrv] hadoop git commit: YARN-5335. Use em-table in
app/nodes pages for new YARN UI. Contributed by Sunil G.
Posted by va...@apache.org.
YARN-5335. Use em-table in app/nodes pages for new YARN UI. Contributed by Sunil G.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/03511fda
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/03511fda
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/03511fda
Branch: refs/heads/YARN-3368_branch2
Commit: 03511fdaf8b72a0135a8d12542838bacbfa19f39
Parents: 148c7b8
Author: Sunil G <su...@apache.org>
Authored: Tue Feb 28 13:49:19 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/adapters/yarn-app.js | 4 +-
.../app/components/app-usage-donut-chart.js | 1 -
.../main/webapp/app/components/donut-chart.js | 1 -
.../webapp/app/controllers/app-table-columns.js | 98 +++++++++++++++++
.../webapp/app/controllers/yarn-apps/apps.js | 25 +++++
.../app/controllers/yarn-apps/services.js | 25 +++++
.../main/webapp/app/controllers/yarn-node.js | 3 +-
.../webapp/app/controllers/yarn-nodes/table.js | 109 +++++++++++++++++++
.../webapp/app/controllers/yarn-queue/apps.js | 31 ++++++
.../src/main/webapp/app/models/yarn-rm-node.js | 8 ++
.../src/main/webapp/app/routes/yarn-apps.js | 2 -
.../main/webapp/app/routes/yarn-apps/apps.js | 9 ++
.../webapp/app/routes/yarn-apps/services.js | 11 ++
.../src/main/webapp/app/routes/yarn-queue.js | 4 +-
.../src/main/webapp/app/routes/yarn-queues.js | 3 +-
.../src/main/webapp/app/serializers/yarn-app.js | 3 +-
.../webapp/app/templates/yarn-apps/apps.hbs | 13 ++-
.../webapp/app/templates/yarn-apps/services.hbs | 4 +-
.../webapp/app/templates/yarn-nodes/table.hbs | 42 +------
.../webapp/app/templates/yarn-queue/apps.hbs | 3 +-
.../hadoop-yarn-ui/src/main/webapp/package.json | 9 +-
.../unit/controllers/app-table-columns-test.js | 30 +++++
.../unit/controllers/yarn-apps/apps-test.js | 30 +++++
.../unit/controllers/yarn-apps/services-test.js | 30 +++++
.../unit/controllers/yarn-nodes/table-test.js | 30 +++++
.../unit/controllers/yarn-queue/apps-test.js | 30 +++++
26 files changed, 492 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
index b34c606..fc52f7c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
@@ -25,9 +25,7 @@ export default AbstractAdapter.extend({
urlForQuery(query/*, modelName*/) {
var url = this._buildURL();
- if (query.state) {
- url = url + '/apps/?state=' + query.state;
- }
+ url = url + '/apps';
return url;
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
index 274c219..c72d934 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
@@ -36,7 +36,6 @@ export default BaseUsageDonutChart.extend({
value: v.toFixed(2)
});
- console.log(v);
avail = avail - v;
}
}.bind(this));
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
index e5699b4..82d2d46 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
@@ -54,7 +54,6 @@ export default BaseChartComponent.extend({
// 50 is for title
var outerRadius = (h - 50 - 2 * layout.margin) / 2;
var innerRadius = outerRadius * 0.618;
- console.log("inner:" + innerRadius + " outer:" + outerRadius);
var arc = d3.svg.arc()
.innerRadius(innerRadius)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..53a6439
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
@@ -0,0 +1,98 @@
+/**
+ * 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.
+ */
+
+
+import Ember from 'ember';
+import ColumnDef from 'em-table/utils/column-definition';
+
+export default Ember.Controller.extend({
+ columns: function() {
+ var colums = [];
+ colums.push({
+ id: 'appId',
+ headerTitle: 'Application ID',
+ contentPath: 'id',
+ cellComponentName: 'em-table-linked-cell',
+ getCellContent: function(row) {
+ return {
+ displayText: row.id,
+ routeName: 'yarn-app',
+ id: row.id
+ };
+ },
+ minWidth: "250px"
+ }, {
+ id: 'appType',
+ headerTitle: 'Application Type',
+ contentPath: 'applicationType',
+ }, {
+ id: 'appName',
+ headerTitle: 'Application Name',
+ contentPath: 'appName',
+ }, {
+ id: 'appUsr',
+ headerTitle: 'User',
+ contentPath: 'user',
+ minWidth: "50px"
+ }, {
+ id: 'queue',
+ headerTitle: 'Queue',
+ contentPath: 'queue',
+ }, {
+ id: 'state',
+ headerTitle: 'State',
+ contentPath: 'state',
+ cellComponentName: 'em-table-status-cell',
+ minWidth: "50px"
+ }, {
+ id: 'progress',
+ headerTitle: 'Progress',
+ contentPath: 'progress',
+ cellComponentName: 'em-table-progress-cell',
+ cellDefinition: {
+ valueMax: 100
+ },
+ }, {
+ id: 'stTime',
+ headerTitle: 'Start Time',
+ contentPath: 'startTime',
+ }, {
+ id: 'elTime',
+ headerTitle: 'Elapsed Time',
+ contentPath: 'elapsedTime',
+ cellDefinition: {
+ type: "duration"
+ }
+ }, {
+ id: 'finishTime',
+ headerTitle: 'Finished Time',
+ contentPath: 'validatedFinishedTs',
+ observePath: true
+ }, {
+ id: 'priority',
+ headerTitle: 'Priority',
+ contentPath: 'priority',
+ }, {
+ id: 'cluster',
+ headerTitle: '%Cluster',
+ contentPath: 'clusterUsagePercentage',
+ observePath: true
+ });
+ return ColumnDef.make(colums);
+ }.property()
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
new file mode 100644
index 0000000..5c5063b
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
@@ -0,0 +1,25 @@
+/**
+ * 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.
+ */
+
+
+import Ember from 'ember';
+import ColumnDef from 'em-table/utils/column-definition';
+import AppTableController from '../app-table-columns';
+
+export default AppTableController.extend({
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
new file mode 100644
index 0000000..5c5063b
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
@@ -0,0 +1,25 @@
+/**
+ * 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.
+ */
+
+
+import Ember from 'ember';
+import ColumnDef from 'em-table/utils/column-definition';
+import AppTableController from '../app-table-columns';
+
+export default AppTableController.extend({
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
index 55d9b3e..335a33c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
@@ -20,8 +20,9 @@ import Ember from 'ember';
export default Ember.Controller.extend({
- breadcrumbs: Ember.computed("model.attempt.appId", function () {
+ breadcrumbs: Ember.computed("model.nodeInfo", function () {
var nodeInfo = this.get("model.nodeInfo");
+
return [{
text: "Home",
routeName: 'application'
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
new file mode 100644
index 0000000..3b7b0f6
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
@@ -0,0 +1,109 @@
+/**
+ * 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.
+ */
+
+
+import Ember from 'ember';
+import ColumnDef from 'em-table/utils/column-definition';
+
+export default Ember.Controller.extend({
+ columns: function() {
+ var colums = [];
+ colums.push({
+ id: 'label',
+ headerTitle: 'Node Label',
+ contentPath: 'nodeLabelsAsString',
+ minWidth: "100px"
+ }, {
+ id: 'rack',
+ headerTitle: 'Rack',
+ contentPath: 'rack',
+ minWidth: "100px"
+ }, {
+ id: 'state',
+ headerTitle: 'Node State',
+ contentPath: 'state',
+ cellComponentName: 'em-table-status-cell',
+ minWidth: "100px"
+ }, {
+ id: 'address',
+ headerTitle: 'Node Address',
+ contentPath: 'id',
+ minWidth: "300px"
+ }, {
+ id: 'nodeId',
+ headerTitle: 'Node HTTP Address',
+ contentPath: 'nodeHTTPAddress',
+ cellComponentName: 'em-table-linked-cell',
+ getCellContent: function(row) {
+ var node_id = row.get("id"),
+ node_addr = row.get("nodeHTTPAddress"),
+ href = `#/yarn-node/${node_id}/${node_addr}`;
+ switch(row.get("nodeState")) {
+ case "SHUTDOWN":
+ case "LOST":
+ href = "";
+ }
+ return {
+ text: row.get("nodeHTTPAddress"),
+ href: href
+ };
+ },
+ minWidth: "250px"
+ }, {
+ id: 'containers',
+ headerTitle: 'Containers',
+ contentPath: 'numContainers',
+ }, {
+ id: 'memUsed',
+ headerTitle: 'Mem Used',
+ contentPath: 'usedMemoryBytes',
+ cellDefinition: {
+ type: "memory"
+ }
+ }, {
+ id: 'memAvail',
+ headerTitle: 'Mem Available',
+ contentPath: 'availMemoryBytes',
+ cellDefinition: {
+ type: "memory"
+ }
+ }, {
+ id: 'coresUsed',
+ headerTitle: 'VCores Used',
+ contentPath: 'usedVirtualCores',
+ }, {
+ id: 'coresAvail',
+ headerTitle: 'VCores Available',
+ contentPath: 'availableVirtualCores',
+ }, {
+ id: 'healthUpdate',
+ headerTitle: 'Last Health Update',
+ contentPath: 'lastHealthUpdate',
+ }, {
+ id: 'healthReport',
+ headerTitle: 'Health-Report',
+ contentPath: 'healthReport',
+ }, {
+ id: 'version',
+ headerTitle: 'Version',
+ contentPath: 'version',
+ observePath: true
+ });
+ return ColumnDef.make(colums);
+ }.property()
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue/apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue/apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue/apps.js
new file mode 100644
index 0000000..905d96d
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue/apps.js
@@ -0,0 +1,31 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import TableDefinition from 'em-table/utils/table-definition';
+import AppTableController from '../app-table-columns';
+
+export default AppTableController.extend({
+ // Your custom instance of table definition
+ tableDefinition: TableDefinition.create(),
+
+ // Search text alias, any change in controller's searchText would affect the table's searchText, and vice-versa.
+ _selectedObserver: Ember.on("init", Ember.observer("model.selected", function () {
+ this.set("tableDefinition.searchText", this.get("model.selected"));
+ })),
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
index c7875b4..461bf00 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
@@ -96,4 +96,12 @@ export default DS.Model.extend({
"<p>Used Memory: " + Math.round(this.get("usedMemoryMB")) + ' MB</p>' +
"<p>Available Memory: " + Math.round(this.get("availMemoryMB")) + ' MB</p>';
}.property(),
+
+ usedMemoryBytes: function() {
+ return this.get("usedMemoryMB") * 1024 * 1024;
+ }.property("usedMemoryMB"),
+
+ availMemoryBytes: function() {
+ return this.get("availMemoryMB") * 1024 * 1024;
+ }.property("availMemoryMB"),
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps.js
index 1b671da..56349aa 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps.js
@@ -23,13 +23,11 @@ import AbstractRoute from './abstract';
export default AbstractRoute.extend({
model() {
return Ember.RSVP.hash({
- apps: this.store.findAll('yarn-app', {reload: true}),
clusterMetrics: this.store.findAll('ClusterMetric', {reload: true}),
});
},
unloadAll() {
- this.store.unloadAll('yarn-app');
this.store.unloadAll('ClusterMetric');
}
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/apps.js
index 8719170..b0f3745 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/apps.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/apps.js
@@ -19,4 +19,13 @@
import Ember from 'ember';
export default Ember.Route.extend({
+ model() {
+ return Ember.RSVP.hash({
+ apps: this.store.findAll('yarn-app', {reload: true}),
+ });
+ },
+
+ unloadAll() {
+ this.store.unloadAll('yarn-app');
+ }
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/services.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/services.js
index 8719170..34ad1ad 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/services.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/services.js
@@ -19,4 +19,15 @@
import Ember from 'ember';
export default Ember.Route.extend({
+ model() {
+ return Ember.RSVP.hash({
+ apps: this.store.query('yarn-app', {
+ applicationTypes: "org-apache-slider"
+ }),
+ });
+ },
+
+ unloadAll() {
+ this.store.unloadAll('yarn-app');
+ }
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
index faae8b1..1c4546c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
@@ -26,7 +26,9 @@ export default AbstractRoute.extend({
selected : param.queue_name,
queues: this.store.query('yarn-queue', {}),
selectedQueue : undefined,
- apps: this.store.findAll('yarn-app', {reload: true})
+ apps: this.store.query('yarn-app', {
+ queue: param.queue_name
+ })
});
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
index 7ef7ac3..e4f145d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
@@ -31,8 +31,7 @@ export default AbstractRoute.extend({
return Ember.RSVP.hash({
selected : queueName,
queues: this.store.query('yarn-queue', {}),
- selectedQueue : undefined,
- apps: this.store.findAll('yarn-app', {reload: true})
+ selectedQueue : undefined
});
},
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/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 83d1e32..172286f 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
@@ -43,7 +43,8 @@ export default DS.JSONAPISerializer.extend({
queue: payload.queue,
state: payload.state,
startTime: Converter.timeStampToDate(payload.startedTime),
- elapsedTime: Converter.msToElapsedTime(payload.elapsedTime),
+ //elapsedTime: Converter.msToElapsedTime(payload.elapsedTime),
+ elapsedTime: payload.elapsedTime,
finishedTime: Converter.timeStampToDate(payload.finishedTime),
finalStatus: payload.finalStatus,
progress: payload.progress,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/apps.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/apps.hbs
index a2ba163..8c72ce4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/apps.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/apps.hbs
@@ -16,9 +16,12 @@
limitations under the License.
--}}
-{{#if model.apps}}
- {{app-table table-id="apps-table" arr=model.apps}}
- {{simple-table table-id="apps-table" bFilter=true colsOrder="0,desc" colTypes="natural elapsed-time" colTargets="0 7"}}
+{{#if model.apps.isPending}}
+ <h4 align="center">Loading...</h4>
{{else}}
- <h4 align="center">Could not find any applications from this cluster</h4>
-{{/if}}
\ No newline at end of file
+ {{#if model.apps}}
+ {{em-table columns=columns rows=model.apps}}
+ {{else}}
+ <h4 align="center">Could not find any applications from this cluster</h4>
+ {{/if}}
+{{/if}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/services.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/services.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/services.hbs
index e472e8e..7556908 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/services.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/services.hbs
@@ -17,9 +17,7 @@
--}}
{{#if model.apps}}
- {{app-table table-id="apps-table" arr=model.apps}}
- {{simple-table table-id="apps-table" bFilter=true colsOrder="0,desc"
- colTypes="natural elapsed-time" colTargets="0 7" defaultSearch="slider"}}
+ {{em-table columns=columns rows=model.apps}}
{{else}}
<h4 align="center">Could not find any applications from this cluster</h4>
{{/if}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
index d9fae3a..1390906 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
@@ -18,47 +18,7 @@
<div class="row">
{{#if model.nodes}}
- <table id="nodes-table" class="display table table-striped table-bordered"
- cellspacing="0" width="100%">
- <thead>
- <tr>
- <th>Node Labels</th>
- <th>Rack</th>
- <th>Node State</th>
- <th>Node Address</th>
- <th>Node HTTP Address</th>
- <th>Last Health Update</th>
- <th>Health-Report</th>
- <th>Containers</th>
- <th>Mem Used</th>
- <th>Mem Avail</th>
- <th>VCores Used</th>
- <th>VCores Avail</th>
- <th>Version</th>
- </tr>
- </thead>
- <tbody>
- {{#each model.nodes as |node|}}
- <tr>
- <td>{{node.nodeLabelsAsString}}</td>
- <td>{{node.rack}}</td>
- <td><span class={{node.nodeStateStyle}}>{{node.state}}</span></td>
- <td>{{node.id}}</td>
- {{node-link nodeId=node.id nodeHTTPAddress=node.nodeHTTPAddress nodeState=node.state}}
- <td>{{node.lastHealthUpdate}}</td>
- <td>{{node.healthReport}}</td>
- <td>{{node.numContainers}}</td>
- <td>{{divide num=node.usedMemoryMB den=1024}} GB</td>
- <td>{{divide num=node.availMemoryMB den=1024}} GB</td>
- <td>{{node.usedVirtualCores}}</td>
- <td>{{node.availableVirtualCores}}</td>
- <td>{{node.version}}</td>
- </tr>
- {{/each}}
- </tbody>
- </table>
-
- {{simple-table table-id="nodes-table" bFilter=true}}
+ {{em-table columns=columns rows=model.nodes}}
{{else}}
<h4 align="center">No nodes found on this cluster</h4>
{{/if}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs
index 6d6488f..4a508c1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs
@@ -19,8 +19,7 @@
<div class="row">
<div class="col-lg-12 container-fluid">
{{#if model.apps}}
- {{app-table table-id="apps-table" arr=model.apps}}
- {{simple-table table-id="apps-table" bFilter=true colTypes="elapsed-time" colTargets="7"}}
+ {{em-table columns=columns rows=model.apps}}
{{else}}
<h4 align = "center">Could not find any applications from this cluster</h4>
{{/if}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
index 6a4eb16..4cd0fdc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
@@ -20,9 +20,9 @@
"devDependencies": {
"broccoli-asset-rev": "2.4.2",
"broccoli-funnel": "1.0.1",
- "em-table": "0.1.6",
- "ember-bootstrap": "0.5.1",
+ "em-table": "0.7.0",
"ember-array-contains-helper": "1.0.2",
+ "ember-bootstrap": "0.5.1",
"ember-cli": "1.13.13",
"ember-cli-app-version": "1.0.0",
"ember-cli-babel": "5.1.6",
@@ -47,6 +47,9 @@
"select2": "4.0.0"
},
"dependencies": {
- "em-helpers": "^0.5.13"
+ "em-helpers": "^0.8.0",
+ "em-table": "^0.7.0",
+ "ember-cli-moment-shim": "^3.0.1",
+ "ember-cli-numeral": "^0.2.0"
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/app-table-columns-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/app-table-columns-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/app-table-columns-test.js
new file mode 100644
index 0000000..b8b77ad
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/app-table-columns-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('controller:app-table-columns', 'Unit | Controller | app table columns', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let controller = this.subject();
+ assert.ok(controller);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/apps-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/apps-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/apps-test.js
new file mode 100644
index 0000000..a004283
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/apps-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('controller:yarn-apps/apps', 'Unit | Controller | yarn apps/apps', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let controller = this.subject();
+ assert.ok(controller);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/services-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/services-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/services-test.js
new file mode 100644
index 0000000..d0a1f85
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/services-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('controller:yarn-apps/services', 'Unit | Controller | yarn apps/services', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let controller = this.subject();
+ assert.ok(controller);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes/table-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes/table-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes/table-test.js
new file mode 100644
index 0000000..fdf586e
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes/table-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('controller:yarn-nodes/table', 'Unit | Controller | yarn nodes/table', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let controller = this.subject();
+ assert.ok(controller);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queue/apps-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queue/apps-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queue/apps-test.js
new file mode 100644
index 0000000..3abf21a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queue/apps-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('controller:yarn-queue/apps', 'Unit | Controller | yarn queue/apps', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let controller = this.subject();
+ assert.ok(controller);
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[19/50] [abbrv] hadoop git commit: YARN-6402. Move 'Long Running
Services' to an independent tab at top level for new Yarn UI. Contributed by
Akhil PB.
Posted by va...@apache.org.
YARN-6402. Move 'Long Running Services' to an independent tab at top level 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/c069f4f9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c069f4f9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c069f4f9
Branch: refs/heads/YARN-3368_branch2
Commit: c069f4f9371967fd3aac25ab0af5afc29d940e38
Parents: bef6b2f
Author: Sunil G <su...@apache.org>
Authored: Thu Apr 20 12:33:53 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/adapters/yarn-app.js | 2 +-
.../webapp/app/components/em-table-html-cell.js | 23 ++
.../main/webapp/app/components/timeline-view.js | 13 +-
.../webapp/app/controllers/app-table-columns.js | 213 ++++++++++++-------
.../webapp/app/controllers/yarn-app-attempt.js | 32 ++-
.../webapp/app/controllers/yarn-app-attempts.js | 23 +-
.../src/main/webapp/app/controllers/yarn-app.js | 21 +-
.../webapp/app/controllers/yarn-apps/apps.js | 3 -
.../app/controllers/yarn-apps/services.js | 3 -
.../webapp/app/controllers/yarn-services.js | 79 ++++++-
.../src/main/webapp/app/models/yarn-app.js | 6 +-
.../src/main/webapp/app/router.js | 1 +
.../src/main/webapp/app/routes/yarn-services.js | 34 +++
.../src/main/webapp/app/styles/app.css | 9 +
.../main/webapp/app/templates/application.hbs | 13 +-
.../templates/components/app-attempt-table.hbs | 8 +-
.../templates/components/container-table.hbs | 2 +-
.../templates/components/em-table-html-cell.hbs | 23 ++
.../app/templates/components/timeline-view.hbs | 8 +-
.../webapp/app/templates/yarn-app-attempts.hbs | 8 +-
.../src/main/webapp/app/templates/yarn-app.hbs | 12 +-
.../src/main/webapp/app/templates/yarn-apps.hbs | 4 -
.../main/webapp/app/templates/yarn-services.hbs | 86 ++++++++
.../src/main/webapp/app/utils/converter.js | 24 +++
.../components/em-table-html-cell-test.js | 43 ++++
.../tests/unit/routes/yarn-services-test.js | 29 +++
26 files changed, 594 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
index fc52f7c..111e468 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
@@ -23,7 +23,7 @@ export default AbstractAdapter.extend({
restNameSpace: "cluster",
serverName: "RM",
- urlForQuery(query/*, modelName*/) {
+ urlForQuery(/*query, modelName*/) {
var url = this._buildURL();
url = url + '/apps';
return url;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-html-cell.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-html-cell.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-html-cell.js
new file mode 100644
index 0000000..56fc68a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-html-cell.js
@@ -0,0 +1,23 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+ content: null
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
----------------------------------------------------------------------
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 4a33d5b..865fe52 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
@@ -34,6 +34,7 @@ export default Ember.Component.extend({
_selected: undefined,
gridColumns: [],
gridRows: [],
+ serviceName: undefined,
selected: function() {
return this._selected;
@@ -290,6 +291,7 @@ export default Ember.Component.extend({
setAttemptsGridColumnsAndRows: function() {
var self = this;
var columns = [];
+ var serviceName = this.get('serviceName');
columns.push({
id: 'id',
@@ -298,10 +300,11 @@ export default Ember.Component.extend({
cellComponentName: 'em-table-linked-cell',
minWidth: '300px',
getCellContent: function(row) {
+ var attemptId = row.get('id');
+ var query = serviceName? '?service='+serviceName : '';
return {
- displayText: row.get('id'),
- routeName: 'yarn-app-attempt',
- id: row.get('id')
+ displayText: attemptId,
+ href: `#/yarn-app-attempt/${attemptId}${query}`
};
}
}, {
@@ -326,7 +329,7 @@ export default Ember.Component.extend({
id: 'appMasterContainerId',
headerTitle: 'AM Container ID',
contentPath: 'appMasterContainerId',
- minWidth: '300px'
+ minWidth: '350px'
}, {
id: 'amNodeId',
headerTitle: 'AM Node ID',
@@ -384,7 +387,7 @@ export default Ember.Component.extend({
id: 'id',
headerTitle: 'Container ID',
contentPath: 'id',
- minWidth: '300px'
+ minWidth: '350px'
}, {
id: 'startedTime',
headerTitle: 'Started Time',
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
----------------------------------------------------------------------
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 53a6439..704abfb 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
@@ -19,80 +19,145 @@
import Ember from 'ember';
import ColumnDef from 'em-table/utils/column-definition';
+import TableDef from 'em-table/utils/table-definition';
export default Ember.Controller.extend({
- columns: function() {
- var colums = [];
- colums.push({
- id: 'appId',
- headerTitle: 'Application ID',
- contentPath: 'id',
- cellComponentName: 'em-table-linked-cell',
- getCellContent: function(row) {
- return {
- displayText: row.id,
- routeName: 'yarn-app',
- id: row.id
- };
- },
- minWidth: "250px"
- }, {
- id: 'appType',
- headerTitle: 'Application Type',
- contentPath: 'applicationType',
- }, {
- id: 'appName',
- headerTitle: 'Application Name',
- contentPath: 'appName',
- }, {
- id: 'appUsr',
- headerTitle: 'User',
- contentPath: 'user',
- minWidth: "50px"
- }, {
- id: 'queue',
- headerTitle: 'Queue',
- contentPath: 'queue',
- }, {
- id: 'state',
- headerTitle: 'State',
- contentPath: 'state',
- cellComponentName: 'em-table-status-cell',
- minWidth: "50px"
- }, {
- id: 'progress',
- headerTitle: 'Progress',
- contentPath: 'progress',
- cellComponentName: 'em-table-progress-cell',
- cellDefinition: {
- valueMax: 100
- },
- }, {
- id: 'stTime',
- headerTitle: 'Start Time',
- contentPath: 'startTime',
- }, {
- id: 'elTime',
- headerTitle: 'Elapsed Time',
- contentPath: 'elapsedTime',
- cellDefinition: {
- type: "duration"
- }
- }, {
- id: 'finishTime',
- headerTitle: 'Finished Time',
- contentPath: 'validatedFinishedTs',
- observePath: true
- }, {
- id: 'priority',
- headerTitle: 'Priority',
- contentPath: 'priority',
- }, {
- id: 'cluster',
- headerTitle: '%Cluster',
- contentPath: 'clusterUsagePercentage',
- observePath: true
- });
- return ColumnDef.make(colums);
- }.property()
+ tableDefinition: TableDef.create({
+ sortColumnId: 'stTime',
+ sortOrder: 'desc'
+ }),
+
+ columns: function() {
+ var colums = [];
+ colums.push({
+ id: 'appId',
+ headerTitle: 'Application ID',
+ contentPath: 'id',
+ cellComponentName: 'em-table-linked-cell',
+ minWidth: "250px",
+ getCellContent: function(row) {
+ return {
+ displayText: row.id,
+ href: `#/yarn-app/${row.id}`
+ };
+ }
+ }, {
+ id: 'appType',
+ headerTitle: 'Application Type',
+ contentPath: 'applicationType',
+ }, {
+ id: 'appName',
+ headerTitle: 'Application Name',
+ contentPath: 'appName',
+ }, {
+ id: 'appUsr',
+ headerTitle: 'User',
+ contentPath: 'user',
+ minWidth: "50px"
+ }, {
+ id: 'queue',
+ headerTitle: 'Queue',
+ contentPath: 'queue',
+ }, {
+ id: 'state',
+ headerTitle: 'State',
+ contentPath: 'state',
+ cellComponentName: 'em-table-status-cell',
+ minWidth: "50px"
+ }, {
+ id: 'progress',
+ headerTitle: 'Progress',
+ contentPath: 'progress',
+ cellComponentName: 'em-table-progress-cell',
+ cellDefinition: {
+ valueMax: 100
+ }
+ }, {
+ id: 'stTime',
+ headerTitle: 'Start Time',
+ contentPath: 'startTime',
+ }, {
+ id: 'elTime',
+ headerTitle: 'Elapsed Time',
+ contentPath: 'elapsedTime',
+ cellDefinition: {
+ type: "duration"
+ }
+ }, {
+ id: 'finishTime',
+ headerTitle: 'Finished Time',
+ contentPath: 'validatedFinishedTs',
+ observePath: true
+ }, {
+ id: 'priority',
+ headerTitle: 'Priority',
+ contentPath: 'priority',
+ }, {
+ id: 'cluster',
+ headerTitle: '%Cluster',
+ contentPath: 'clusterUsagePercentage',
+ observePath: true
+ });
+ return ColumnDef.make(colums);
+ }.property(),
+
+ serviceColumns: function() {
+ var colums = [];
+ colums.push({
+ id: 'appName',
+ headerTitle: 'Service Name',
+ contentPath: 'appName',
+ minWidth: "200px",
+ cellComponentName: 'em-table-linked-cell',
+ getCellContent: function(row) {
+ return {
+ displayText: row.get('appName'),
+ href: `#/yarn-app/${row.id}?service=${row.get('appName')}`
+ };
+ }
+ }, {
+ id: 'appId',
+ headerTitle: 'Application ID',
+ contentPath: 'id',
+ minWidth: "250px"
+ }, {
+ id: 'state',
+ headerTitle: 'State',
+ contentPath: 'state',
+ cellComponentName: 'em-table-status-cell',
+ minWidth: "50px"
+ }, {
+ id: 'cluster',
+ headerTitle: '%Cluster',
+ contentPath: 'clusterUsagePercentage',
+ observePath: true
+ }, {
+ id: 'elTime',
+ headerTitle: 'Elapsed Time',
+ contentPath: 'elapsedTime',
+ cellDefinition: {
+ type: "duration"
+ },
+ minWidth: "200px"
+ }, {
+ id: 'appUsr',
+ headerTitle: 'User',
+ contentPath: 'user',
+ minWidth: "50px"
+ }, {
+ id: 'queue',
+ headerTitle: 'Queue',
+ contentPath: 'queue',
+ }, {
+ id: 'stTime',
+ headerTitle: 'Started Time',
+ contentPath: 'startTime',
+ }, {
+ id: 'finishTime',
+ headerTitle: 'Finished Time',
+ contentPath: 'validatedFinishedTs',
+ observePath: true
+ });
+ return ColumnDef.make(colums);
+ }.property(),
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
index 4c02361..fbe6fa9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
@@ -19,10 +19,14 @@
import Ember from 'ember';
export default Ember.Controller.extend({
+ queryParams: ["service"],
+ service: undefined,
breadcrumbs: Ember.computed("model.attempt.appId", function () {
var appId = this.get("model.attempt.appId");
- return [{
+ var attemptId = this.get("model.attempt.id");
+ var serviceName = this.get('service');
+ var breadcrumbs = [{
text: "Home",
routeName: 'application'
},{
@@ -30,11 +34,31 @@ export default Ember.Controller.extend({
routeName: 'yarn-apps.apps'
}, {
text: `App [${appId}]`,
- routeName: 'yarn-app',
- model: appId
+ href: `#/yarn-app/${appId}`
}, {
- text: "Attempt",
+ text: "Attempts",
+ href: `#/yarn-app-attempts/${appId}`
+ }, {
+ text: `Attempt [${attemptId}]`
}];
+ if (serviceName) {
+ breadcrumbs = [{
+ text: "Home",
+ routeName: 'application'
+ }, {
+ text: "Services",
+ routeName: 'yarn-services'
+ }, {
+ text: `${serviceName} [${appId}]`,
+ href: `#/yarn-app/${appId}?service=${serviceName}`
+ }, {
+ text: "Attempts",
+ href: `#/yarn-app-attempts/${appId}?service=${serviceName}`
+ }, {
+ text: `Attempt [${attemptId}]`
+ }];
+ }
+ return breadcrumbs;
})
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
index 92de2f9..77e531e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
@@ -19,10 +19,13 @@
import Ember from 'ember';
export default Ember.Controller.extend({
+ queryParams: ["service"],
+ service: undefined,
breadcrumbs: Ember.computed("model.appId", function () {
var appId = this.get("model.appId");
- return [{
+ var serviceName = this.get('service');
+ var breadcrumbs = [{
text: "Home",
routeName: 'application'
},{
@@ -30,11 +33,25 @@ export default Ember.Controller.extend({
routeName: 'yarn-apps.apps'
}, {
text: `App [${appId}]`,
- routeName: 'yarn-app',
- model: appId
+ href: `#/yarn-app/${appId}`
}, {
text: "Attempts",
}];
+ if (serviceName) {
+ breadcrumbs = [{
+ text: "Home",
+ routeName: 'application'
+ }, {
+ text: "Services",
+ routeName: 'yarn-services'
+ }, {
+ text: `${serviceName} [${appId}]`,
+ href: `#/yarn-app/${appId}?service=${serviceName}`
+ }, {
+ text: "Attempts"
+ }];
+ }
+ return breadcrumbs;
})
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/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 f699a22..e7d65cd 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
@@ -19,10 +19,13 @@
import Ember from 'ember';
export default Ember.Controller.extend({
+ queryParams: ["service"],
+ service: undefined,
breadcrumbs: Ember.computed("model.app.id", function () {
var appId = this.get("model.app.id");
- return [{
+ var serviceName = this.get('service');
+ var breadcrumbs = [{
text: "Home",
routeName: 'application'
},{
@@ -30,9 +33,21 @@ export default Ember.Controller.extend({
routeName: 'yarn-apps.apps'
}, {
text: `App [${appId}]`,
- routeName: 'yarn-app',
- model: appId
+ href: `#/yarn-app/${appId}`
}];
+ if (serviceName) {
+ breadcrumbs = [{
+ text: "Home",
+ routeName: 'application'
+ }, {
+ text: "Services",
+ routeName: 'yarn-services'
+ }, {
+ text: `${serviceName} [${appId}]`,
+ href: `#/yarn-app/${appId}?service=${serviceName}`
+ }];
+ }
+ return breadcrumbs;
}),
amHostHttpAddressFormatted: Ember.computed('model.app.amHostHttpAddress', function() {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
index 5c5063b..0b0be20 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
@@ -16,9 +16,6 @@
* limitations under the License.
*/
-
-import Ember from 'ember';
-import ColumnDef from 'em-table/utils/column-definition';
import AppTableController from '../app-table-columns';
export default AppTableController.extend({
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
index 5c5063b..0b0be20 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
@@ -16,9 +16,6 @@
* limitations under the License.
*/
-
-import Ember from 'ember';
-import ColumnDef from 'em-table/utils/column-definition';
import AppTableController from '../app-table-columns';
export default AppTableController.extend({
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
index 75bebf6..eeb6205 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
@@ -17,18 +17,85 @@
*/
import Ember from 'ember';
+import AppTableController from './app-table-columns';
-export default Ember.Controller.extend({
+
+export default AppTableController.extend({
breadcrumbs: [{
text: "Home",
routeName: 'application'
}, {
- text: "Applications",
- routeName: 'yarn-apps.apps',
- }, {
- text: "Long Running Services",
+ text: "Services",
routeName: 'yarn-services',
- }]
+ }],
+
+ getFinishedServicesDataForDonutChart: Ember.computed('model.apps', function() {
+
+ var finishdApps = 0;
+ var failedApps = 0;
+ var killedApps = 0;
+
+ this.get('model.apps').forEach(function(service){
+ if (service.get('state') === "FINISHED") {
+ finishdApps++;
+ }
+
+ if (service.get('state') === "FAILED") {
+ failedApps++;
+ }
+
+ if (service.get('state') === "KILLED") {
+ killedApps++;
+ }
+ });
+
+ var arr = [];
+ arr.push({
+ label: "Completed",
+ value: finishdApps
+ });
+ arr.push({
+ label: "Killed",
+ value: killedApps
+ });
+ arr.push({
+ label: "Failed",
+ value: failedApps
+ });
+
+ return arr;
+ }),
+
+
+ getRunningServicesDataForDonutChart: Ember.computed('model.apps', function() {
+ var pendingApps = 0;
+ var runningApps = 0;
+
+ this.get('model.apps').forEach(function(service){
+ if (service.get('state') === "RUNNING") {
+ runningApps++;
+ }
+
+ if (service.get('state') === "ACCEPTED" ||
+ service.get('state') === "SUBMITTED" ||
+ service.get('state') === "NEW" ||
+ service.get('state') === "NEW_SAVING") {
+ pendingApps++;
+ }
+ });
+
+ var arr = [];
+ arr.push({
+ label: "Pending",
+ value: pendingApps
+ });
+ arr.push({
+ label: "Running",
+ value: runningApps
+ });
+
+ return arr;
+ }),
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/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 638e5b0..47814e4 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
@@ -59,11 +59,15 @@ export default DS.Model.extend({
validatedFinishedTs: function() {
if (this.get("finishedTime") < this.get("startTime")) {
- return "";
+ return "N/A";
}
return this.get("finishedTime");
}.property("finishedTime"),
+ formattedElapsedTime: function() {
+ return Converter.msToElapsedTimeUnit(this.get('elapsedTime'));
+ }.property('elapsedTime'),
+
allocatedResource: function() {
return Converter.resourceToString(this.get("allocatedMB"), this.get("allocatedVCores"));
}.property("allocatedMB", "allocatedVCores"),
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
index 03ec780..a45861e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
@@ -28,6 +28,7 @@ Router.map(function() {
this.route('apps');
this.route('services');
});
+ this.route('yarn-services');
this.route('yarn-nodes', function(){
this.route('table');
this.route('heatmap');
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-services.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-services.js
new file mode 100644
index 0000000..fb01138
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-services.js
@@ -0,0 +1,34 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import AbstractRoute from './abstract';
+
+export default AbstractRoute.extend({
+ model() {
+ return Ember.RSVP.hash({
+ apps: this.store.query('yarn-app', {
+ applicationTypes: "org-apache-slider"
+ }),
+ });
+ },
+
+ unloadAll() {
+ this.store.unloadAll('yarn-app');
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/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 dca5b92..e3dfcd9 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
@@ -305,3 +305,12 @@ li a.navigation-link.ember-view {
.donut-chart svg {
width: 100%;
}
+
+div.attempt-info-panel table {
+ table-layout: fixed;
+}
+
+div.attempt-info-panel table > tbody > tr > td:last-of-type {
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
index 4a2ba38..a6d247b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
@@ -46,13 +46,18 @@
<span class="sr-only">(current)</span>
{{/link-to}}
{{/link-to}}
- {{#link-to 'yarn-apps.apps' tagName="li" currentWhen="yarn-apps.apps yarn-apps.services"}}
- {{#link-to 'yarn-apps.apps' class="navigation-link" currentWhen="yarn-apps.apps yarn-apps.services"}}Applications
+ {{#link-to 'yarn-apps.apps' tagName="li" current-when="yarn-apps.apps yarn-apps.services"}}
+ {{#link-to 'yarn-apps.apps' class="navigation-link"}}Applications
<span class="sr-only">(current)</span>
{{/link-to}}
{{/link-to}}
- {{#link-to 'yarn-nodes.table' tagName="li" currentWhen="yarn-nodes.table yarn-nodes.heatmap"}}
- {{#link-to 'yarn-nodes.table' class="navigation-link" currentWhen="yarn-nodes.table yarn-nodes.heatmap"}}Nodes
+ {{#link-to 'yarn-services' tagName="li"}}
+ {{#link-to 'yarn-services' class="navigation-link"}}Services
+ <span class="sr-only">(current)</span>
+ {{/link-to}}
+ {{/link-to}}
+ {{#link-to 'yarn-nodes.table' tagName="li" current-when="yarn-nodes.table yarn-nodes.heatmap"}}
+ {{#link-to 'yarn-nodes.table' class="navigation-link"}}Nodes
<span class="sr-only">(current)</span>
{{/link-to}}
{{/link-to}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/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 c3a9e32..d33bf2f 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
@@ -20,7 +20,7 @@
<tbody>
<tr>
<td>Application Attempt Id</td>
- <td>{{attempt.id}}</td>
+ <td title="{{attempt.id}}">{{attempt.id}}</td>
</tr>
<tr>
<td>Started Time</td>
@@ -38,11 +38,11 @@
</tr>
<tr>
<td>AM Container Id</td>
- <td>{{attempt.appMasterContainerId}}</td>
+ <td title="{{attempt.appMasterContainerId}}">{{attempt.appMasterContainerId}}</td>
</tr>
<tr>
<td>AM Node Id</td>
- <td>{{attempt.amNodeId}}</td>
+ <td title="{{attempt.amNodeId}}">{{attempt.amNodeId}}</td>
</tr>
{{#if attempt.attemptState}}
<tr>
@@ -53,7 +53,7 @@
{{#if attempt.nodeHttpAddress}}
<tr>
<td>AM Node Web UI</td>
- <td><a href="{{prepend-protocol attempt.nodeHttpAddress}}" target="_blank">{{attempt.nodeHttpAddress}}</a></td>
+ <td title="{{attempt.nodeHttpAddress}}"><a href="{{prepend-protocol attempt.nodeHttpAddress}}" target="_blank">{{attempt.nodeHttpAddress}}</a></td>
</tr>
{{/if}}
{{#if attempt.logsLink}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/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 ab353d2..3860f15 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
@@ -51,7 +51,7 @@
{{#if container.nodeHttpAddress}}
<tr>
<td>NodeManager UI</td>
- <td><a href="{{prepend-protocol container.nodeHttpAddress}}" target="_blank">{{container.nodeHttpAddress}}</a></td>
+ <td title="{{container.nodeHttpAddress}}"><a href="{{prepend-protocol container.nodeHttpAddress}}" target="_blank">{{container.nodeHttpAddress}}</a></td>
</tr>
{{/if}}
{{#if container.logUrl}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-html-cell.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-html-cell.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-html-cell.hbs
new file mode 100644
index 0000000..cf0b59a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-html-cell.hbs
@@ -0,0 +1,23 @@
+{{!
+ * 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.
+}}
+
+{{#if content}}
+ {{{content}}}
+{{else}}
+ <span class="txt-message">Not Available!</span>
+{{/if}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs
----------------------------------------------------------------------
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 7856194..a39d9b1 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
@@ -38,13 +38,13 @@
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="graphViewTab">
<br/><br/>
- <div class="col-md-8 container-fluid" id={{parent-id}}></div>
+ <div class="col-md-7 container-fluid" id={{parent-id}}></div>
<!-- diag info -->
- <div class="col-md-4 container-fluid">
- <div class="panel panel-default add-ellipsis">
+ <div class="col-md-5 container-fluid">
+ <div class="panel panel-default add-ellipsis attempt-info-panel">
<div class="panel-heading">
{{#if selected.link}}
- {{#link-to selected.linkname selected.id}}{{selected.id}}{{/link-to}}
+ {{#link-to selected.linkname selected.id (query-params service=serviceName)}}{{selected.id}}{{/link-to}}
{{else}}
{{selected.id}}
{{/if}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempts.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempts.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempts.hbs
index c0fa7e1..0af1457 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempts.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempts.hbs
@@ -30,11 +30,11 @@
<ul class="nav nav-pills nav-stacked" id="stacked-menu">
<ul class="nav nav-pills nav-stacked collapse in">
{{#link-to 'yarn-app' tagName="li"}}
- {{#link-to 'yarn-app' model.appId}}Information
+ {{#link-to 'yarn-app' model.appId (query-params service=service)}}Information
{{/link-to}}
{{/link-to}}
{{#link-to 'yarn-app-attempts' tagName="li"}}
- {{#link-to 'yarn-app-attempts' model.appId}}Attempts List
+ {{#link-to 'yarn-app-attempts' model.appId (query-params service=service)}}Attempts List
{{/link-to}}
{{/link-to}}
</ul>
@@ -46,10 +46,10 @@
<div class="col-md-10 container-fluid">
<!-- timeline view of children -->
<div class="row">
- {{timeline-view parent-id="attempt-timeline-div" my-id="timeline-view" height="100%" rmModel=model.attempts label="shortAppAttemptId" attemptModel=true}}
+ {{timeline-view parent-id="attempt-timeline-div" my-id="timeline-view" height="100%" rmModel=model.attempts label="shortAppAttemptId" attemptModel=true serviceName=service}}
</div>
</div>
</div>
</div>
-{{outlet}}
\ No newline at end of file
+{{outlet}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/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 8ce8e8b..17ec11e 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
@@ -25,17 +25,21 @@
<div class="col-md-2 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
- <h4>Application</h4>
+ {{#if service}}
+ <h4>Service</h4>
+ {{else}}
+ <h4>Application</h4>
+ {{/if}}
</div>
<div class="panel-body">
<ul class="nav nav-pills nav-stacked" id="stacked-menu">
<ul class="nav nav-pills nav-stacked collapse in">
{{#link-to 'yarn-app' tagName="li"}}
- {{#link-to 'yarn-app' model.app.id}}Information
+ {{#link-to 'yarn-app' model.app.id (query-params service=service)}}Information
{{/link-to}}
{{/link-to}}
{{#link-to 'yarn-app-attempts' tagName="li"}}
- {{#link-to 'yarn-app-attempts' model.app.id}}Attempts List
+ {{#link-to 'yarn-app-attempts' model.app.id (query-params service=service)}}Attempts List
{{/link-to}}
{{/link-to}}
</ul>
@@ -88,7 +92,7 @@
</span>
</td>
<td>{{model.app.startTime}}</td>
- <td>{{model.app.elapsedTime}}</td>
+ <td>{{model.app.formattedElapsedTime}}</td>
<td>{{model.app.validatedFinishedTs}}</td>
<td>{{model.app.priority}}</td>
<td>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
index d5f6347..7aade00 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
@@ -33,10 +33,6 @@
{{#link-to 'yarn-apps.apps'}}All Applications
{{/link-to}}
{{/link-to}}
- {{#link-to 'yarn-apps.services' tagName="li"}}
- {{#link-to 'yarn-apps.services'}}Long Running Services
- {{/link-to}}
- {{/link-to}}
</ul>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
new file mode 100644
index 0000000..649834a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
@@ -0,0 +1,86 @@
+{{!--
+ 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.
+--}}
+
+{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+
+
+<div class="col-md-12 container-fluid">
+ <div class="row">
+
+ <div class="col-md-2 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4>Services</h4>
+ </div>
+ <div class="panel-body">
+ <ul class="nav nav-pills nav-stacked" id="stacked-menu">
+ <ul class="nav nav-pills nav-stacked collapse in">
+ {{#link-to 'yarn-services' tagName="li"}}
+ {{#link-to 'yarn-services'}}Long Running Services
+ {{/link-to}}
+ {{/link-to}}
+ </ul>
+ </ul>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-md-10 container-fluid">
+ <div class="row">
+ <div class="col-lg-4 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Finished Services
+ </div>
+ <div class="container-fluid" id="finishedapps-donut-chart">
+ {{donut-chart data=getFinishedServicesDataForDonutChart
+ showLabels=true
+ parentId="finishedapps-donut-chart"
+ ratio=0.6
+ maxHeight=350
+ colorTargets="good warn error"
+ }}
+ </div>
+ </div>
+ </div>
+
+ <div class="col-lg-4 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Running Services
+ </div>
+ <div class="container-fluid" id="runningapps-donut-chart">
+ {{donut-chart data=getRunningServicesDataForDonutChart
+ showLabels=true
+ parentId="runningapps-donut-chart"
+ ratio=0.6
+ maxHeight=350
+ colorTargets="warn good"
+ }}
+ </div>
+ </div>
+ </div>
+ </div>
+ {{#if model.apps}}
+ {{em-table columns=serviceColumns rows=model.apps definition=tableDefinition}}
+ {{else}}
+ <h4 align="center">Could not find any services from this cluster</h4>
+ {{/if}}
+ </div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
index 448dd18..4f24651 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
@@ -125,5 +125,29 @@ export default {
unit = "PB";
}
return value.toFixed(1) + " " + unit;
+ },
+ msToElapsedTimeUnit: function(millisecs) {
+ var seconds = Math.floor(millisecs / 1000);
+ var days = Math.floor(seconds / (3600 * 24));
+ var hours = Math.floor(seconds / 3600) - (days * 24);
+ var mins = Math.floor((seconds - (hours * 3600) - (days * 24 * 3600)) / 60);
+ var secs = seconds - (days * 24 * 3600) - (hours * 3600) - (mins * 60);
+ var timeStrArr = [];
+ var pluralize = "";
+ if (days > 0) {
+ pluralize = days > 1? " Days" : " Day";
+ timeStrArr.push(days + pluralize);
+ }
+ if (hours > 0) {
+ pluralize = hours > 1? " Hrs" : " Hour";
+ timeStrArr.push(hours + pluralize);
+ }
+ if (mins > 0) {
+ pluralize = mins > 1? " Mins" : " Min";
+ timeStrArr.push(mins + pluralize);
+ }
+ pluralize = secs > 1? " Secs" : " Sec";
+ timeStrArr.push(secs + pluralize);
+ return timeStrArr.join(" : ");
}
};
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-html-cell-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-html-cell-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-html-cell-test.js
new file mode 100644
index 0000000..777b9a8
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-html-cell-test.js
@@ -0,0 +1,43 @@
+/**
+ * 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.
+ */
+
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+
+moduleForComponent('em-table-html-cell', 'Integration | Component | em table html cell', {
+ integration: true
+});
+
+test('it renders', function(assert) {
+
+ // Set any properties with this.set('myProperty', 'value');
+ // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+
+ this.render(hbs`{{em-table-html-cell}}`);
+
+ assert.equal(this.$().text().trim(), '');
+
+ // Template block usage:" + EOL +
+ this.render(hbs`
+ {{#em-table-html-cell}}
+ template block text
+ {{/em-table-html-cell}}
+ `);
+
+ assert.equal(this.$().text().trim(), 'template block text');
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-services-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-services-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-services-test.js
new file mode 100644
index 0000000..6348f86
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-services-test.js
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('route:yarn-services', 'Unit | Route | yarn services', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+test('it exists', function(assert) {
+ let route = this.subject();
+ assert.ok(route);
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[44/50] [abbrv] hadoop git commit: YARN-6635. Refactor yarn-app pages
in new YARN UI. Contributed by Akhil PB.
Posted by va...@apache.org.
YARN-6635. Refactor yarn-app pages in 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/9e4e218f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9e4e218f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9e4e218f
Branch: refs/heads/YARN-3368_branch2
Commit: 9e4e218ff0a729b5b73c7dd67c2154eaab56dfd9
Parents: dd40f6f0
Author: Sunil G <su...@apache.org>
Authored: Tue May 30 13:52:40 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:49 2017 +0530
----------------------------------------------------------------------
.../webapp/app/controllers/app-table-columns.js | 4 +-
.../webapp/app/controllers/yarn-app-attempt.js | 8 +-
.../webapp/app/controllers/yarn-app-attempts.js | 57 ------
.../src/main/webapp/app/controllers/yarn-app.js | 56 +++---
.../webapp/app/controllers/yarn-app/attempts.js | 24 +++
.../webapp/app/controllers/yarn-app/charts.js | 28 +++
.../webapp/app/controllers/yarn-app/info.js | 32 ++++
.../app/controllers/yarn-apps/services.js | 31 ----
.../webapp/app/controllers/yarn-flowrun/info.js | 2 +-
.../src/main/webapp/app/router.js | 8 +-
.../main/webapp/app/routes/yarn-app-attempts.js | 35 ----
.../src/main/webapp/app/routes/yarn-app.js | 35 +---
.../main/webapp/app/routes/yarn-app/attempts.js | 37 ++++
.../main/webapp/app/routes/yarn-app/charts.js | 53 ++++++
.../src/main/webapp/app/routes/yarn-app/info.js | 37 ++++
.../webapp/app/routes/yarn-apps/services.js | 33 ----
.../main/webapp/app/templates/application.hbs | 2 +-
.../app/templates/components/app-table.hbs | 6 +-
.../webapp/app/templates/yarn-app-attempts.hbs | 58 ------
.../src/main/webapp/app/templates/yarn-app.hbs | 185 +------------------
.../webapp/app/templates/yarn-app/attempts.hbs | 29 +++
.../webapp/app/templates/yarn-app/charts.hbs | 43 +++++
.../main/webapp/app/templates/yarn-app/info.hbs | 167 +++++++++++++++++
.../webapp/app/templates/yarn-app/loading.hbs | 23 +++
.../src/main/webapp/app/templates/yarn-apps.hbs | 5 +-
.../webapp/app/templates/yarn-apps/services.hbs | 25 ---
.../main/webapp/app/templates/yarn-services.hbs | 3 +-
.../unit/controllers/yarn-app-attempts-test.js | 30 ---
.../unit/controllers/yarn-app/attempts-test.js | 30 +++
.../unit/controllers/yarn-app/charts-test.js | 30 +++
.../unit/controllers/yarn-app/info-test.js | 30 +++
.../unit/controllers/yarn-apps/services-test.js | 30 ---
.../tests/unit/routes/yarn-app-attempts-test.js | 29 ---
.../tests/unit/routes/yarn-app/attempts-test.js | 29 +++
.../tests/unit/routes/yarn-app/charts-test.js | 29 +++
.../tests/unit/routes/yarn-app/info-test.js | 29 +++
36 files changed, 714 insertions(+), 578 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
----------------------------------------------------------------------
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 704abfb..8a34f1a 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
@@ -38,7 +38,7 @@ export default Ember.Controller.extend({
getCellContent: function(row) {
return {
displayText: row.id,
- href: `#/yarn-app/${row.id}`
+ href: `#/yarn-app/${row.id}/info`
};
}
}, {
@@ -112,7 +112,7 @@ export default Ember.Controller.extend({
getCellContent: function(row) {
return {
displayText: row.get('appName'),
- href: `#/yarn-app/${row.id}?service=${row.get('appName')}`
+ href: `#/yarn-app/${row.id}/info?service=${row.get('appName')}`
};
}
}, {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
index fbe6fa9..1121a84 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
@@ -34,10 +34,10 @@ export default Ember.Controller.extend({
routeName: 'yarn-apps.apps'
}, {
text: `App [${appId}]`,
- href: `#/yarn-app/${appId}`
+ href: `#/yarn-app/${appId}/info`
}, {
text: "Attempts",
- href: `#/yarn-app-attempts/${appId}`
+ href: `#/yarn-app/${appId}/attempts`
}, {
text: `Attempt [${attemptId}]`
}];
@@ -50,10 +50,10 @@ export default Ember.Controller.extend({
routeName: 'yarn-services'
}, {
text: `${serviceName} [${appId}]`,
- href: `#/yarn-app/${appId}?service=${serviceName}`
+ href: `#/yarn-app/${appId}/info?service=${serviceName}`
}, {
text: "Attempts",
- href: `#/yarn-app-attempts/${appId}?service=${serviceName}`
+ href: `#/yarn-app/${appId}/attempts?service=${serviceName}`
}, {
text: `Attempt [${attemptId}]`
}];
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
deleted file mode 100644
index 77e531e..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * 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.
- */
-
-import Ember from 'ember';
-
-export default Ember.Controller.extend({
- queryParams: ["service"],
- service: undefined,
-
- breadcrumbs: Ember.computed("model.appId", function () {
- var appId = this.get("model.appId");
- var serviceName = this.get('service');
- var breadcrumbs = [{
- text: "Home",
- routeName: 'application'
- },{
- text: "Applications",
- routeName: 'yarn-apps.apps'
- }, {
- text: `App [${appId}]`,
- href: `#/yarn-app/${appId}`
- }, {
- text: "Attempts",
- }];
- if (serviceName) {
- breadcrumbs = [{
- text: "Home",
- routeName: 'application'
- }, {
- text: "Services",
- routeName: 'yarn-services'
- }, {
- text: `${serviceName} [${appId}]`,
- href: `#/yarn-app/${appId}?service=${serviceName}`
- }, {
- text: "Attempts"
- }];
- }
- return breadcrumbs;
- })
-
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/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 e7d65cd..c40697f 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
@@ -19,42 +19,44 @@
import Ember from 'ember';
export default Ember.Controller.extend({
- queryParams: ["service"],
- service: undefined,
+ appId: '',
+ serviceName: undefined,
- breadcrumbs: Ember.computed("model.app.id", function () {
- var appId = this.get("model.app.id");
- var serviceName = this.get('service');
+ breadcrumbs: [{
+ text: "Home",
+ routeName: 'application'
+ }, {
+ text: "Applications",
+ routeName: 'yarn-apps.apps'
+ }, {
+ text: 'App'
+ }],
+
+ updateBreadcrumbs(appId, serviceName, tailCrumbs) {
var breadcrumbs = [{
text: "Home",
routeName: 'application'
- },{
- text: "Applications",
- routeName: 'yarn-apps.apps'
- }, {
- text: `App [${appId}]`,
- href: `#/yarn-app/${appId}`
}];
- if (serviceName) {
- breadcrumbs = [{
- text: "Home",
- routeName: 'application'
- }, {
+ if (appId && serviceName) {
+ breadcrumbs.push({
text: "Services",
routeName: 'yarn-services'
}, {
text: `${serviceName} [${appId}]`,
- href: `#/yarn-app/${appId}?service=${serviceName}`
- }];
+ href: `#/yarn-app/${appId}/info?service=${serviceName}`
+ });
+ } else {
+ breadcrumbs.push({
+ text: "Applications",
+ routeName: 'yarn-apps.apps'
+ }, {
+ text: `App [${appId}]`,
+ href: `#/yarn-app/${appId}/info`
+ });
}
- return breadcrumbs;
- }),
-
- amHostHttpAddressFormatted: Ember.computed('model.app.amHostHttpAddress', function() {
- var amHostAddress = this.get('model.app.amHostHttpAddress');
- if (amHostAddress && amHostAddress.indexOf('://') < 0) {
- amHostAddress = 'http://' + amHostAddress;
+ if (tailCrumbs) {
+ breadcrumbs.pushObjects(tailCrumbs);
}
- return amHostAddress;
- })
+ this.set('breadcrumbs', breadcrumbs);
+ }
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/attempts.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/attempts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/attempts.js
new file mode 100644
index 0000000..a6cba9e
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/attempts.js
@@ -0,0 +1,24 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+ queryParams: ["service"],
+ service: undefined
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/charts.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/charts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/charts.js
new file mode 100644
index 0000000..1078b14
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/charts.js
@@ -0,0 +1,28 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+ queryParams: ["service"],
+ service: undefined,
+
+ isRunningApp: Ember.computed('model.app.state', function() {
+ return this.get('model.app.state') === "RUNNING";
+ })
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/info.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/info.js
new file mode 100644
index 0000000..f9652f9
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/info.js
@@ -0,0 +1,32 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+ queryParams: ["service"],
+ service: undefined,
+
+ amHostHttpAddressFormatted: Ember.computed('model.app.amHostHttpAddress', function() {
+ var amHostAddress = this.get('model.app.amHostHttpAddress');
+ if (amHostAddress && amHostAddress.indexOf('://') < 0) {
+ amHostAddress = 'http://' + amHostAddress;
+ }
+ return amHostAddress;
+ })
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
deleted file mode 100644
index fffaf17..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * 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.
- */
-
-import Ember from 'ember';
-import TableDefinition from 'em-table/utils/table-definition';
-import AppTableController from '../app-table-columns';
-
-export default AppTableController.extend({
- queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 'rowCount'],
- tableDefinition: TableDefinition.create(),
- searchText: Ember.computed.alias('tableDefinition.searchText'),
- sortColumnId: Ember.computed.alias('tableDefinition.sortColumnId'),
- sortOrder: Ember.computed.alias('tableDefinition.sortOrder'),
- pageNum: Ember.computed.alias('tableDefinition.pageNum'),
- rowCount: Ember.computed.alias('tableDefinition.rowCount')
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js
index df2f87e..63e17dc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js
@@ -32,7 +32,7 @@ function createColumn() {
minWidth: "300px",
getCellContent: function (row) {
return {
- routeName: 'yarn-app',
+ routeName: 'yarn-app.info',
id: row.get('appId'),
displayText: row.get('appId')
};
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
index 00d6d3e..9013142 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
@@ -26,7 +26,6 @@ var Router = Ember.Router.extend({
Router.map(function() {
this.route('yarn-apps', function () {
this.route('apps');
- this.route('services');
});
this.route('yarn-services');
this.route('yarn-nodes', function(){
@@ -50,11 +49,14 @@ Router.map(function() {
'/yarn-container-log/:node_id/:node_addr/:container_id/:filename' });
this.route('cluster-overview');
- this.route('yarn-app', { path: '/yarn-app/:app_id' });
+ this.route('yarn-app', function() {
+ this.route('info', {path: '/:app_id/info'});
+ this.route('attempts', {path: '/:app_id/attempts'});
+ this.route('charts', {path: '/:app_id/charts'});
+ });
this.route('yarn-app-attempt', { path: '/yarn-app-attempt/:app_attempt_id'});
this.route('error');
this.route('notfound', { path: '*:' });
- this.route('yarn-app-attempts', { path: '/yarn-app-attempts/:app_id' });
this.route('yarn-queues', { path: '/yarn-queues/:queue_name' });
this.route('yarn-flow-activity');
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
deleted file mode 100644
index 233bfc8..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * 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.
- */
-
-import Ember from 'ember';
-import AbstractRoute from './abstract';
-import AppAttemptMixin from 'yarn-ui/mixins/app-attempt';
-
-export default AbstractRoute.extend(AppAttemptMixin, {
- model(param) {
- return Ember.RSVP.hash({
- appId: param.app_id,
- attempts: this.fetchAttemptListFromRMorATS(param.app_id, this.store)
- });
- },
-
- unloadAll() {
- this.store.unloadAll('yarn-app-attempt');
- this.store.unloadAll('yarn-timeline-appattempt');
- }
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
index 98b0cc8..58e3fe3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
@@ -16,35 +16,14 @@
* limitations under the License.
*/
-import Ember from 'ember';
import AbstractRoute from './abstract';
-import AppAttemptMixin from 'yarn-ui/mixins/app-attempt';
-export default AbstractRoute.extend(AppAttemptMixin, {
- model(param) {
- return Ember.RSVP.hash({
- app: this.fetchAppInfoFromRMorATS(param.app_id, this.store),
-
- rmContainers: this.store.find('yarn-app', param.app_id).then(function() {
- return this.store.query('yarn-app-attempt', {appId: param.app_id}).then(function (attempts) {
- if (attempts && attempts.get('firstObject')) {
- var appAttemptId = attempts.get('firstObject').get('appAttemptId');
- return this.store.query('yarn-container', {
- app_attempt_id: appAttemptId
- });
- }
- }.bind(this));
- }.bind(this)),
-
- nodes: this.store.findAll('yarn-rm-node', {reload: true}),
- });
- },
-
- unloadAll() {
- this.store.unloadAll('yarn-app');
- this.store.unloadAll('yarn-app-attempt');
- this.store.unloadAll('yarn-container');
- this.store.unloadAll('yarn-rm-node');
- this.store.unloadAll('yarn-app-timeline');
+export default AbstractRoute.extend({
+ actions: {
+ updateBreadcrumbs(appId, serviceName, tailCrumbs) {
+ var controller = this.controllerFor('yarn-app');
+ controller.setProperties({appId: appId, serviceName: serviceName});
+ controller.updateBreadcrumbs(appId, serviceName, tailCrumbs);
+ }
}
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/attempts.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/attempts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/attempts.js
new file mode 100644
index 0000000..fcea111
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/attempts.js
@@ -0,0 +1,37 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import AbstractRoute from '../abstract';
+import AppAttemptMixin from 'yarn-ui/mixins/app-attempt';
+
+export default AbstractRoute.extend(AppAttemptMixin, {
+ model(param, transition) {
+ transition.send('updateBreadcrumbs', param.app_id, param.service, [{text: 'Attempts'}]);
+ return Ember.RSVP.hash({
+ appId: param.app_id,
+ serviceName: param.service,
+ attempts: this.fetchAttemptListFromRMorATS(param.app_id, this.store)
+ });
+ },
+
+ unloadAll() {
+ this.store.unloadAll('yarn-app-attempt');
+ this.store.unloadAll('yarn-timeline-appattempt');
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/charts.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/charts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/charts.js
new file mode 100644
index 0000000..1b687db
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/charts.js
@@ -0,0 +1,53 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import AbstractRoute from '../abstract';
+
+export default AbstractRoute.extend({
+ model(param, transition) {
+ transition.send('updateBreadcrumbs', param.app_id, param.service, [{text: "Charts"}]);
+ return Ember.RSVP.hash({
+ appId: param.app_id,
+ serviceName: param.service,
+
+ app: this.store.find('yarn-app', param.app_id),
+
+ rmContainers: this.store.find('yarn-app', param.app_id).then(function() {
+ return this.store.query('yarn-app-attempt', {appId: param.app_id}).then(function (attempts) {
+ if (attempts && attempts.get('firstObject')) {
+ var appAttemptId = attempts.get('firstObject').get('appAttemptId');
+ return this.store.query('yarn-container', {
+ app_attempt_id: appAttemptId,
+ is_rm: true
+ });
+ }
+ }.bind(this));
+ }.bind(this)),
+
+ nodes: this.store.findAll('yarn-rm-node')
+ });
+ },
+
+ unloadAll() {
+ this.store.unloadAll('yarn-app');
+ this.store.unloadAll('yarn-app-attempt');
+ this.store.unloadAll('yarn-container');
+ this.store.unloadAll('yarn-rm-node');
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/info.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/info.js
new file mode 100644
index 0000000..4a4b19e
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/info.js
@@ -0,0 +1,37 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import AbstractRoute from '../abstract';
+import AppAttemptMixin from 'yarn-ui/mixins/app-attempt';
+
+export default AbstractRoute.extend(AppAttemptMixin, {
+ model(param, transition) {
+ transition.send('updateBreadcrumbs', param.app_id, param.service);
+ return Ember.RSVP.hash({
+ appId: param.app_id,
+ serviceName: param.service,
+ app: this.fetchAppInfoFromRMorATS(param.app_id, this.store)
+ });
+ },
+
+ unloadAll() {
+ this.store.unloadAll('yarn-app');
+ this.store.unloadAll('yarn-app-timeline');
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/services.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/services.js
deleted file mode 100644
index 34ad1ad..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/services.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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.
- */
-
-import Ember from 'ember';
-
-export default Ember.Route.extend({
- model() {
- return Ember.RSVP.hash({
- apps: this.store.query('yarn-app', {
- applicationTypes: "org-apache-slider"
- }),
- });
- },
-
- unloadAll() {
- this.store.unloadAll('yarn-app');
- }
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
index c3154b4..e988e0c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
@@ -46,7 +46,7 @@
<span class="sr-only">(current)</span>
{{/link-to}}
{{/link-to}}
- {{#link-to 'yarn-apps.apps' tagName="li" current-when="yarn-apps.apps yarn-apps.services"}}
+ {{#link-to 'yarn-apps.apps' tagName="li" current-when="yarn-apps.apps"}}
{{#link-to 'yarn-apps.apps' class="navigation-link"}}Applications
<span class="sr-only">(current)</span>
{{/link-to}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-table.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-table.hbs
index a036a0c..3bad063 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-table.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-table.hbs
@@ -38,7 +38,7 @@
{{#if arr}}
{{#each arr as |app|}}
<tr>
- <td><a href="#/yarn-app/{{app.id}}">{{app.id}}</a></td>
+ <td><a href="#/yarn-app/{{app.id}}/info">{{app.id}}</a></td>
<td>{{app.applicationType}}</td>
<td>{{app.appName}}</td>
<td>{{app.user}}</td>
@@ -61,7 +61,7 @@
{{/each}}
{{else}}
<tr>
- <td><a href="#/yarn-app/{{app.id}}">{{app.id}}</a></td>
+ <td><a href="#/yarn-app/{{app.id}}/info">{{app.id}}</a></td>
<td>{{app.applicationType}}</td>
<td>{{app.appName}}</td>
<td>{{app.user}}</td>
@@ -83,4 +83,4 @@
</tr>
{{/if}}
</tbody>
-</table>
\ No newline at end of file
+</table>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempts.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempts.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempts.hbs
deleted file mode 100644
index 283d78a..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempts.hbs
+++ /dev/null
@@ -1,58 +0,0 @@
-{{!
- * 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.
-}}
-
-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
-
-<div class="col-md-12 container-fluid">
- <div class="row">
-
- <div class="col-md-2 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">
- {{#if service}}
- Service
- {{else}}
- Application
- {{/if}}
- </div>
- <div class="panel-body">
- <ul class="nav nav-pills nav-stacked" id="stacked-menu">
- <ul class="nav nav-pills nav-stacked collapse in">
- {{#link-to 'yarn-app' tagName="li"}}
- {{#link-to 'yarn-app' model.appId (query-params service=service)}}Information
- {{/link-to}}
- {{/link-to}}
- {{#link-to 'yarn-app-attempts' tagName="li"}}
- {{#link-to 'yarn-app-attempts' model.appId (query-params service=service)}}Attempts List
- {{/link-to}}
- {{/link-to}}
- </ul>
- </ul>
- </div>
- </div>
- </div>
-
- <div class="col-md-10 container-fluid">
- <div class="row">
- {{timeline-view parent-id="attempt-timeline-div" my-id="timeline-view" height="100%" rmModel=model.attempts label="shortAppAttemptId" attemptModel=true serviceName=service}}
- </div>
- </div>
-
- </div>
-</div>
-{{outlet}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/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 c1f5352..2fb5ab3 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
@@ -18,14 +18,13 @@
{{breadcrumb-bar breadcrumbs=breadcrumbs}}
-{{#if model.app}}
<div class="col-md-12 container-fluid">
<div class="row">
<div class="col-md-2 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
- {{#if service}}
+ {{#if serviceName}}
Service
{{else}}
Application
@@ -34,13 +33,14 @@
<div class="panel-body">
<ul class="nav nav-pills nav-stacked" id="stacked-menu">
<ul class="nav nav-pills nav-stacked collapse in">
- {{#link-to 'yarn-app' tagName="li"}}
- {{#link-to 'yarn-app' model.app.id (query-params service=service)}}Information
- {{/link-to}}
+ {{#link-to 'yarn-app.info' tagName="li" class=(if (eq target.currentPath 'yarn-app.info') "active")}}
+ {{#link-to 'yarn-app.info' appId (query-params service=serviceName)}}Information{{/link-to}}
{{/link-to}}
- {{#link-to 'yarn-app-attempts' tagName="li"}}
- {{#link-to 'yarn-app-attempts' model.app.id (query-params service=service)}}Attempts List
- {{/link-to}}
+ {{#link-to 'yarn-app.attempts' tagName="li" class=(if (eq target.currentPath 'yarn-app.attempts') "active")}}
+ {{#link-to 'yarn-app.attempts' appId (query-params service=serviceName)}}Attempts List{{/link-to}}
+ {{/link-to}}
+ {{#link-to 'yarn-app.charts' tagName="li" class=(if (eq target.currentPath 'yarn-app.charts') "active")}}
+ {{#link-to 'yarn-app.charts' appId (query-params service=serviceName)}}Resource Usage{{/link-to}}
{{/link-to}}
</ul>
</ul>
@@ -49,174 +49,7 @@
</div>
<div class="col-md-10 container-fluid">
- <div class="row">
- <div class="col-md-12">
- {{app-timeout-bar app=model.app}}
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-12 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">Basic Info</div>
- <div class="x-scroll">
- <table class="display table table-striped table-bordered"
- cellspacing="0" width="100%">
- <thead>
- <tr>
- <th>Application ID</th>
- <th>Name</th>
- <th>User</th>
- <th>Queue</th>
- <th>State</th>
- <th>Final Status</th>
- <th>Start Time</th>
- <th>Elapsed Time</th>
- <th>Finished Time</th>
- <th>Priority</th>
- <th>Progress</th>
- <th>Is Unmanaged AM</th>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td>{{model.app.id}}</td>
- <td>{{model.app.appName}}</td>
- <td>{{model.app.user}}</td>
- <td>{{model.app.queue}}</td>
- <td>{{model.app.state}}</td>
- <td>
- <span class={{model.app.finalStatusStyle}}>
- {{model.app.finalStatus}}
- </span>
- </td>
- <td>{{model.app.startTime}}</td>
- <td>{{model.app.formattedElapsedTime}}</td>
- <td>{{model.app.validatedFinishedTs}}</td>
- <td>{{model.app.priority}}</td>
- <td>
- <div class="progress" style="margin-bottom: 0;">
- <div class="progress-bar" role="progressbar"
- aria-valuenow="60" aria-valuemin="0"
- aria-valuemax="100"
- style={{model.app.progressStyle}}>
- {{model.app.progress}}%
- </div>
- </div>
- </td>
- <td>{{model.app.unmanagedApplication}}</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- </div>
- </div>
-
- <div class="row">
- {{#if model.app.diagnostics}}
- <div class="col-md-12 container-fluid">
- {{#if model.app.isFailed}}
- <div class="panel panel-danger">
- <div class="panel-heading">
- Diagnostics
- </div>
- <div class="panel-body">{{model.app.diagnostics}}</div>
- </div>
- {{else}}
- <div class="panel panel-default">
- <div class="panel-heading">
- Diagnostics
- </div>
- <div class="panel-body">{{model.app.diagnostics}}</div>
- </div>
- {{/if}}
- </div>
- {{/if}}
- </div>
-
- <div class="row">
- <div class="col-md-8 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">Scheduling Info</div>
- <table class="display table table-striped table-bordered"
- cellspacing="0" width="100%">
- <thead>
- <tr>
- <th>Allocated Resource</th>
- <th>Running Containers</th>
- <th>Preempted Resource</th>
- <th>Num Non-AM container preempted</th>
- <th>Num AM container preempted</th>
- <th>Aggregated Resource Usage</th>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td>{{model.app.allocatedResource}}</td>
- <td>{{model.app.runningContainersNumber}}</td>
- <td>{{model.app.preemptedResource}}</td>
- <td>{{model.app.numAMContainerPreempted}}</td>
- <td>{{model.app.numAMContainerPreempted}}</td>
- <td>{{model.app.aggregatedResourceUsage}}</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
-
- <div class="col-md-4 container-fluid">
- <div class="panel panel-default">
- <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>
- <th>Master Node</th>
- <th>Master Node Label Expression</th>
- </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>{{model.app.amNodeLabelExpression}}</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- </div>
-
- {{#if model.nodes}}
- {{#if model.rmContainers}}
- <div class="row" id="stackd-bar-chart-mem">
- {{per-app-memusage-by-nodes-stacked-barchart
- nodes=model.nodes
- rmContainers=model.rmContainers
- parentId="stackd-bar-chart-mem"
- title=(concat 'Memory usage by nodes for: [' model.app.id ']')}}
- </div>
-
- <hr>
-
- <div class="row" id="stackd-bar-chart-ncontainer">
- {{per-app-ncontainers-by-nodes-stacked-barchart
- nodes=model.nodes
- rmContainers=model.rmContainers
- parentId="stackd-bar-chart-ncontainer"
- title=(concat 'Running #Containers by nodes for: [' model.app.id ']')}}
- </div>
- {{/if}}
- {{/if}}
-
-
+ {{outlet}}
</div>
</div>
</div>
-{{/if}}
-{{outlet}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/attempts.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/attempts.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/attempts.hbs
new file mode 100644
index 0000000..81896e2
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/attempts.hbs
@@ -0,0 +1,29 @@
+{{!
+ * 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.
+}}
+
+<div class="row">
+ {{timeline-view
+ parent-id="attempt-timeline-div"
+ my-id="timeline-view"
+ height="100%"
+ rmModel=model.attempts
+ label="shortAppAttemptId"
+ attemptModel=true
+ serviceName=model.serviceName
+ }}
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/charts.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/charts.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/charts.hbs
new file mode 100644
index 0000000..8d3388a
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/charts.hbs
@@ -0,0 +1,43 @@
+{{!
+ * 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.
+}}
+
+<div class="row">
+ <div class="col-md-12 container-fluid">
+ {{#if isRunningApp}}
+ <div class="row" id="stackd-bar-chart-mem">
+ {{per-app-memusage-by-nodes-stacked-barchart
+ nodes=model.nodes
+ rmContainers=model.rmContainers
+ parentId="stackd-bar-chart-mem"
+ title=(concat 'Memory usage by nodes for: [' model.appId ']')}}
+ </div>
+ <hr>
+ <div class="row" id="stackd-bar-chart-ncontainer">
+ {{per-app-ncontainers-by-nodes-stacked-barchart
+ nodes=model.nodes
+ rmContainers=model.rmContainers
+ parentId="stackd-bar-chart-ncontainer"
+ title=(concat 'Running #Containers by nodes for: [' model.appId ']')}}
+ </div>
+ {{else}}
+ <div class="panel panel-default">
+ <h4 class="text-center">No resource usage data is available for this application!</h4>
+ </div>
+ {{/if}}
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs
new file mode 100644
index 0000000..3cfec33
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs
@@ -0,0 +1,167 @@
+{{!
+ * 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.
+}}
+
+<div class="row">
+ <div class="col-md-12">
+ {{app-timeout-bar app=model.app}}
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-md-12 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Basic Info
+ </div>
+ <div class="x-scroll">
+ <table class="display table table-striped table-bordered"
+ cellspacing="0" width="100%">
+ <thead>
+ <tr>
+ <th>Application ID</th>
+ <th>Name</th>
+ <th>User</th>
+ <th>Queue</th>
+ <th>State</th>
+ <th>Final Status</th>
+ <th>Start Time</th>
+ <th>Elapsed Time</th>
+ <th>Finished Time</th>
+ <th>Priority</th>
+ {{#unless model.serviceName}}
+ <th>Progress</th>
+ <th>Is Unmanaged AM</th>
+ {{/unless}}
+ </tr>
+ </thead>
+
+ <tbody>
+ <tr>
+ <td>{{model.app.id}}</td>
+ <td>{{model.app.appName}}</td>
+ <td>{{model.app.user}}</td>
+ <td>{{model.app.queue}}</td>
+ <td>{{model.app.state}}</td>
+ <td>
+ <span class={{model.app.finalStatusStyle}}>
+ {{model.app.finalStatus}}
+ </span>
+ </td>
+ <td>{{model.app.startTime}}</td>
+ <td>{{model.app.formattedElapsedTime}}</td>
+ <td>{{model.app.validatedFinishedTs}}</td>
+ <td>{{model.app.priority}}</td>
+ {{#unless model.serviceName}}
+ <td>
+ <div class="progress" style="margin-bottom: 0;">
+ <div class="progress-bar" role="progressbar"
+ aria-valuenow="60" aria-valuemin="0"
+ aria-valuemax="100"
+ style={{model.app.progressStyle}}>
+ {{model.app.progress}}%
+ </div>
+ </div>
+ </td>
+ <td>{{model.app.unmanagedApplication}}</td>
+ {{/unless}}
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</div>
+
+<div class="row">
+ {{#if model.app.diagnostics}}
+ <div class="col-md-12 container-fluid">
+ {{#if model.app.isFailed}}
+ <div class="panel panel-danger">
+ <div class="panel-heading">
+ Diagnostics
+ </div>
+ <div class="panel-body">{{model.app.diagnostics}}</div>
+ </div>
+ {{else}}
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Diagnostics
+ </div>
+ <div class="panel-body">{{model.app.diagnostics}}</div>
+ </div>
+ {{/if}}
+ </div>
+ {{/if}}
+</div>
+
+<div class="row">
+ <div class="col-md-12 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">Scheduling Info</div>
+ <table class="display table table-striped table-bordered"
+ cellspacing="0" width="100%">
+ <thead>
+ <tr>
+ <th>Allocated Resource</th>
+ <th>Running Containers</th>
+ <th>Preempted Resource</th>
+ <th>Num Non-AM container preempted</th>
+ <th>Num AM container preempted</th>
+ <th>Aggregated Resource Usage</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>{{model.app.allocatedResource}}</td>
+ <td>{{model.app.runningContainersNumber}}</td>
+ <td>{{model.app.preemptedResource}}</td>
+ <td>{{model.app.numAMContainerPreempted}}</td>
+ <td>{{model.app.numAMContainerPreempted}}</td>
+ <td>{{model.app.aggregatedResourceUsage}}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+
+</div>
+
+<div class="row">
+ <div class="col-md-6 container-fluid">
+ <div class="panel panel-default">
+ <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>
+ <th>Master Node</th>
+ <th>Master Node Label Expression</th>
+ </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>{{model.app.amNodeLabelExpression}}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/loading.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/loading.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/loading.hbs
new file mode 100644
index 0000000..a95af2b
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/loading.hbs
@@ -0,0 +1,23 @@
+{{!
+ * 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.
+}}
+
+<div class="col-md-12 container-fluid">
+ <div class="loading-mask">
+ <img src="assets/images/spinner.gif" alt="Loading...">
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
index 264e6b6..00701d9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
@@ -24,14 +24,13 @@
<div class="col-md-2 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
- <h4>Applications</h4>
+ Applications
</div>
<div class="panel-body">
<ul class="nav nav-pills nav-stacked" id="stacked-menu">
<ul class="nav nav-pills nav-stacked collapse in">
{{#link-to 'yarn-apps.apps' tagName="li"}}
- {{#link-to 'yarn-apps.apps'}}All Applications
- {{/link-to}}
+ {{#link-to 'yarn-apps.apps'}}All Applications{{/link-to}}
{{/link-to}}
</ul>
</ul>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/services.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/services.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/services.hbs
deleted file mode 100644
index d56762c..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/services.hbs
+++ /dev/null
@@ -1,25 +0,0 @@
-{{!--
- 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.
---}}
-
-{{#if model.apps}}
- {{em-table columns=columns rows=model.apps definition=tableDefinition}}
-{{else}}
- <h4 align="center">Could not find any applications from this cluster</h4>
-{{/if}}
-
-{{outlet}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
index 9637a93..04788be 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
@@ -31,8 +31,7 @@
<ul class="nav nav-pills nav-stacked" id="stacked-menu">
<ul class="nav nav-pills nav-stacked collapse in">
{{#link-to 'yarn-services' tagName="li"}}
- {{#link-to 'yarn-services'}}Long Running Services
- {{/link-to}}
+ {{#link-to 'yarn-services'}}Long Running Services{{/link-to}}
{{/link-to}}
</ul>
</ul>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app-attempts-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app-attempts-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app-attempts-test.js
deleted file mode 100644
index 3894db2..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app-attempts-test.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 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.
- */
-
-import { moduleFor, test } from 'ember-qunit';
-
-moduleFor('controller:yarn-app-attempts', 'Unit | Controller | yarn app attempts', {
- // Specify the other units that are required for this test.
- // needs: ['controller:foo']
-});
-
-// Replace this with your real tests.
-test('it exists', function(assert) {
- let controller = this.subject();
- assert.ok(controller);
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/attempts-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/attempts-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/attempts-test.js
new file mode 100644
index 0000000..b8bad85
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/attempts-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('controller:yarn-app/attempts', 'Unit | Controller | yarn app/attempts', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let controller = this.subject();
+ assert.ok(controller);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/charts-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/charts-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/charts-test.js
new file mode 100644
index 0000000..91acb6c
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/charts-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('controller:yarn-app/charts', 'Unit | Controller | yarn app/charts', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let controller = this.subject();
+ assert.ok(controller);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/info-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/info-test.js
new file mode 100644
index 0000000..910d3ef
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/info-test.js
@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('controller:yarn-app/info', 'Unit | Controller | yarn app/info', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+ let controller = this.subject();
+ assert.ok(controller);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/services-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/services-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/services-test.js
deleted file mode 100644
index d0a1f85..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/services-test.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 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.
- */
-
-import { moduleFor, test } from 'ember-qunit';
-
-moduleFor('controller:yarn-apps/services', 'Unit | Controller | yarn apps/services', {
- // Specify the other units that are required for this test.
- // needs: ['controller:foo']
-});
-
-// Replace this with your real tests.
-test('it exists', function(assert) {
- let controller = this.subject();
- assert.ok(controller);
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app-attempts-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app-attempts-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app-attempts-test.js
deleted file mode 100644
index 917a159..0000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app-attempts-test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * 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.
- */
-
-import { moduleFor, test } from 'ember-qunit';
-
-moduleFor('route:yarn-app-attempts', 'Unit | Route | yarn app attempts', {
- // Specify the other units that are required for this test.
- // needs: ['controller:foo']
-});
-
-test('it exists', function(assert) {
- let route = this.subject();
- assert.ok(route);
-});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/attempts-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/attempts-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/attempts-test.js
new file mode 100644
index 0000000..eaf2f65
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/attempts-test.js
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('route:yarn-app/attempts', 'Unit | Route | yarn app/attempts', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+test('it exists', function(assert) {
+ let route = this.subject();
+ assert.ok(route);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/charts-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/charts-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/charts-test.js
new file mode 100644
index 0000000..1284c6f
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/charts-test.js
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('route:yarn-app/charts', 'Unit | Route | yarn app/charts', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+test('it exists', function(assert) {
+ let route = this.subject();
+ assert.ok(route);
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/info-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/info-test.js
new file mode 100644
index 0000000..f7dd6c8
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/info-test.js
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('route:yarn-app/info', 'Unit | Route | yarn app/info', {
+ // Specify the other units that are required for this test.
+ // needs: ['controller:foo']
+});
+
+test('it exists', function(assert) {
+ let route = this.subject();
+ assert.ok(route);
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[45/50] [abbrv] hadoop git commit: YARN-6386. Show decommissioning
nodes in new YARN UI. Contributed by Elek Marton.
Posted by va...@apache.org.
YARN-6386. Show decommissioning nodes in new YARN UI. Contributed by Elek Marton.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/65b90e1e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/65b90e1e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/65b90e1e
Branch: refs/heads/YARN-3368_branch2
Commit: 65b90e1e1c512efb74aabb8861ebfc13c8eef8fd
Parents: 1a1f39c
Author: Sunil G <su...@apache.org>
Authored: Tue Aug 29 16:51:14 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:49 2017 +0530
----------------------------------------------------------------------
.../main/webapp/app/models/cluster-metric.js | 9 ++++--
.../src/main/webapp/app/models/yarn-rm-node.js | 2 +-
.../webapp/app/templates/cluster-overview.hbs | 33 ++++++++++----------
.../main/webapp/app/templates/yarn-nodes.hbs | 2 +-
4 files changed, 26 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/65b90e1e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
index bc6e27a..dcc0c29 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
@@ -39,6 +39,7 @@ export default DS.Model.extend({
totalNodes: DS.attr('number'),
lostNodes: DS.attr('number'),
unhealthyNodes: DS.attr('number'),
+ decommissioningNodes: DS.attr('number'),
decommissionedNodes: DS.attr('number'),
rebootedNodes: DS.attr('number'),
activeNodes: DS.attr('number'),
@@ -87,11 +88,15 @@ export default DS.Model.extend({
value: this.get("unhealthyNodes")
});
arr.push({
+ label: "Decommissioning",
+ value: this.get("decommissioningNodes")
+ });
+ arr.push({
label: "Decomissioned",
value: this.get("decommissionedNodes")
});
return arr;
- }.property("activeNodes", "unhealthyNodes", "decommissionedNodes"),
+ }.property("activeNodes", "unhealthyNodes", "decommissioningNodes", "decommissionedNodes"),
getMemoryDataForDonutChart: function() {
var type = "MB";
@@ -130,4 +135,4 @@ export default DS.Model.extend({
return arr;
}.property("allocatedVirtualCores", "reservedVirtualCores", "availableVirtualCores"),
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/65b90e1e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
index 461bf00..6baeca2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
@@ -53,7 +53,7 @@ export default DS.Model.extend({
nodeStateStyle: function() {
var style = "default";
var nodeState = this.get("state");
- if (nodeState === "REBOOTED") {
+ if (nodeState === "REBOOTED" || nodeState === "DECOMMISSIONING") {
style = "warning";
} else if (nodeState === "UNHEALTHY" || nodeState === "DECOMMISSIONED" ||
nodeState === "LOST" || nodeState === "SHUTDOWN") {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/65b90e1e/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 ac8f20a..e549ce5 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
@@ -86,22 +86,6 @@
</div>
</div>
</div>
-
- <div class="col-lg-4 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">
- Node Managers
- </div>
- <div class="container-fluid" id="nodes-donut-chart">
- {{donut-chart data=model.clusterMetrics.firstObject.getNodesDataForDonutChart
- showLabels=true
- parentId="nodes-donut-chart"
- ratio=0.6
- maxHeight=350
- colorTargets="good error warn"}}
- </div>
- </div>
- </div>
</div>
<hr>
@@ -142,6 +126,23 @@
</div>
</div>
</div>
+ <div class="row">
+ <div class="col-lg-6 container-fluid">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Node Managers
+ </div>
+ <div class="container-fluid" id="nodes-donut-chart">
+ {{donut-chart data=model.clusterMetrics.firstObject.getNodesDataForDonutChart
+ showLabels=true
+ parentId="nodes-donut-chart"
+ ratio=0.6
+ maxHeight=350
+ colorTargets="good error warn"}}
+ </div>
+ </div>
+ </div>
+ </div>
</div>
{{/if}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/65b90e1e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
index 795d00e..79d9efa 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
@@ -47,7 +47,7 @@
<div class="col-md-10 container-fluid">
{{#if model.clusterMetrics}}
<div class="row">
- <div class="col-lg-5 container-fluid">
+ <div class="col-lg-6 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
Node Managers
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[03/50] [abbrv] hadoop git commit: YARN-5772. [YARN-3368] Replace old
Hadoop logo with new one (Akhil P B Tan via Sunil G)
Posted by va...@apache.org.
YARN-5772. [YARN-3368] Replace old Hadoop logo with new one (Akhil P B Tan via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/addc399e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/addc399e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/addc399e
Branch: refs/heads/YARN-3368_branch2
Commit: addc399e8bb8fe774dd5aefdc2dae3226c610b6c
Parents: 43f0627
Author: sunilg <su...@apache.org>
Authored: Thu Oct 27 10:45:47 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:47 2017 +0530
----------------------------------------------------------------------
.../webapp/public/assets/images/hadoop_logo.png | Bin 26495 -> 31716 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/addc399e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
index 275d39e..d481395 100644
Binary files a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png and b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png differ
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[31/50] [abbrv] hadoop git commit: YARN-6183. Few missing
informations in Application and Application Attempt pages for new YARN UI.
Contributed by Akhil PB.
Posted by va...@apache.org.
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/981ccd9d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/981ccd9d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/981ccd9d
Branch: refs/heads/YARN-3368_branch2
Commit: 981ccd9d906c75226f0cee32ce935a59f071e257
Parents: 9071c71
Author: Sunil G <su...@apache.org>
Authored: Wed Feb 15 15:52:57 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 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/981ccd9d/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/981ccd9d/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/981ccd9d/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/981ccd9d/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/981ccd9d/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/981ccd9d/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/981ccd9d/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/981ccd9d/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/981ccd9d/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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[30/50] [abbrv] hadoop git commit: YARN-5917. Make navigation link
active when selecting sub tabs in 'Applications' and 'Nodes' page for new UI.
Contributed by Kai Sasaki.
Posted by va...@apache.org.
YARN-5917. Make navigation link active when selecting sub tabs in 'Applications' and 'Nodes' page for new UI. Contributed by Kai Sasaki.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2c93e8ee
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2c93e8ee
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2c93e8ee
Branch: refs/heads/YARN-3368_branch2
Commit: 2c93e8ee13258946ede4be67375f5800ecd63fb9
Parents: 0d1a53a
Author: Sunil G <su...@apache.org>
Authored: Tue Feb 7 21:45:40 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/templates/application.hbs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c93e8ee/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
index 7783db4..4a2ba38 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
@@ -46,13 +46,13 @@
<span class="sr-only">(current)</span>
{{/link-to}}
{{/link-to}}
- {{#link-to 'yarn-apps.apps' tagName="li"}}
- {{#link-to 'yarn-apps.apps' class="navigation-link"}}Applications
+ {{#link-to 'yarn-apps.apps' tagName="li" currentWhen="yarn-apps.apps yarn-apps.services"}}
+ {{#link-to 'yarn-apps.apps' class="navigation-link" currentWhen="yarn-apps.apps yarn-apps.services"}}Applications
<span class="sr-only">(current)</span>
{{/link-to}}
{{/link-to}}
- {{#link-to 'yarn-nodes.table' tagName="li"}}
- {{#link-to 'yarn-nodes.table' class="navigation-link"}}Nodes
+ {{#link-to 'yarn-nodes.table' tagName="li" currentWhen="yarn-nodes.table yarn-nodes.heatmap"}}
+ {{#link-to 'yarn-nodes.table' class="navigation-link" currentWhen="yarn-nodes.table yarn-nodes.heatmap"}}Nodes
<span class="sr-only">(current)</span>
{{/link-to}}
{{/link-to}}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[25/50] [abbrv] hadoop git commit: YARN-5866. Fix few issues reported
by jshint in new YARN UI. Contributed by Akhil P B.
Posted by va...@apache.org.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
index 1c5b7b3..766c5c7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
@@ -49,7 +49,7 @@ export default DS.JSONAPISerializer.extend({
relationshipUserData.push({
type: "YarnUser",
id: u.username + "_" + payload.queueName,
- })
+ });
});
}
@@ -85,12 +85,12 @@ export default DS.JSONAPISerializer.extend({
return {
queue: this._super(store, primaryModelClass, fixedPayload, id, requestType),
includedData: includedData
- }
+ };
},
handleQueue(store, primaryModelClass, payload, id, requestType) {
var data = [];
- var includedData = []
+ var includedData = [];
var result = this.normalizeSingleResponse(store, primaryModelClass,
payload, id, requestType);
@@ -112,8 +112,8 @@ export default DS.JSONAPISerializer.extend({
return {
data: data,
- includedData, includedData
- }
+ includedData: includedData
+ };
},
normalizeArrayResponse(store, primaryModelClass, payload, id,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
index 6feab36..ad50621 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import Ember from 'ember';
import DS from 'ember-data';
import Converter from 'yarn-ui/utils/converter';
@@ -48,16 +47,14 @@ export default DS.JSONAPISerializer.extend({
return fixedPayload;
},
- normalizeSingleResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
// payload is of the form {"nodeInfo":{}}
var p = this.internalNormalizeSingleResponse(store,
primaryModelClass, payload, id);
return { data: p };
},
- normalizeArrayResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
// expected response is of the form { data: [ {}, {} ] }
var normalizedArrayResponse = {};
if (payload.nodes) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
index b96ec16..6c0cfee 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import Constants from 'yarn-ui/constants';
-
export default {
preDefinedColors : ["#1f77b4", "#aec7e8", "#ffbb78",
"#98df8a", "#ff9896", "#9467bd", "#c5b0d5", "#8c564b",
@@ -43,14 +41,14 @@ export default {
startIdx = Math.max(nColors - colorsTarget.length, 0);
}
- for (var i = 0; i < colorsTarget.length; i++) {
+ for (i = 0; i < colorsTarget.length; i++) {
if (i + startIdx < nColors) {
colors[i + startIdx] = this.getColorByTarget(colorsTarget[i]);
}
}
var idx = 0;
- for (var i = 0; i < nColors; i++) {
+ for (i = 0; i < nColors; i++) {
if (!colors[i]) {
colors[i] = this.preDefinedColors[i % this.preDefinedColors.length];
idx ++;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
index fb6b61c..448dd18 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
@@ -110,7 +110,7 @@ export default {
}
},
memoryToSimpliedUnit: function(mb) {
- var unit = "MB"
+ var unit = "MB";
var value = mb;
if (value / 1024 >= 0.9) {
value = value / 1024;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js
index fd940a2..e36de4b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import Constants from 'yarn-ui/constants';
-
export default {
getApplicationLink: function(applicationId) {
return "#/yarn-app/" + applicationId;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/mock.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/mock.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/mock.js
index 62eebc1..3112acc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/mock.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/mock.js
@@ -32,5 +32,5 @@ export default {
}
ref.set("model", data);
- },
-}
\ No newline at end of file
+ }
+};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/sorter.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/sorter.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/sorter.js
index febef6f..c986798 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/sorter.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/sorter.js
@@ -51,19 +51,19 @@ export default {
*/
function naturalSort(a, b) {
var diff = a.length - b.length;
- if (diff != 0) {
+ if (diff !== 0) {
var splitA = a.split("_");
var splitB = b.split("_");
- if (splitA.length != splitB.length) {
+ if (splitA.length !== splitB.length) {
return a.localeCompare(b);
}
for (var i = 1; i < splitA.length; i++) {
var splitdiff = splitA[i].length - splitB[i].length;
- if (splitdiff != 0) {
+ if (splitdiff !== 0) {
return splitdiff;
}
var splitCompare = splitA[i].localeCompare(splitB[i]);
- if (splitCompare != 0) {
+ if (splitCompare !== 0) {
return splitCompare;
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
index 7736c75..b75a2e9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
@@ -22,7 +22,7 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app');
module.exports = function(defaults) {
var app = new EmberApp(defaults, {
- hinting: false
+ hinting: true
});
app.import("bower_components/datatables/media/css/jquery.dataTables.min.css");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-log-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-log-test.js
index 45808a5..93cdec6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-log-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-log-test.js
@@ -17,6 +17,7 @@
*/
import { moduleForModel, test } from 'ember-qunit';
+import Ember from 'ember';
moduleForModel('yarn-container-log', 'Unit | Model | ContainerLog', {
// Specify the other units that are required for this test.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-app-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-app-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-app-test.js
index 7e2e62f..3b91ea7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-app-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-app-test.js
@@ -17,6 +17,7 @@
*/
import { moduleForModel, test } from 'ember-qunit';
+import Ember from 'ember';
moduleForModel('yarn-node-app', 'Unit | Model | NodeApp', {
// Specify the other units that are required for this test.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-container-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-container-test.js
index 88bf233..24ad4c4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-container-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-container-test.js
@@ -17,6 +17,7 @@
*/
import { moduleForModel, test } from 'ember-qunit';
+import Ember from 'ember';
moduleForModel('yarn-node-container', 'Unit | Model | NodeContainer', {
// Specify the other units that are required for this test.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-test.js
index 5877589..8d7c831 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-test.js
@@ -17,6 +17,7 @@
*/
import { moduleForModel, test } from 'ember-qunit';
+import Ember from 'ember';
moduleForModel('yarn-node', 'Unit | Model | Node', {
// Specify the other units that are required for this test.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-node-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-node-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-node-test.js
index 4fd2517..2499ebc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-node-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-node-test.js
@@ -17,6 +17,7 @@
*/
import { moduleForModel, test } from 'ember-qunit';
+import Ember from 'ember';
moduleForModel('yarn-rm-node', 'Unit | Model | RMNode', {
// Specify the other units that are required for this test.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-container-log-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-container-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-container-log-test.js
index 4e68da0..d0a78dd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-container-log-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-container-log-test.js
@@ -17,7 +17,7 @@
*/
import { moduleFor, test } from 'ember-qunit';
-import Constants from 'yarn-ui/constants';
+import Ember from 'ember';
moduleFor('route:yarn-container-log', 'Unit | Route | ContainerLog', {
});
@@ -34,11 +34,11 @@ test('Test getting container log', function(assert) {
containerID: "container_e32_1456000363780_0002_01_000001",
logFileName: "syslog"};
var store = {
- findRecord: function(type) {
+ findRecord: function() {
return new Ember.RSVP.Promise(function(resolve) {
resolve(response);
- }
- )}
+ });
+ }
};
assert.expect(6);
var route = this.subject();
@@ -67,11 +67,11 @@ test('Test non HTTP error while getting container log', function(assert) {
containerID: "container_e32_1456000363780_0002_01_000001",
logFileName: "syslog"};
var store = {
- findRecord: function(type) {
+ findRecord: function() {
return new Ember.RSVP.Promise(function(resolve, reject) {
reject(error);
- }
- )}
+ });
+ }
};
assert.expect(6);
var route = this.subject();
@@ -92,16 +92,12 @@ test('Test non HTTP error while getting container log', function(assert) {
test('Test HTTP error while getting container log', function(assert) {
var error = {errors: [{status: 404, responseText: 'Not Found'}]};
- var response = {
- logs: "",
- containerID: "container_e32_1456000363780_0002_01_000001",
- logFileName: "syslog"};
var store = {
- findRecord: function(type) {
+ findRecord: function() {
return new Ember.RSVP.Promise(function(resolve, reject) {
reject(error);
- }
- )}
+ });
+ }
};
assert.expect(5);
var route = this.subject();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-app-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-app-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-app-test.js
index 8e5acf9..a4f787e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-app-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-app-test.js
@@ -17,6 +17,7 @@
*/
import { moduleFor, test } from 'ember-qunit';
+import Ember from 'ember';
moduleFor('route:yarn-node-app', 'Unit | Route | NodeApp', {
});
@@ -31,7 +32,7 @@ test('Test getting specific app on a node', function(assert) {
var response =
{id:"application_1456251210105_0001", state:"FINISHED", user:"root"};
var store = {
- queryRecord: function(type, query) {
+ queryRecord: function() {
return new Ember.RSVP.Promise(function(resolve) {
resolve(response);
});
@@ -40,17 +41,16 @@ test('Test getting specific app on a node', function(assert) {
assert.expect(6);
var route = this.subject();
route.set('store', store);
- var model =
- route.model({node_id:"localhost:64318", node_addr:"localhost:8042",
- app_id:"application_1456251210105_0001"}).
- then(
- function(value){
- assert.ok(value);
- assert.ok(value.nodeApp);
- assert.deepEqual(value.nodeApp, response);
- assert.ok(value.nodeInfo);
- assert.equal(value.nodeInfo.addr, 'localhost:8042');
- assert.equal(value.nodeInfo.id, 'localhost:64318');
- }
- );
+ route.model({node_id:"localhost:64318", node_addr:"localhost:8042",
+ app_id:"application_1456251210105_0001"})
+ .then(
+ function(value){
+ assert.ok(value);
+ assert.ok(value.nodeApp);
+ assert.deepEqual(value.nodeApp, response);
+ assert.ok(value.nodeInfo);
+ assert.equal(value.nodeInfo.addr, 'localhost:8042');
+ assert.equal(value.nodeInfo.id, 'localhost:64318');
+ }
+ );
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-apps-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-apps-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-apps-test.js
index 44d9995..8666ca5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-apps-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-apps-test.js
@@ -17,6 +17,7 @@
*/
import { moduleFor, test } from 'ember-qunit';
+import Ember from 'ember';
moduleFor('route:yarn-node-apps', 'Unit | Route | NodeApps', {
});
@@ -34,7 +35,7 @@ test('Test getting apps on a node', function(assert) {
containerids:["container_e38_1456251210105_0002_01_000001",
"container_e38_1456251210105_0002_01_000002"]}];
var store = {
- query: function(type, query) {
+ query: function() {
return new Ember.RSVP.Promise(function(resolve) {
resolve(response.slice());
});
@@ -43,18 +44,17 @@ test('Test getting apps on a node', function(assert) {
assert.expect(8);
var route = this.subject();
route.set('store', store);
- var model =
- route.model({node_id:"localhost:64318", node_addr:"localhost:8042"}).
- then(
- function(value){
- assert.ok(value);
- assert.ok(value.apps);
- assert.equal(value.apps.length, 2);
- assert.deepEqual(response[0], value.apps[0]);
- assert.deepEqual(response[1], value.apps[1]);
- assert.ok(value.nodeInfo);
- assert.equal(value.nodeInfo.addr, 'localhost:8042');
- assert.equal(value.nodeInfo.id, 'localhost:64318');
- }
- );
+ route.model({node_id:"localhost:64318", node_addr:"localhost:8042"})
+ .then(
+ function(value){
+ assert.ok(value);
+ assert.ok(value.apps);
+ assert.equal(value.apps.length, 2);
+ assert.deepEqual(response[0], value.apps[0]);
+ assert.deepEqual(response[1], value.apps[1]);
+ assert.ok(value.nodeInfo);
+ assert.equal(value.nodeInfo.addr, 'localhost:8042');
+ assert.equal(value.nodeInfo.id, 'localhost:64318');
+ }
+ );
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-container-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-container-test.js
index f0b68fc..f304d42 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-container-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-container-test.js
@@ -17,6 +17,7 @@
*/
import { moduleFor, test } from 'ember-qunit';
+import Ember from 'ember';
moduleFor('route:yarn-node-container', 'Unit | Route | NodeContainer', {
});
@@ -36,7 +37,7 @@ test('Test getting specific container on a node', function(assert) {
nodeId: "localhost:64318", containerLogFiles:["syslog","stderr",
"stdout"]};
var store = {
- queryRecord: function(type, query) {
+ queryRecord: function() {
return new Ember.RSVP.Promise(function(resolve) {
resolve(response);
});
@@ -45,17 +46,16 @@ test('Test getting specific container on a node', function(assert) {
assert.expect(6);
var route = this.subject();
route.set('store', store);
- var model =
- route.model({node_id:"localhost:64318", node_addr:"localhost:8042",
- container_id:"container_e32_1456000363780_0002_01_000001"}).
- then(
- function(value){
- assert.ok(value);
- assert.ok(value.nodeContainer);
- assert.deepEqual(value.nodeContainer, response);
- assert.ok(value.nodeInfo);
- assert.equal(value.nodeInfo.addr, 'localhost:8042');
- assert.equal(value.nodeInfo.id, 'localhost:64318');
- }
- );
+ route.model({node_id:"localhost:64318", node_addr:"localhost:8042",
+ container_id:"container_e32_1456000363780_0002_01_000001"})
+ .then(
+ function(value){
+ assert.ok(value);
+ assert.ok(value.nodeContainer);
+ assert.deepEqual(value.nodeContainer, response);
+ assert.ok(value.nodeInfo);
+ assert.equal(value.nodeInfo.addr, 'localhost:8042');
+ assert.equal(value.nodeInfo.id, 'localhost:64318');
+ }
+ );
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-containers-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-containers-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-containers-test.js
index 8359713..5c25ca2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-containers-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-containers-test.js
@@ -17,6 +17,7 @@
*/
import { moduleFor, test } from 'ember-qunit';
+import Ember from 'ember';
moduleFor('route:yarn-node-containers', 'Unit | Route | NodeContainers', {
});
@@ -42,7 +43,7 @@ test('Test getting apps on a node', function(assert) {
nodeId:"localhost:64318",containerLogFiles:["syslog","stderr",
"syslog.shuffle","stdout"]}];
var store = {
- query: function(type, query) {
+ query: function() {
return new Ember.RSVP.Promise(function(resolve) {
resolve(response.slice());
});
@@ -51,18 +52,17 @@ test('Test getting apps on a node', function(assert) {
assert.expect(8);
var route = this.subject();
route.set('store', store);
- var model =
- route.model({node_id:"localhost:64318", node_addr:"localhost:8042"}).
- then(
- function(value){
- assert.ok(value);
- assert.ok(value.containers);
- assert.equal(value.containers.length, 2);
- assert.deepEqual(value.containers[0], response[0]);
- assert.deepEqual(value.containers[1], response[1]);
- assert.ok(value.nodeInfo);
- assert.equal(value.nodeInfo.addr, 'localhost:8042');
- assert.equal(value.nodeInfo.id, 'localhost:64318');
- }
- );
+ route.model({node_id:"localhost:64318", node_addr:"localhost:8042"})
+ .then(
+ function(value){
+ assert.ok(value);
+ assert.ok(value.containers);
+ assert.equal(value.containers.length, 2);
+ assert.deepEqual(value.containers[0], response[0]);
+ assert.deepEqual(value.containers[1], response[1]);
+ assert.ok(value.nodeInfo);
+ assert.equal(value.nodeInfo.addr, 'localhost:8042');
+ assert.equal(value.nodeInfo.id, 'localhost:64318');
+ }
+ );
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-test.js
index 4e82f1b..d0b0553 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-test.js
@@ -61,11 +61,11 @@ test('Test getting a node', function(assert) {
// Create store which returns appropriate responses.
var store = {
findRecord: function(type) {
- if (type == 'yarnNode') {
+ if (type === 'yarnNode') {
return new Ember.RSVP.Promise(function(resolve) {
resolve(nodeResponse);
});
- } else if (type == 'yarnRmNode') {
+ } else if (type === 'yarnRmNode') {
return new Ember.RSVP.Promise(function(resolve) {
resolve(rmNodeResponse);
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-nodes-test.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-nodes-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-nodes-test.js
index baa5bd6..8a1ce59 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-nodes-test.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-nodes-test.js
@@ -57,7 +57,7 @@ test('Test getting nodes', function(assert) {
containersCPUUsage: 0
}}];
var store = {
- findAll: function(type) {
+ findAll: function() {
return new Ember.RSVP.Promise(function(resolve) {
resolve(response);
});
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[35/50] [abbrv] hadoop git commit: YARN-5496. Make Node Heatmap Chart categories clickable in new YARN UI. Contributed by Gergely Novák.
Posted by va...@apache.org.
YARN-5496. Make Node Heatmap Chart categories clickable in new YARN UI. Contributed by Gergely Novák.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/16cc2827
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/16cc2827
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/16cc2827
Branch: refs/heads/YARN-3368_branch2
Commit: 16cc2827250039a4263aa8aefd5d7c131976e37a
Parents: bbd98cb
Author: Sunil G <su...@apache.org>
Authored: Tue Mar 14 11:47:11 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Wed Oct 18 02:06:48 2017 +0530
----------------------------------------------------------------------
.../app/components/base-chart-component.js | 4 +
.../main/webapp/app/components/nodes-heatmap.js | 106 ++++++++++++++-----
.../src/main/webapp/app/styles/app.css | 12 +++
3 files changed, 93 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/16cc2827/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
index d11a532..aa41893 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
@@ -141,4 +141,8 @@ export default Ember.Component.extend({
};
return layout;
},
+
+ willDestroy: function() {
+ this.tooltip.remove();
+ }
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/16cc2827/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
index 5652834..ef6e46e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
@@ -26,17 +26,18 @@ export default BaseChartComponent.extend({
CELL_MARGIN: 2,
RACK_MARGIN: 20,
filter: "",
+ selectedCategory: 0,
- bindTP: function(element) {
+ bindTP: function(element, cell) {
element.on("mouseover", function() {
this.tooltip
.style("left", (d3.event.pageX) + "px")
.style("top", (d3.event.pageY - 28) + "px");
- element.style("opacity", 1.0);
+ cell.style("opacity", 1.0);
}.bind(this))
.on("mousemove", function() {
// Handle pie chart case
- var text = element.attr("tooltiptext");
+ var text = cell.attr("tooltiptext");
this.tooltip.style("opacity", 0.9);
this.tooltip.html(text)
@@ -45,10 +46,45 @@ export default BaseChartComponent.extend({
}.bind(this))
.on("mouseout", function() {
this.tooltip.style("opacity", 0);
- element.style("opacity", 0.8);
+ cell.style("opacity", 0.8);
}.bind(this));
},
+ bindSelectCategory: function(element, i) {
+ element.on("click", function() {
+ if (this.selectedCategory == i) {
+ // Remove selection for second click
+ this.selectedCategory = 0;
+ } else {
+ this.selectedCategory = i;
+ }
+ this.didInsertElement();
+ }.bind(this));
+ },
+
+ isNodeSelected: function(node) {
+ if (this.filter) {
+ var rack = node.get("rack");
+ var host = node.get("nodeHostName");
+ if (!rack.includes(this.filter) && !host.includes(this.filter)) {
+ return false;
+ }
+ }
+
+ if (this.selectedCategory === 0) {
+ return true;
+ }
+
+ var usage = node.get("usedMemoryMB") /
+ (node.get("usedMemoryMB") + node.get("availMemoryMB"))
+ var lowerLimit = (this.selectedCategory - 1) * 0.2;
+ var upperLimit = this.selectedCategory * 0.2;
+ if (lowerLimit <= usage && usage <= upperLimit) {
+ return true;
+ }
+ return false;
+ },
+
// data:
// [{label=label1, value=value1}, ...]
// ...
@@ -84,20 +120,32 @@ export default BaseChartComponent.extend({
for (i = 1; i <= 5; i++) {
var ratio = i * 0.2 - 0.1;
- g.append("rect")
+ var rect = g.append("rect")
.attr("x", sampleXOffset)
.attr("y", sampleYOffset)
- .attr("fill", colorFunc(ratio))
+ .attr("fill", this.selectedCategory === i ? "#2ca02c" : colorFunc(ratio))
.attr("width", this.SAMPLE_CELL_WIDTH)
- .attr("height", this.SAMPLE_HEIGHT);
- g.append("text")
+ .attr("height", this.SAMPLE_HEIGHT)
+ .attr("class", "hyperlink");
+ this.bindSelectCategory(rect, i);
+ var text = g.append("text")
.text("" + (ratio * 100).toFixed(1) + "% Used")
.attr("y", sampleYOffset + this.SAMPLE_HEIGHT / 2 + 5)
.attr("x", sampleXOffset + this.SAMPLE_CELL_WIDTH / 2)
- .attr("class", "heatmap-cell");
+ .attr("class", "heatmap-cell hyperlink");
+ this.bindSelectCategory(text, i);
sampleXOffset += this.CELL_MARGIN + this.SAMPLE_CELL_WIDTH;
}
+ if (this.selectedCategory != 0) {
+ var text = g.append("text")
+ .text("Clear")
+ .attr("y", sampleYOffset + this.SAMPLE_HEIGHT / 2 + 5)
+ .attr("x", sampleXOffset + 20)
+ .attr("class", "heatmap-clear hyperlink");
+ this.bindSelectCategory(text, 0);
+ }
+
var chartXOffset = -1;
for (i = 0; i < racksArray.length; i++) {
@@ -118,22 +166,7 @@ export default BaseChartComponent.extend({
var host = data[j].get("nodeHostName");
if (rack === racksArray[i]) {
- if (!rack.includes(this.filter) && !host.includes(this.filter)) {
- this.addNode(g, xOffset, yOffset, colorFunc, data[j], false);
- g.append("text")
- .text(host)
- .attr("y", yOffset + this.CELL_HEIGHT / 2 + 5)
- .attr("x", xOffset + this.CELL_WIDTH / 2)
- .attr("class", "heatmap-cell-notselected");
- } else {
- this.addNode(g, xOffset, yOffset, colorFunc, data[j], true);
- g.append("text")
- .text(host)
- .attr("y", yOffset + this.CELL_HEIGHT / 2 + 5)
- .attr("x", xOffset + this.CELL_WIDTH / 2)
- .attr("class", "heatmap-cell");
- }
-
+ this.addNode(g, xOffset, yOffset, colorFunc, data[j]);
xOffset += this.CELL_MARGIN + this.CELL_WIDTH;
if (xOffset + this.CELL_MARGIN + this.CELL_WIDTH >= layout.x2 -
layout.margin) {
@@ -162,7 +195,7 @@ export default BaseChartComponent.extend({
this.renderTitleAndBG(g, title, layout, false);
},
- addNode: function (g, xOffset, yOffset, colorFunc, data, selected) {
+ addNode: function (g, xOffset, yOffset, colorFunc, data) {
var rect = g.append("rect")
.attr("y", yOffset)
.attr("x", xOffset)
@@ -171,13 +204,27 @@ export default BaseChartComponent.extend({
(data.get("usedMemoryMB") + data.get("availMemoryMB"))))
.attr("width", this.CELL_WIDTH)
.attr("tooltiptext", data.get("toolTipText"));
- if (selected) {
+
+ if (this.isNodeSelected(data)) {
rect.style("opacity", 0.8);
- this.bindTP(rect);
+ this.bindTP(rect, rect);
} else {
rect.style("opacity", 0.8);
rect.attr("fill", "DimGray");
}
+ var node_id = data.get("id"),
+ node_addr = data.get("nodeHTTPAddress"),
+ href = `#/yarn-node/${node_id}/${node_addr}`;
+ var a = g.append("a")
+ .attr("href", href);
+ var text = a.append("text")
+ .text(data.get("nodeHostName"))
+ .attr("y", yOffset + this.CELL_HEIGHT / 2 + 5)
+ .attr("x", xOffset + this.CELL_WIDTH / 2)
+ .attr("class", this.isNodeSelected(data) ? "heatmap-cell" : "heatmap-cell-notselected")
+ if (this.isNodeSelected(data)) {
+ this.bindTP(a, rect);
+ }
},
addPlaceholderNode: function(g, xOffset, yOffset) {
@@ -202,7 +249,8 @@ export default BaseChartComponent.extend({
actions: {
applyFilter: function(event) {
this.filter = event.srcElement.value;
+ this.selectedCategory = 0;
this.didInsertElement();
}
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/16cc2827/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 7ac21bc..dca5b92 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
@@ -63,6 +63,18 @@ text.heatmap-cell {
text-align: center;
}
+.hyperlink {
+ cursor: pointer;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
+
+.heatmap-clear {
+ fill: #337ab7;
+}
+
text.heatmap-cell-notselected {
font: 14px sans-serif;
font-weight: bold;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[38/50] [abbrv] hadoop git commit: YARN-5705. Show timeline data from
ATS v2 in new web UI. Contributed by Akhil PB.
Posted by va...@apache.org.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js
new file mode 100644
index 0000000..1095cfe
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js
@@ -0,0 +1,28 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+
+export default DS.Model.extend({
+ cluster: DS.attr('string'),
+ flowName: DS.attr('string'),
+ lastExecDate: DS.attr('string'),
+ user: DS.attr('string'),
+ flowruns: DS.attr('string'),
+ uid: DS.attr('string')
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
new file mode 100644
index 0000000..8d9fca3
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
@@ -0,0 +1,70 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+import Converter from 'yarn-ui/utils/converter';
+
+export default DS.Model.extend({
+ flowName: DS.attr('string'),
+ runid: DS.attr('string'),
+ shownid: DS.attr('string'),
+ type: DS.attr('string'),
+ createTime: DS.attr('string'),
+ createTimeRaw: DS.attr(),
+ endTime: DS.attr('string'),
+ endTimeRaw: DS.attr(),
+ user: DS.attr('string'),
+ uid: DS.attr('string'),
+ cpuVCores: DS.attr('number'),
+ memoryUsed: DS.attr('number'),
+
+ runDurationTs: function() {
+ var duration = this.get('endTimeRaw') - this.get('createTimeRaw');
+ if (duration <= 0) {
+ duration = Date.now() - this.get('createTimeRaw');
+ }
+ return duration;
+ }.property('createTimeRaw', 'endTimeRaw'),
+
+ getElapsedTimeVizDataForBarChart: function() {
+ return {
+ label: this.get('runid'),
+ value: this.get('runDurationTs'),
+ tooltip: this.get("shownid") + "<br>" + Converter.msToElapsedTimeUnit(this.get('runDurationTs')),
+ flowrunUid: this.get('uid')
+ };
+ },
+
+ getCpuVCoresVizDataForBarChart: function() {
+ return {
+ label: this.get('runid'),
+ value: this.get('cpuVCores'),
+ tooltip: this.get("shownid") + "<br>" + 'CPU VCores: ' + this.get('cpuVCores'),
+ flowrunUid: this.get('uid')
+ };
+ },
+
+ getMemoryVizDataForBarChart: function() {
+ return {
+ label: this.get('runid'),
+ value: this.get('memoryUsed'),
+ tooltip: this.get("shownid") + "<br>" + 'Memory Used: ' + Converter.memoryBytesToMB(this.get('memoryUsed')),
+ flowrunUid: this.get('uid')
+ };
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun.js
new file mode 100644
index 0000000..5e3a050
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun.js
@@ -0,0 +1,32 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+
+// For now, similar to yarn-flowrun-brief, but may add more in future.
+
+export default DS.Model.extend({
+ flowName: DS.attr('string'),
+ runid: DS.attr('string'),
+ shownid: DS.attr('string'),
+ type: DS.attr('string'),
+ createTime: DS.attr('string'),
+ endTime: DS.attr('string'),
+ user: DS.attr('string'),
+ metrics: DS.attr('array')
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js
new file mode 100644
index 0000000..dd95765
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js
@@ -0,0 +1,143 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import DS from 'ember-data';
+import Converter from 'yarn-ui/utils/converter';
+
+export default DS.Model.extend({
+ startTime: DS.attr('string'),
+ startedTime: DS.attr('string'),
+ finishedTime: DS.attr('string'),
+ containerId: DS.attr('string'),
+ amContainerId: DS.attr('string'),
+ nodeHttpAddress: DS.attr('string'),
+ nodeId: DS.attr('string'),
+ hosts: DS.attr('string'),
+ logsLink: DS.attr('string'),
+ state: DS.attr('string'),
+ appAttemptId: DS.attr('string'),
+
+ appId: Ember.computed("id",function () {
+ var id = this.get("id");
+ id = id.split("_");
+
+ id[0] = "application";
+ id.pop();
+
+ return id.join("_");
+ }),
+
+ attemptStartedTime: function() {
+ var startTime = this.get("startTime");
+ // If startTime variable is not present, get from startedTime
+ if (startTime === undefined ||
+ startTime === "Invalid date") {
+ startTime = this.get("startedTime");
+ }
+
+ return startTime;
+ }.property("startedTime"),
+
+ startTs: function() {
+ return Converter.dateToTimeStamp(this.get('attemptStartedTime'));
+ }.property("startTime"),
+
+ finishedTs: function() {
+ var ts = Converter.dateToTimeStamp(this.get("finishedTime"));
+ return ts;
+ }.property("finishedTime"),
+
+ validatedFinishedTs: function() {
+ if (this.get("finishedTs") < this.get("startTs")) {
+ return "";
+ }
+ return this.get("finishedTime");
+ }.property("finishedTime"),
+
+ shortAppAttemptId: function() {
+ if (!this.get("containerId")) {
+ return this.get("id");
+ }
+ return "attempt_" +
+ parseInt(Converter.containerIdToAttemptId(this.get("containerId")).split("_")[3]);
+ }.property("containerId"),
+
+ appMasterContainerId: function() {
+ var id = this.get("containerId");
+ // If containerId variable is not present, get from amContainerId
+ if (id === undefined) {
+ id = this.get("amContainerId");
+ }
+ return id;
+ }.property("amContainerId"),
+
+ IsAmNodeUrl: function() {
+ var url = this.get("nodeHttpAddress");
+ // If nodeHttpAddress variable is not present, hardcode it.
+ if (url === undefined) {
+ url = "Not Available";
+ }
+ return url !== "Not Available";
+ }.property("nodeHttpAddress"),
+
+ amNodeId : function() {
+ var id = this.get("nodeId");
+ // If nodeId variable is not present, get from host
+ if (id === undefined) {
+ id = this.get("hosts");
+ }
+ return id;
+ }.property("nodeId"),
+
+ IsLinkAvailable: function() {
+ var url = this.get("logsLink");
+ // If logsLink variable is not present, hardcode its.
+ if (url === undefined) {
+ url = "Not Available";
+ }
+ return url !== "Not Available";
+ }.property("logsLink"),
+
+ elapsedTime: function() {
+ var elapsedMs = this.get("finishedTs") - this.get("startTs");
+ if (elapsedMs <= 0) {
+ elapsedMs = Date.now() - this.get("startTs");
+ }
+ return Converter.msToElapsedTimeUnit(elapsedMs);
+ }.property(),
+
+ tooltipLabel: function() {
+ return "<p>Id:" + this.get("id") +
+ "</p><p>ElapsedTime:" +
+ String(this.get("elapsedTime")) + "</p>";
+ }.property(),
+
+ link: function() {
+ return "/yarn-app-attempt/" + this.get("id");
+ }.property(),
+
+ linkname: function() {
+ return "yarn-app-attempt";
+ }.property(),
+
+ attemptState: function() {
+ return this.get("state");
+ }.property(),
+
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js
new file mode 100644
index 0000000..7f39345
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js
@@ -0,0 +1,63 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+import Converter from 'yarn-ui/utils/converter';
+
+export default DS.Model.extend({
+ allocatedMB: DS.attr('number'),
+ allocatedVCores: DS.attr('number'),
+ assignedNodeId: DS.attr('string'),
+ priority: DS.attr('number'),
+ startedTime: DS.attr('number'),
+ finishedTime: DS.attr('number'),
+ logUrl: DS.attr('string'),
+ containerExitStatus: DS.attr('number'),
+ containerState: DS.attr('string'),
+ nodeHttpAddress: DS.attr('string'),
+
+ startTs: function() {
+ return Converter.dateToTimeStamp(this.get("startedTime"));
+ }.property("startedTime"),
+
+ finishedTs: function() {
+ var ts = Converter.dateToTimeStamp(this.get("finishedTime"));
+ return ts;
+ }.property("finishedTime"),
+
+ validatedFinishedTs: function() {
+ if (this.get("finishedTs") < this.get("startTs")) {
+ return "";
+ }
+ return this.get("finishedTime");
+ }.property("finishedTime"),
+
+ elapsedTime: function() {
+ var elapsedMs = this.get("finishedTs") - this.get("startTs");
+ if (elapsedMs <= 0) {
+ elapsedMs = Date.now() - this.get("startTs");
+ }
+ return Converter.msToElapsedTimeUnit(elapsedMs);
+ }.property(),
+
+ tooltipLabel: function() {
+ return "<p>Id:" + this.get("id") +
+ "</p><p>ElapsedTime:" +
+ String(this.get("elapsedTime")) + "</p>";
+ }.property(),
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
index a45861e..00d6d3e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
@@ -56,6 +56,18 @@ Router.map(function() {
this.route('notfound', { path: '*:' });
this.route('yarn-app-attempts', { path: '/yarn-app-attempts/:app_id' });
this.route('yarn-queues', { path: '/yarn-queues/:queue_name' });
+
+ this.route('yarn-flow-activity');
+ this.route('yarn-flow', { path: '/yarn-flow/:flow_uid'}, function() {
+ this.route('info');
+ this.route('runs');
+ });
+ this.route('yarn-flowrun', { path: '/yarn-flowrun/:flowrun_uid'}, function() {
+ this.route('info');
+ this.route('metrics');
+ });
+ this.route('yarn-flowrun-metric', { path: '/yarn-flowrun-metric/:flowrun_uid/:metric_id'});
+ this.route('timeline-error', {path: 'timeline-error/:error_id'});
});
export default Router;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/timeline-error.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/timeline-error.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/timeline-error.js
new file mode 100644
index 0000000..c2e5fc5
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/timeline-error.js
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+ afterModel(model/*, transition*/) {
+ model.error_id = "error";
+ model.isValidErrorCode = false;
+ if (model.errorCode && model.errorCode !== "0") {
+ model.isValidErrorCode = true;
+ }
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempt.js
----------------------------------------------------------------------
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 d449adf..b561bf6 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
@@ -17,34 +17,28 @@
*/
import Ember from 'ember';
-
import AbstractRoute from './abstract';
+import AppAttemptMixin from 'yarn-ui/mixins/app-attempt';
-export default AbstractRoute.extend({
+export default AbstractRoute.extend(AppAttemptMixin, {
model(param) {
return Ember.RSVP.hash({
- attempt: this.store.findRecord('yarn-app-attempt', param.app_attempt_id, {reload: true}),
-
- rmContainers: this.store.query('yarn-container',
- {
- app_attempt_id: param.app_attempt_id,
- is_rm: true
- }),
-
- tsContainers: this.store.query('yarn-container',
- {
- app_attempt_id: param.app_attempt_id,
- is_rm: false
- }).catch (function() {
- // Promise rejected, fulfill with some default value to
- // use as the route's model and continue on with the transition
- return [];
- })
+ attempt: this.fetchAttemptInfoFromRMorATS(param.app_attempt_id, this.store),
+ rmContainers: this.store.query('yarn-container', {
+ app_attempt_id: param.app_attempt_id
+ }),
+ tsContainers: this.store.query('yarn-timeline-container', {
+ app_attempt_id: param.app_attempt_id
+ }).catch(function() {
+ return [];
+ })
});
},
unloadAll() {
this.store.unloadAll('yarn-app-attempt');
+ this.store.unloadAll('yarn-timeline-appattempt');
this.store.unloadAll('yarn-container');
+ this.store.unloadAll('yarn-timeline-container');
}
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
index 78ff1c9..233bfc8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempts.js
@@ -16,19 +16,20 @@
* limitations under the License.
*/
+import Ember from 'ember';
import AbstractRoute from './abstract';
+import AppAttemptMixin from 'yarn-ui/mixins/app-attempt';
-export default AbstractRoute.extend({
+export default AbstractRoute.extend(AppAttemptMixin, {
model(param) {
- return this.store.query('yarn-app-attempt', { appId: param.app_id}).then(function (attempts) {
- return {
- appId: param.app_id,
- attempts: attempts
- };
+ return Ember.RSVP.hash({
+ appId: param.app_id,
+ attempts: this.fetchAttemptListFromRMorATS(param.app_id, this.store)
});
},
unloadAll() {
this.store.unloadAll('yarn-app-attempt');
+ this.store.unloadAll('yarn-timeline-appattempt');
}
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
index 86d845c..98b0cc8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
@@ -17,29 +17,26 @@
*/
import Ember from 'ember';
-
import AbstractRoute from './abstract';
+import AppAttemptMixin from 'yarn-ui/mixins/app-attempt';
-export default AbstractRoute.extend({
+export default AbstractRoute.extend(AppAttemptMixin, {
model(param) {
return Ember.RSVP.hash({
- app: this.store.find('yarn-app', param.app_id),
+ app: this.fetchAppInfoFromRMorATS(param.app_id, this.store),
rmContainers: this.store.find('yarn-app', param.app_id).then(function() {
return this.store.query('yarn-app-attempt', {appId: param.app_id}).then(function (attempts) {
if (attempts && attempts.get('firstObject')) {
var appAttemptId = attempts.get('firstObject').get('appAttemptId');
- var rmContainers = this.store.query('yarn-container',
- {
- app_attempt_id: appAttemptId,
- is_rm: true
- });
- return rmContainers;
+ return this.store.query('yarn-container', {
+ app_attempt_id: appAttemptId
+ });
}
}.bind(this));
}.bind(this)),
- nodes: this.store.findAll('yarn-rm-node'),
+ nodes: this.store.findAll('yarn-rm-node', {reload: true}),
});
},
@@ -48,5 +45,6 @@ export default AbstractRoute.extend({
this.store.unloadAll('yarn-app-attempt');
this.store.unloadAll('yarn-container');
this.store.unloadAll('yarn-rm-node');
+ this.store.unloadAll('yarn-app-timeline');
}
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow-activity.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow-activity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow-activity.js
new file mode 100644
index 0000000..4c1d02e
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow-activity.js
@@ -0,0 +1,37 @@
+/**
+ * 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.
+ */
+
+import AbstractRoute from './abstract';
+import ErrorUtils from 'yarn-ui/utils/error-utils';
+
+export default AbstractRoute.extend({
+ model() {
+ return this.store.findAll('yarn-flow-activity', {reload: true});
+ },
+
+ unloadAll() {
+ this.store.unloadAll('yarn-flow-activity');
+ },
+
+ actions: {
+ error(err/*, transition*/) {
+ var errObj = ErrorUtils.stripErrorCodeAndMessageFromError(err);
+ this.transitionTo('timeline-error', errObj);
+ }
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow.js
new file mode 100644
index 0000000..1da9064
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow.js
@@ -0,0 +1,53 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+import AbstractRoute from './abstract';
+import ErrorUtils from 'yarn-ui/utils/error-utils';
+
+export default AbstractRoute.extend({
+ model(params) {
+ return Ember.RSVP.hash({
+ flowRuns: this.store.query('yarn-flowrun-brief', {flowuid: params.flow_uid}),
+ flowUid: params.flow_uid,
+ lastFlowExecutionInfo: this.getLastFlowExecutionInfo(params.flow_uid)
+ });
+ },
+
+ getLastFlowExecutionInfo(flowUid) {
+ var yarnfaCtrl = this.controllerFor('yarn-flow-activity');
+ var recentFlow = yarnfaCtrl.getLastFlowExecutionInfoByFlowUid(flowUid);
+ if (recentFlow) {
+ return recentFlow;
+ } else {
+ return null;
+ }
+ },
+
+ unloadAll() {
+ this.store.unloadAll('yarn-flowrun-brief');
+ },
+
+ actions: {
+ error(err/*, transition*/) {
+ var errObj = ErrorUtils.stripErrorCodeAndMessageFromError(err);
+ this.transitionTo('timeline-error', errObj);
+ }
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/info.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/info.js
new file mode 100644
index 0000000..8719170
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/info.js
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/runs.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/runs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/runs.js
new file mode 100644
index 0000000..8719170
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/runs.js
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun-metric.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun-metric.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun-metric.js
new file mode 100644
index 0000000..3c54259
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun-metric.js
@@ -0,0 +1,107 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+import ErrorUtils from 'yarn-ui/utils/error-utils';
+
+export default Ember.Route.extend({
+ model: function(params) {
+ var _this = this;
+ var appsArr = [];
+ var flowrun = _this.store.queryRecord('yarn-flowrun', {flowrun_uid: params.flowrun_uid,
+ metricstoretrieve: params.metric_id}).then(function(value) {
+ var apps = _this.store.query('yarn-app-flowrun', {flowrunUid: params.flowrun_uid,
+ metricstoretrieve: params.metric_id}).then(function(value) {
+ for (var i = 0; i < value.content.length; i++) {
+ var tasks = undefined;
+ // No need to fetch task or container info for Job counters.
+ if (params.metric_id.indexOf("JobCounter") === -1) {
+ var entityType = "MAPREDUCE_TASK";
+ // CPU and MEMORY are container metrics.
+ if (params.metric_id === "CPU" || params.metric_id === "MEMORY") {
+ entityType = "YARN_CONTAINER";
+ }
+ tasks = _this.fetchTasksForEntity(value.content[i]._data.uid, params.metric_id, entityType);
+ }
+ appsArr.push(Ember.RSVP.hash({id: value.content[i].id, tasks: tasks , metrics: value.content[i]._data.metrics}));
+ }
+ return Ember.RSVP.all(appsArr);
+ });
+ return Ember.RSVP.hash({run: value, id: value.id, metrics: value._internalModel._data.metrics, apps: apps});
+ });
+ return Ember.RSVP.all([Ember.RSVP.hash({flowrun:flowrun, metricId: params.metric_id})]);
+ },
+
+ fetchTasksForEntity: function(appUid, metricId, entityType) {
+ return this.store.query('yarn-entity', {
+ app_uid: appUid,
+ metricstoretrieve: metricId,
+ entity_type: entityType,
+ metricslimit: 100
+ }).then(function(value) {
+ var tasksArr = [];
+ for (var j = 0; j < value.content.length; j++) {
+ tasksArr.push(Ember.RSVP.hash({id: value.content[j].id, metrics: value.content[j]._data.metrics}));
+ }
+ return Ember.RSVP.all(tasksArr);
+ });
+ },
+
+ getMetricValue: function(metrics) {
+ var metricValue = 0;
+ if (metrics.length > 0) {
+ for (var j in metrics[0].values) {
+ metricValue = metrics[0].values[j];
+ break;
+ }
+ }
+ return metricValue.toString();
+ },
+
+ setupController: function(controller, model) {
+ var metricsArr = [];
+ var flowRunId = model[0].flowrun.id;
+ metricsArr.push([model[0].flowrun.id, this.getMetricValue(model[0].flowrun.metrics)]);
+ for (var i = 0; i < model[0].flowrun.apps.length; i++) {
+ var appId = flowRunId + '-' + model[0].flowrun.apps[i].id;
+ metricsArr.push([appId, this.getMetricValue(model[0].flowrun.apps[i].metrics)]);
+ if (model[0].flowrun.apps[i].tasks) {
+ for (var j = 0; j < model[0].flowrun.apps[i].tasks.length; j++) {
+ var taskId = appId + '-' + model[0].flowrun.apps[i].tasks[j].id;
+ metricsArr.push([taskId, this.getMetricValue(model[0].flowrun.apps[i].tasks[j].metrics)]);
+ }
+ }
+ }
+ controller.set('flowrun', model[0].flowrun);
+ controller.set('metric_id', model[0].metricId);
+ controller.set('arr', metricsArr);
+ },
+
+ unloadAll: function() {
+ this.store.unloadAll('yarn-flowrun');
+ this.store.unloadAll('yarn-app-flowrun');
+ this.store.unloadAll('yarn-entity');
+ },
+
+ actions: {
+ error(err/*, transition*/) {
+ var errObj = ErrorUtils.stripErrorCodeAndMessageFromError(err);
+ this.transitionTo('timeline-error', errObj);
+ }
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun.js
new file mode 100644
index 0000000..3163a67
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun.js
@@ -0,0 +1,58 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+import AbstractRoute from './abstract';
+import ErrorUtils from 'yarn-ui/utils/error-utils';
+
+export default AbstractRoute.extend({
+ model: function(params) {
+ return Ember.RSVP.hash({
+ flowrun: this.store.findRecord('yarn-flowrun', params.flowrun_uid),
+ apps: this.store.query('yarn-app-flowrun', {flowrunUid: params.flowrun_uid}),
+ flowrun_uid: params.flowrun_uid,
+ parentFlowUid: this.getParentFlowUid()
+ });
+ },
+
+ getParentFlowUid: function() {
+ var parentFlowModel = this.modelFor('yarn-flow');
+ if (parentFlowModel) {
+ return parentFlowModel.flowUid;
+ } else {
+ return '';
+ }
+ },
+
+ unloadAll: function() {
+ this.store.unloadAll('yarn-flowrun');
+ this.store.unloadAll('yarn-app-flowrun');
+ },
+
+ actions: {
+ reload: function() {
+ this.modelFor('apps').reload();
+ },
+
+ error(err/*, transition*/) {
+ var errObj = ErrorUtils.stripErrorCodeAndMessageFromError(err);
+ this.transitionTo('timeline-error', errObj);
+ }
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/info.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/info.js
new file mode 100644
index 0000000..8719170
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/info.js
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/metrics.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/metrics.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/metrics.js
new file mode 100644
index 0000000..8719170
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/metrics.js
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-flowrun.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-flowrun.js
new file mode 100644
index 0000000..289c1cd
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-flowrun.js
@@ -0,0 +1,64 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+
+export default DS.JSONAPISerializer.extend({
+
+ normalizeSingleResponse(store, primaryModelClass, payload, id,
+ requestType) {
+ var events = payload.events,
+ appFinishedEvent = events.findBy('id', 'YARN_APPLICATION_FINISHED'),
+ finishedTs = appFinishedEvent? appFinishedEvent.timestamp : Date.now(),
+ appState = (appFinishedEvent && appFinishedEvent.info)? appFinishedEvent.info.YARN_APPLICATION_STATE : "N/A",
+ metrics = payload.metrics,
+ cpuMetric = metrics.findBy('id', 'CPU'),
+ memoryMetric = metrics.findBy('id', 'MEMORY'),
+ cpu = cpuMetric? cpuMetric.values[Object.keys(cpuMetric.values)[0]] : -1,
+ memory = memoryMetric? memoryMetric.values[Object.keys(memoryMetric.values)[0]] : -1;
+
+ var fixedPayload = {
+ id: id,
+ type: primaryModelClass.modelName,
+ attributes: {
+ appId: payload.id,
+ type: payload.info.YARN_APPLICATION_TYPE,
+ uid: payload.info.UID,
+ metrics: metrics,
+ startedTs: payload.createdtime,
+ finishedTs: finishedTs,
+ state: payload.info.YARN_APPLICATION_STATE || appState,
+ cpuVCores: cpu,
+ memoryUsed: memory
+ }
+ };
+
+ return this._super(store, primaryModelClass, fixedPayload, id, requestType);
+ },
+
+ normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+ var normalizedArrayResponse = {};
+
+ normalizedArrayResponse.data = payload.map(singleApp => {
+ return this.normalizeSingleResponse(store, primaryModelClass,
+ singleApp, singleApp.id, requestType);
+ });
+
+ return normalizedArrayResponse;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
new file mode 100644
index 0000000..680fe8c
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
@@ -0,0 +1,76 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+import Converter from 'yarn-ui/utils/converter';
+
+export default DS.JSONAPISerializer.extend({
+ internalNormalizeSingleResponse(store, primaryModelClass, payload, id) {
+
+ var events = payload.events,
+ appFinishedEvent = events.findBy('id', 'YARN_APPLICATION_FINISHED'),
+ startedTime = payload.createdtime,
+ finishedTime = appFinishedEvent? appFinishedEvent.timestamp : Date.now(),
+ elapsedTime = finishedTime - startedTime,
+ diagnostics = payload.info.YARN_APPLICATION_DIAGNOSTICS_INFO,
+ priority = payload.info.YARN_APPLICATION_PRIORITY;
+
+ var fixedPayload = {
+ id: id,
+ type: primaryModelClass.modelName,
+ attributes: {
+ appName: payload.info.YARN_APPLICATION_NAME,
+ user: payload.info.YARN_APPLICATION_USER,
+ queue: "N/A",
+ state: payload.info.YARN_APPLICATION_STATE,
+ startTime: Converter.timeStampToDate(startedTime),
+ elapsedTime: elapsedTime,
+ finishedTime: Converter.timeStampToDate(finishedTime),
+ finalStatus: payload.info.YARN_APPLICATION_FINAL_STATUS,
+ progress: 100,
+ applicationType: payload.info.YARN_APPLICATION_TYPE,
+ diagnostics: (diagnostics && diagnostics !== 'null')? diagnostics : '',
+ amContainerLogs: '',
+ amHostHttpAddress: '',
+ logAggregationStatus: '',
+ unmanagedApplication: payload.info.YARN_APPLICATION_UNMANAGED_APPLICATION || 'N/A',
+ amNodeLabelExpression: payload.configs.YARN_AM_NODE_LABEL_EXPRESSION,
+ priority: (priority !== undefined)? priority : 'N/A',
+ allocatedMB: 0,
+ allocatedVCores: 0,
+ runningContainers: 0,
+ memorySeconds: payload.info.YARN_APPLICATION_MEM_METRIC,
+ vcoreSeconds: payload.info.YARN_APPLICATION_CPU_METRIC,
+ preemptedResourceMB: 0,
+ preemptedResourceVCores: 0,
+ numNonAMContainerPreempted: 0,
+ numAMContainerPreempted: 0,
+ clusterUsagePercentage: 0,
+ queueUsagePercentage: 0,
+ currentAppAttemptId: payload.info.YARN_APPLICATION_LATEST_APP_ATTEMPT
+ }
+ };
+
+ return fixedPayload;
+ },
+
+ normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
+ var p = this.internalNormalizeSingleResponse(store, primaryModelClass, payload, id);
+ return {data: p};
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/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 172286f..1462f5a 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
@@ -43,7 +43,6 @@ export default DS.JSONAPISerializer.extend({
queue: payload.queue,
state: payload.state,
startTime: Converter.timeStampToDate(payload.startedTime),
- //elapsedTime: Converter.msToElapsedTime(payload.elapsedTime),
elapsedTime: payload.elapsedTime,
finishedTime: Converter.timeStampToDate(payload.finishedTime),
finalStatus: payload.finalStatus,
@@ -55,7 +54,7 @@ export default DS.JSONAPISerializer.extend({
logAggregationStatus: payload.logAggregationStatus,
unmanagedApplication: payload.unmanagedApplication || 'N/A',
amNodeLabelExpression: payload.amNodeLabelExpression,
- priority: payload.priority || 'N/A',
+ priority: (payload.priority !== undefined)? payload.priority : 'N/A',
allocatedMB: payload.allocatedMB,
allocatedVCores: payload.allocatedVCores,
runningContainers: payload.runningContainers,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-entity.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-entity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-entity.js
new file mode 100644
index 0000000..9ed70cf
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-entity.js
@@ -0,0 +1,51 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+
+export default DS.JSONAPISerializer.extend({
+
+ normalizeSingleResponse(store, primaryModelClass, payload, id,
+ requestType) {
+ var fixedPayload = {
+ id: id,
+ type: primaryModelClass.modelName, // yarn-entity
+ attributes: {
+ entityId: payload.id,
+ type: payload.type,
+ uid: payload.info.UID,
+ metrics: payload.metrics
+ }
+ };
+
+ return this._super(store, primaryModelClass, fixedPayload, id,
+ requestType);
+ },
+
+ normalizeArrayResponse(store, primaryModelClass, payload, id,
+ requestType) {
+ // return expected is { data: [ {}, {} ] }
+ var normalizedArrayResponse = {};
+
+ normalizedArrayResponse.data = payload.map(singleApp => {
+ return this.normalizeSingleResponse(store, primaryModelClass,
+ singleApp, singleApp.id, requestType);
+ }, this);
+ return normalizedArrayResponse;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flow-activity.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flow-activity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flow-activity.js
new file mode 100644
index 0000000..c26872b
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flow-activity.js
@@ -0,0 +1,54 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+import Converter from 'yarn-ui/utils/converter';
+
+export default DS.JSONAPISerializer.extend({
+
+ normalizeSingleResponse(store, primaryModelClass, payload, id,
+ requestType) {
+ var fixedPayload = {
+ id: id,
+ type: primaryModelClass.modelName, // yarn-timeline-flow
+ attributes: {
+ cluster: payload.info.SYSTEM_INFO_CLUSTER,
+ flowName: payload.info.SYSTEM_INFO_FLOW_NAME,
+ lastExecDate: Converter.timeStampToDateOnly(payload.info.SYSTEM_INFO_DATE),
+ user: payload.info.SYSTEM_INFO_USER,
+ flowruns: payload.flowruns,
+ uid: payload.info.UID
+ }
+ };
+
+ return this._super(store, primaryModelClass, fixedPayload, id,
+ requestType);
+ },
+
+ normalizeArrayResponse(store, primaryModelClass, payload, id,
+ requestType) {
+ // return expected is { data: [ {}, {} ] }
+ var normalizedArrayResponse = {};
+
+ normalizedArrayResponse.data = payload.map(singleEntity => {
+ return this.normalizeSingleResponse(store, primaryModelClass,
+ singleEntity, singleEntity.id, requestType);
+ }, this);
+ return normalizedArrayResponse;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js
new file mode 100644
index 0000000..67603bb
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js
@@ -0,0 +1,64 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+import Converter from 'yarn-ui/utils/converter';
+
+export default DS.JSONAPISerializer.extend({
+
+ normalizeSingleResponse(store, primaryModelClass, payload, id,
+ requestType) {
+ var metrics = payload.metrics,
+ cpuMetric = metrics.findBy('id', 'CPU'),
+ cpu = cpuMetric? cpuMetric.values[Object.keys(cpuMetric.values)[0]] : -1,
+ memMetric = metrics.findBy('id', 'MEMORY'),
+ memory = memMetric? memMetric.values[Object.keys(memMetric.values)[0]] : -1;
+
+ var fixedPayload = {
+ id: id,
+ type: primaryModelClass.modelName, // yarn-flowrun-brief
+ attributes: {
+ flowName: payload.info.SYSTEM_INFO_FLOW_NAME,
+ runid: payload.info.SYSTEM_INFO_FLOW_RUN_ID,
+ shownid: payload.id,
+ type: payload.type,
+ createTime: Converter.timeStampToDate(payload.createdtime),
+ createTimeRaw: payload.createdtime,
+ endTime: Converter.timeStampToDate(payload.info.SYSTEM_INFO_FLOW_RUN_END_TIME),
+ endTimeRaw: payload.info.SYSTEM_INFO_FLOW_RUN_END_TIME || 0,
+ user: payload.info.SYSTEM_INFO_USER,
+ uid: payload.info.UID,
+ cpuVCores: cpu,
+ memoryUsed: memory
+ }
+ };
+
+ return this._super(store, primaryModelClass, fixedPayload, id, requestType);
+ },
+
+ normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+ var normalizedArrayResponse = {data: []};
+
+ normalizedArrayResponse.data = payload.map(singleApp => {
+ return this.normalizeSingleResponse(store, primaryModelClass,
+ singleApp, singleApp.id, requestType);
+ });
+
+ return normalizedArrayResponse;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun.js
new file mode 100644
index 0000000..931d134
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun.js
@@ -0,0 +1,63 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+import Converter from 'yarn-ui/utils/converter';
+
+export default DS.JSONAPISerializer.extend({
+
+ internalNormalizeSingleResponse(store, primaryModelClass, payload, id) {
+ var recordId = id;
+ if (!recordId) {
+ recordId = payload.id;
+ }
+ var fixedPayload = {
+ id: recordId,
+ type: primaryModelClass.modelName,
+ attributes: {
+ flowName: payload.info.SYSTEM_INFO_FLOW_NAME,
+ runid: payload.info.SYSTEM_INFO_FLOW_RUN_ID,
+ shownid: payload.id,
+ type: payload.type,
+ createTime: Converter.timeStampToDate(payload.createdtime),
+ endTime: Converter.timeStampToDate(payload.info.SYSTEM_INFO_FLOW_RUN_END_TIME),
+ user: payload.info.SYSTEM_INFO_USER,
+ metrics: payload.metrics,
+ }
+ };
+
+ return fixedPayload;
+ },
+
+ normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
+ var p = this.internalNormalizeSingleResponse(store,
+ primaryModelClass, payload, id);
+ return { data: p };
+ },
+
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+ // return expected is { data: [ {}, {} ] }
+ var normalizedArrayResponse = {};
+
+ normalizedArrayResponse.data = payload.map(singleApp => {
+ return this.internalNormalizeSingleResponse(store, primaryModelClass,
+ singleApp, singleApp.id);
+ }, this);
+ return normalizedArrayResponse;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
index 766c5c7..4fc1a29 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
@@ -116,30 +116,14 @@ export default DS.JSONAPISerializer.extend({
};
},
- normalizeArrayResponse(store, primaryModelClass, payload, id,
- requestType) {
+ normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
var normalizedArrayResponse = {};
- var result = this.handleQueue(store,
- primaryModelClass,
+ var result = this.handleQueue(store, primaryModelClass,
payload.scheduler.schedulerInfo, "root", requestType);
normalizedArrayResponse.data = result.data;
normalizedArrayResponse.included = result.includedData;
- console.log(normalizedArrayResponse);
-
- return normalizedArrayResponse;
-
- /*
- // return expected is { data: [ {}, {} ] }
- var normalizedArrayResponse = {};
-
- // payload has apps : { app: [ {},{},{} ] }
- // need some error handling for ex apps or app may not be defined.
- normalizedArrayResponse.data = payload.apps.app.map(singleApp => {
- return this.normalizeSingleResponse(store, primaryModelClass, singleApp, singleApp.id, requestType);
- }, this);
return normalizedArrayResponse;
- */
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-appattempt.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-appattempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-appattempt.js
new file mode 100644
index 0000000..0245b20
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-appattempt.js
@@ -0,0 +1,69 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+import Ember from 'ember';
+import Converter from 'yarn-ui/utils/converter';
+
+export default DS.JSONAPISerializer.extend({
+ internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+ var payloadEvents = payload.events,
+ createdEvent = payloadEvents.filterBy('id', 'YARN_APPLICATION_ATTEMPT_REGISTERED')[0],
+ startedTime = createdEvent? createdEvent.timestamp : Date.now(),
+ finishedEvent = payloadEvents.filterBy('id', 'YARN_APPLICATION_ATTEMPT_FINISHED')[0],
+ finishedTime = finishedEvent? finishedEvent.timestamp : Date.now();
+
+ var fixedPayload = {
+ id: payload.id,
+ type: primaryModelClass.modelName,
+ attributes: {
+ startTime: Converter.timeStampToDate(startedTime),
+ startedTime: Converter.timeStampToDate(startedTime),
+ finishedTime: Converter.timeStampToDate(finishedTime),
+ containerId: payload.info.YARN_APPLICATION_ATTEMPT_MASTER_CONTAINER,
+ amContainerId: payload.info.YARN_APPLICATION_ATTEMPT_MASTER_CONTAINER,
+ nodeHttpAddress: '',
+ nodeId: '',
+ hosts: payload.info.YARN_APPLICATION_ATTEMPT_HOST,
+ state: payload.info.YARN_APPLICATION_ATTEMPT_HOST,
+ logsLink: '',
+ appAttemptId: payload.id
+ }
+ };
+ return fixedPayload;
+ },
+
+ normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+ var normalized = this.internalNormalizeSingleResponse(store,
+ primaryModelClass, payload);
+ return {data: normalized};
+ },
+
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+ var normalizedArrayResponse = {
+ data: []
+ };
+ if (payload && Ember.isArray(payload) && !Ember.isEmpty(payload)) {
+ normalizedArrayResponse.data = payload.map(singleAttempt => {
+ return this.internalNormalizeSingleResponse(store, primaryModelClass,
+ singleAttempt);
+ });
+ }
+ return normalizedArrayResponse;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-container.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-container.js
new file mode 100644
index 0000000..f2c60f6
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-container.js
@@ -0,0 +1,71 @@
+/**
+ * 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.
+ */
+
+import DS from 'ember-data';
+import Ember from 'ember';
+import Converter from 'yarn-ui/utils/converter';
+
+export default DS.JSONAPISerializer.extend({
+ internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+ var payloadEvents = payload.events,
+ createdEvent = payloadEvents.filterBy('id', 'YARN_RM_CONTAINER_CREATED')[0],
+ startedTime = createdEvent? createdEvent.timestamp : Date.now(),
+ finishedEvent = payloadEvents.filterBy('id', 'YARN_RM_CONTAINER_FINISHED')[0],
+ finishedTime = finishedEvent? finishedEvent.timestamp : Date.now(),
+ containerExitStatus = finishedEvent? finishedEvent.info.YARN_CONTAINER_EXIT_STATUS : '',
+ containerState = finishedEvent? finishedEvent.info.YARN_CONTAINER_STATE : '';
+
+ var fixedPayload = {
+ id: payload.id,
+ type: primaryModelClass.modelName,
+ attributes: {
+ allocatedMB: payload.info.YARN_CONTAINER_ALLOCATED_MEMORY,
+ allocatedVCores: payload.info.YARN_CONTAINER_ALLOCATED_VCORE,
+ assignedNodeId: payload.info.YARN_CONTAINER_ALLOCATED_HOST,
+ priority: payload.info.YARN_CONTAINER_ALLOCATED_PRIORITY,
+ startedTime: Converter.timeStampToDate(startedTime),
+ finishedTime: Converter.timeStampToDate(finishedTime),
+ nodeHttpAddress: payload.info.YARN_CONTAINER_ALLOCATED_HOST_HTTP_ADDRESS,
+ containerExitStatus: containerExitStatus,
+ containerState: containerState
+ }
+ };
+ return fixedPayload;
+ },
+
+ normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+ var normalized = this.internalNormalizeSingleResponse(store,
+ primaryModelClass, payload);
+ return {
+ data: normalized
+ };
+ },
+
+ normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+ var normalizedArrayResponse = {
+ data: []
+ };
+ if (payload && Ember.isArray(payload) && !Ember.isEmpty(payload)) {
+ normalizedArrayResponse.data = payload.map(singleContainer => {
+ return this.internalNormalizeSingleResponse(store, primaryModelClass,
+ singleContainer);
+ });
+ }
+ return normalizedArrayResponse;
+ }
+});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/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 e3dfcd9..8b8ea56 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
@@ -314,3 +314,86 @@ div.attempt-info-panel table > tbody > tr > td:last-of-type {
overflow: hidden;
text-overflow: ellipsis;
}
+
+#main {
+ float: left;
+ width: 750px;
+}
+
+#sidebar {
+ float: right;
+ width: 100px;
+}
+
+#sequence {
+ width: 600px;
+ height: 70px;
+}
+
+#legend {
+ padding: 10px 0 0 3px;
+}
+
+#sequence text, #legend text {
+ font-weight: 600;
+ fill: #fff;
+}
+
+#chart {
+ position: relative;
+}
+
+#chart path {
+ stroke: #fff;
+}
+
+#explanation {
+ position: absolute;
+ top: 360px;
+ left: 385px;
+ width: 230px;
+ text-align: center;
+ color: #666;
+ z-index: -1;
+}
+
+.simple-bar-chart .axis text {
+ font: 10px sans-serif;
+}
+
+.simple-bar-chart .axis path, .simple-bar-chart .axis line {
+ fill: none;
+ stroke: #000;
+ stroke-width: 1px;
+}
+
+.simple-bar-chart rect {
+ fill: steelblue;
+}
+
+.simple-bar-chart rect:hover {
+ fill: brown;
+ cursor: pointer;
+}
+
+.yarn-flow-runs .chart-panel, .yarn-flow-runinfo .chart-panel {
+ overflow: auto;
+}
+
+.yarn-flow-runs .glyphicon-remove, .yarn-flow-runinfo .glyphicon-remove {
+ cursor: pointer;
+}
+
+.yarn-flow-runs .glyphicon-remove:hover, .yarn-flow-runinfo .glyphicon-remove:hover {
+ color: #c9302c;
+}
+
+.yarn-flow-runs .dropdown-menu .item-text, .yarn-flow-runinfo .dropdown-menu .item-text {
+ width: auto;
+ display: inline-block;
+}
+
+.yarn-flow-runs .dropdown-menu .item-icon, .yarn-flow-runinfo .dropdown-menu .item-icon {
+ width: 14px;
+ display: inline-block;
+}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
index a6d247b..c3154b4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
@@ -56,6 +56,11 @@
<span class="sr-only">(current)</span>
{{/link-to}}
{{/link-to}}
+ {{#link-to 'yarn-flow-activity' tagName="li"}}
+ {{#link-to 'yarn-flow-activity' class="navigation-link"}}Flow Activity
+ <span class="sr-only">(current)</span>
+ {{/link-to}}
+ {{/link-to}}
{{#link-to 'yarn-nodes.table' tagName="li" current-when="yarn-nodes.table yarn-nodes.heatmap"}}
{{#link-to 'yarn-nodes.table' class="navigation-link"}}Nodes
<span class="sr-only">(current)</span>
@@ -73,7 +78,6 @@
<br/>
<br/>
<br/>
-
</div>
<div class="footer">
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/timeline-error.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/timeline-error.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/timeline-error.hbs
new file mode 100644
index 0000000..e33c77c
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/timeline-error.hbs
@@ -0,0 +1,22 @@
+{{!--
+ 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.
+--}}
+
+{{#if model.isValidErrorCode}}
+ <h3 class="text-center text-danger">{{model.errorCode}}: {{model.errorType}}</h3>
+{{/if}}
+<h2 class="text-center text-danger">Timeline server failed with an error</h2>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs
----------------------------------------------------------------------
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 1dbae9a..7579bdc 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
@@ -17,27 +17,39 @@
}}
{{breadcrumb-bar breadcrumbs=breadcrumbs}}
-<br/><br/><br/>
-<div class="container-fluid">
- <div class="row">
- {{#if model.attempt}}
- <div class="container-fluid">
+
+<div class="row container-fluid">
+ <div class="col-md-2">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Application Attempt
+ </div>
+ <div class="panel-body">
+ <ul class="nav nav-pills nav-stacked" id="stacked-menu">
+ <ul class="nav nav-pills nav-stacked collapse in">
+ {{#link-to 'yarn-app-attempt' tagName="li"}}
+ {{#link-to 'yarn-app-attempt' model.attempt.id}}Attempt Info{{/link-to}}
+ {{/link-to}}
+ </ul>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-10">
+ <div class="row container-fluid">
+ {{#if model.attempt}}
<div class="panel panel-default">
<div class="panel-heading">
- Application attempt Information
+ Attempt Information
</div>
{{app-attempt-table attempt=model.attempt}}
</div>
- </div>
- {{/if}}
- </div>
-
- <!-- containers table -->
- <div class="row">
- {{#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}}
+ </div>
+ <div class="row">
+ {{#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}}
+ </div>
</div>
</div>
-
-{{outlet}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempts.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempts.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempts.hbs
index 0af1457..283d78a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempts.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempts.hbs
@@ -24,7 +24,11 @@
<div class="col-md-2 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
- <h4>Application</h4>
+ {{#if service}}
+ Service
+ {{else}}
+ Application
+ {{/if}}
</div>
<div class="panel-body">
<ul class="nav nav-pills nav-stacked" id="stacked-menu">
@@ -44,7 +48,6 @@
</div>
<div class="col-md-10 container-fluid">
- <!-- timeline view of children -->
<div class="row">
{{timeline-view parent-id="attempt-timeline-div" my-id="timeline-view" height="100%" rmModel=model.attempts label="shortAppAttemptId" attemptModel=true serviceName=service}}
</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/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 17ec11e..c1f5352 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
@@ -26,9 +26,9 @@
<div class="panel panel-default">
<div class="panel-heading">
{{#if service}}
- <h4>Service</h4>
+ Service
{{else}}
- <h4>Application</h4>
+ Application
{{/if}}
</div>
<div class="panel-body">
@@ -175,8 +175,8 @@
<thead>
<tr>
<th>Master Container Log</th>
- <td>Master Node</td>
- <td>Master Node Label Expression</td>
+ <th>Master Node</th>
+ <th>Master Node Label Expression</th>
</tr>
</thead>
@@ -215,48 +215,7 @@
{{/if}}
- </div>
-
- <!--
- <div class="row">
- <div class="col-md-12 container-fluid">
- <div class="panel panel-default">
- <div class="panel-heading">
- Application Attempts
- </div>
- <table id="app-attempt-table" class="table table-striped table-bordered" cellspacing="0" width="100%" height="100%">
- <thead>
- <tr>
- <th>Start Time</th>
- <th>Master ContainerId</th>
- <th>Node Http Address</th>
- <th>Node Id</th>
- <th>Logs Link</th>
- </tr>
- </thead>
- <tbody>
- {{#each model.attempts as |attempt|}}
- <tr>
- <td>{{attempt.startTime}}</td>
- <td>{{attempt.containerId}}</td>
- <td><a href={{attempt.nodeHttpAddress}}>{{attempt.nodeHttpAddress}}</a></td>
- <td>{{attempt.nodeId}}</td>
- <td><a href={{attempt.logsLink}}>link</a></td>
- </tr>
- {{/each}}
- </tbody>
- </table>
- </div>
- </div>
- </div>
- -->
-
- <!-- timeline view of children -->
- <!--
- <div class="row">
- {{timeline-view parent-id="attempt-timeline-div" my-id="timeline-view" height="100%" rmModel=model.attempts label="shortAppAttemptId" attemptModel=true}}
- </div>
- -->
+ </div>
</div>
</div>
{{/if}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
index 7aade00..264e6b6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
@@ -24,7 +24,7 @@
<div class="col-md-2 container-fluid">
<div class="panel panel-default">
<div class="panel-heading">
- <h4>Application</h4>
+ <h4>Applications</h4>
</div>
<div class="panel-body">
<ul class="nav nav-pills nav-stacked" id="stacked-menu">
@@ -83,4 +83,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow-activity.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow-activity.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow-activity.hbs
new file mode 100644
index 0000000..c9b682c
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow-activity.hbs
@@ -0,0 +1,45 @@
+{{!--
+ 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.
+--}}
+
+<div class="container-fluid col-md-12">
+ <div class="row">
+ {{breadcrumb-bar breadcrumbs=breadcrumbs}}
+ </div>
+ <div class="row">
+ <div class="col-md-2">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Flow Activity
+ </div>
+ <div class="panel-body">
+ <ul class="nav nav-pills nav-stacked collapse in">
+ {{#link-to 'yarn-flow-activity' tagName="li"}}
+ {{#link-to 'yarn-flow-activity'}}Flow Activities{{/link-to}}
+ {{/link-to}}
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-10">
+ <h3>Recent Flow Activities</h3>
+ {{em-table columns=columns rows=rows definition=tableDefinition}}
+ </div>
+ </div>
+</div>
+
+{{outlet}}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow.hbs
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow.hbs
new file mode 100644
index 0000000..2e98958
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow.hbs
@@ -0,0 +1,49 @@
+{{!--
+ 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.
+--}}
+
+<div class="col-md-12 container-fluid">
+ <div class="row">
+ {{breadcrumb-bar breadcrumbs=breadcrumbs}}
+ </div>
+ <div class="row">
+ <div class="col-md-2">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <div class="panel-title">
+ Flow Information
+ </div>
+ </div>
+ <div class="panel-body">
+ <ul class="nav nav-pills nav-stacked" id="stacked-menu">
+ <ul class="nav nav-pills nav-stacked collapse in">
+ {{#link-to 'yarn-flow.info' tagName="li"}}
+ {{#link-to 'yarn-flow.info' model.flowUid}}Flow Info{{/link-to}}
+ {{/link-to}}
+ {{#link-to 'yarn-flow.runs' tagName="li"}}
+ {{#link-to 'yarn-flow.runs' model.flowUid}}Flow Runs{{/link-to}}
+ {{/link-to}}
+ </ul>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-10">
+ {{outlet}}
+ </div>
+ </div>
+</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org