YARN-5019. [YARN-3368] Change urls in new YARN ui from camel casing to hyphens. (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/e0361839 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e0361839 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e0361839 Branch: refs/heads/YARN-3368 Commit: e03618396226e8c748e7bfbf41a1cfbeff835a21 Parents: 1668183 Author: Wangda Tan <wan...@apache.org> Authored: Mon May 9 11:29:59 2016 -0700 Committer: Wangda Tan <wan...@apache.org> Committed: Sun Oct 30 13:20:14 2016 -0700 ---------------------------------------------------------------------- .../main/webapp/app/components/tree-selector.js | 4 +-- .../main/webapp/app/controllers/application.js | 16 +++++----- .../main/webapp/app/helpers/log-files-comma.js | 2 +- .../src/main/webapp/app/helpers/node-link.js | 2 +- .../src/main/webapp/app/helpers/node-menu.js | 12 ++++---- .../main/webapp/app/models/yarn-app-attempt.js | 2 +- .../src/main/webapp/app/router.js | 32 ++++++++++---------- .../src/main/webapp/app/routes/index.js | 2 +- .../main/webapp/app/routes/yarn-app-attempt.js | 6 ++-- .../src/main/webapp/app/routes/yarn-app.js | 4 +-- .../src/main/webapp/app/routes/yarn-apps.js | 2 +- .../webapp/app/routes/yarn-container-log.js | 2 +- .../src/main/webapp/app/routes/yarn-node-app.js | 2 +- .../main/webapp/app/routes/yarn-node-apps.js | 2 +- .../webapp/app/routes/yarn-node-container.js | 2 +- .../webapp/app/routes/yarn-node-containers.js | 2 +- .../src/main/webapp/app/routes/yarn-node.js | 4 +-- .../src/main/webapp/app/routes/yarn-nodes.js | 2 +- .../src/main/webapp/app/routes/yarn-queue.js | 6 ++-- .../main/webapp/app/routes/yarn-queues/index.js | 2 +- .../app/routes/yarn-queues/queues-selector.js | 2 +- .../app/templates/components/app-table.hbs | 4 +-- .../webapp/app/templates/yarn-container-log.hbs | 2 +- .../main/webapp/app/templates/yarn-node-app.hbs | 4 +-- .../webapp/app/templates/yarn-node-apps.hbs | 4 +-- .../app/templates/yarn-node-container.hbs | 2 +- .../app/templates/yarn-node-containers.hbs | 4 +-- .../src/main/webapp/app/templates/yarn-node.hbs | 2 +- 28 files changed, 66 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 f7ec020..698c253 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 @@ -126,7 +126,7 @@ export default Ember.Component.extend({ .attr("transform", function(d) { return "translate(" + source.y0 + "," + source.x0 + ")"; }) .on("click", function(d,i){ if (d.queueData.get("name") != this.get("selected")) { - document.location.href = "yarnQueue/" + d.queueData.get("name"); + document.location.href = "yarn-queue/" + d.queueData.get("name"); } }.bind(this)); // .on("click", click); @@ -176,7 +176,7 @@ export default Ember.Component.extend({ .attr("r", 20) .attr("href", function(d) { - return "yarnQueues/" + d.queueData.get("name"); + return "yarn-queues/" + d.queueData.get("name"); }) .style("stroke", function(d) { if (d.queueData.get("name") == this.get("selected")) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 3c68365..2effb13 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,25 +29,25 @@ export default Ember.Controller.extend({ outputMainMenu: function(){ var path = this.get('currentPath'); var html = '<li'; - if (path == 'yarnQueue') { + if (path == 'yarn-queue') { html = html + ' class="active"'; } - html = html + '><a href="yarnQueue/root">Queues<span class="sr-only">' + + html = html + '><a href="yarn-queue/root">Queues<span class="sr-only">' + '(current)</span></a></li><li'; - if (path.lastIndexOf('yarnApp', 0) == 0) { + if (path.lastIndexOf('yarn-app', 0) == 0) { html = html + ' class="active"'; } - html = html + '><a href="yarnApps">Applications<span class="sr-only">' + + html = html + '><a href="yarn-apps">Applications<span class="sr-only">' + '(current)</span></a></li><li'; - if (path == 'clusterOverview') { + if (path == 'cluster-overview') { html = html + ' class="active"'; } - html = html + '><a href="clusterOverview">Cluster Overview<span class=' + + html = html + '><a href="cluster-overview">Cluster Overview<span class=' + '"sr-only">(current)</span></a></li><li'; - if (path.lastIndexOf('yarnNode', 0) == 0) { + if (path.lastIndexOf('yarn-node', 0) == 0) { html = html + ' class="active"'; } - html = html + '><a href="yarnNodes">Nodes<span class="sr-only">' + + html = html + '><a href="yarn-nodes">Nodes<span class="sr-only">' + '(current)</span></a></li>'; return Ember.String.htmlSafe(html); }.property('currentPath') http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 8c29b34..b6b57ec 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 @@ -36,7 +36,7 @@ export default Ember.Helper.helper(function(params,hash) { var html = '<td>'; var logFilesCommaSeparated = ""; for (var i = 0; i < logFilesLen; i++) { - html = html + '<a href="yarnContainerLog/' + nodeId + '/' + + html = html + '<a href="yarn-container-log/' + nodeId + '/' + nodeAddr + '/' + containerId + '/' + logFiles[i] + '">' + logFiles[i] + '</a>'; if (i != logFilesLen - 1) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 99d975b..331f082 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 @@ -29,7 +29,7 @@ export default Ember.Helper.helper(function(params,hash) { if (nodeState == "SHUTDOWN" || nodeState == "LOST") { html = html + nodeHTTPAddress; } else { - html = html + '<a href="yarnNode/' + nodeId + "/" + nodeHTTPAddress + '">' + + html = html + '<a href="yarn-node/' + nodeId + "/" + nodeHTTPAddress + '">' + nodeHTTPAddress + '</a>'; } html = html + '</td>'; http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 589111f..2538d7d 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 @@ -47,20 +47,20 @@ 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 == 'yarnNode') { + if (hash.path == 'yarn-node') { html = html + ' class="active"'; } - html = html + '><a href="yarnNode/' + hash.nodeId + '/' + hash.nodeAddr + + html = html + '><a href="yarn-node/' + hash.nodeId + '/' + hash.nodeAddr + '">Node Information</a></li><li'; - if (hash.path == 'yarnNodeApps') { + if (hash.path == 'yarn-node-apps') { html = html + ' class="active"'; } - html = html + '><a href="yarnNodeApps/' + hash.nodeId + '/' + hash.nodeAddr + + html = html + '><a href="yarn-node-apps/' + hash.nodeId + '/' + hash.nodeAddr + '">List of Applications</a></li><li'; - if (hash.path == 'yarnNodeContainers') { + if (hash.path == 'yarn-node-containers') { html = html + ' class="active"'; } - html = html + '><a href="yarnNodeContainers/' +hash.nodeId + '/' + hash.nodeAddr + + html = html + '><a href="yarn-node-containers/' +hash.nodeId + '/' + hash.nodeAddr + '">List of Containers</a></li></ul></ul></div>'; return Ember.String.htmlSafe(html); }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 b699bb3..8079907 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 @@ -57,6 +57,6 @@ export default DS.Model.extend({ }.property(), link: function() { - return "/yarnAppAttempt/" + this.get("id"); + return "/yarn-app-attempt/" + this.get("id"); }.property(), }); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 67e9d2c..8f7ce5f 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 @@ -24,22 +24,22 @@ var Router = Ember.Router.extend({ }); Router.map(function() { - this.route('yarnApps'); - this.route('yarnNodes'); - this.route('yarnNode', { path: '/yarnNode/:node_id/:node_addr' }); - this.route('yarnNodeApps', { path: '/yarnNodeApps/:node_id/:node_addr' }); - this.route('yarnNodeApp', - { path: '/yarnNodeApp/:node_id/:node_addr/:app_id' }); - this.route('yarnNodeContainers', - { path: '/yarnNodeContainers/:node_id/:node_addr' }); - this.route('yarnNodeContainer', - { path: '/yarnNodeContainer/:node_id/:node_addr/:container_id' }); - this.route('yarnContainerLog', { path: - '/yarnContainerLog/:node_id/:node_addr/:container_id/:filename' }); - this.route('yarnQueue', { path: '/yarnQueue/:queue_name' }); - this.route('clusterOverview'); - this.route('yarnApp', { path: '/yarnApp/:app_id' }); - this.route('yarnAppAttempt', { path: '/yarnAppAttempt/:app_attempt_id'}); + this.route('yarn-apps'); + this.route('yarn-nodes'); + this.route('yarn-node', { path: '/yarn-node/:node_id/:node_addr' }); + this.route('yarn-node-apps', { path: '/yarn-node-apps/:node_id/:node_addr' }); + this.route('yarn-node-app', + { path: '/yarn-node-app/:node_id/:node_addr/:app_id' }); + this.route('yarn-node-containers', + { path: '/yarn-node-containers/:node_id/:node_addr' }); + this.route('yarn-node-container', + { 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' }); + this.route('yarn-app-attempt', { path: '/yarn-app-attempt/:app_attempt_id'}); this.route('error'); this.route('notfound', { path: '*:' }); }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/index.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/index.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/index.js index b228ff4..af26670 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/index.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/index.js @@ -23,7 +23,7 @@ export default Ember.Route.extend({ * Redirect root URL to cluster overview page. */ beforeModel: function() { - this.replaceWith('clusterOverview'); + this.replaceWith('cluster-overview'); } }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 72a001c..a65118d 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 @@ -21,15 +21,15 @@ import Ember from 'ember'; export default Ember.Route.extend({ model(param) { return Ember.RSVP.hash({ - attempt: this.store.findRecord('yarnAppAttempt', param.app_attempt_id), + attempt: this.store.findRecord('yarn-app-attempt', param.app_attempt_id), - rmContainers: this.store.query('yarnContainer', + rmContainers: this.store.query('yarn-container', { app_attempt_id: param.app_attempt_id, is_rm: true }), - tsContainers: this.store.query('yarnContainer', + tsContainers: this.store.query('yarn-container', { app_attempt_id: param.app_attempt_id, is_rm: false http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 fcdfad8..f5384b8 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 @@ -21,8 +21,8 @@ import Ember from 'ember'; export default Ember.Route.extend({ model(param) { return Ember.RSVP.hash({ - app: this.store.find('yarnApp', param.app_id), - attempts: this.store.query('yarnAppAttempt', { appId: param.app_id}) + app: this.store.find('yarn-app', param.app_id), + attempts: this.store.query('yarn-app-attempt', { appId: param.app_id}) }); } }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 083f62d..ff49403 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 @@ -20,7 +20,7 @@ import Ember from 'ember'; export default Ember.Route.extend({ model() { - var apps = this.store.findAll('yarnApp'); + var apps = this.store.findAll('yarn-app'); return apps; } }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 c324025..e2c9922 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 @@ -24,7 +24,7 @@ export default Ember.Route.extend({ var id = param.node_addr + Constants.PARAM_SEPARATOR + param.container_id + Constants.PARAM_SEPARATOR + param.filename; return Ember.RSVP.hash({ - containerLog: this.store.findRecord('yarnContainerLog', id), + containerLog: this.store.findRecord('yarn-container-log', id), nodeInfo: { id: param.node_id, addr: param.node_addr } }).then(function(hash) { // Just return as its success. http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 63b1f2a..ed3058a 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 @@ -21,7 +21,7 @@ import Ember from 'ember'; export default Ember.Route.extend({ model(param) { return Ember.RSVP.hash({ - nodeApp: this.store.queryRecord('yarnNodeApp', + nodeApp: this.store.queryRecord('yarn-node-app', { nodeAddr : param.node_addr, appId: param.app_id }), nodeInfo: { id: param.node_id, addr: param.node_addr } }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-apps.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-apps.js index ffb5b7b..4377a0d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-apps.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-apps.js @@ -22,7 +22,7 @@ export default Ember.Route.extend({ model(param) { // Get all apps running on a specific node. Node is contacted by using node_addr. return Ember.RSVP.hash({ - apps: this.store.query('yarnNodeApp', { nodeAddr: param.node_addr }), + apps: this.store.query('yarn-node-app', { nodeAddr: param.node_addr }), nodeInfo: { id: param.node_id, addr: param.node_addr } }); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 2022662..4ee3c66 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 @@ -22,7 +22,7 @@ export default Ember.Route.extend({ model(param) { // Get a specific container running on a specific node. return Ember.RSVP.hash({ - nodeContainer: this.store.queryRecord('yarnNodeContainer', + nodeContainer: this.store.queryRecord('yarn-node-container', { nodeHttpAddr: param.node_addr, containerId: param.container_id }), nodeInfo: { id: param.node_id, addr: param.node_addr } }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-containers.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-containers.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-containers.js index 9a69729..283296e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-containers.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-containers.js @@ -21,7 +21,7 @@ export default Ember.Route.extend({ model(param) { // Get all containers running on specific node. return Ember.RSVP.hash({ - containers: this.store.query('yarnNodeContainer', { nodeHttpAddr: param.node_addr }), + containers: this.store.query('yarn-node-container', { nodeHttpAddr: param.node_addr }), nodeInfo: { id: param.node_id, addr: param.node_addr } }); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 7c58b94..6e57388 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 @@ -22,8 +22,8 @@ export default Ember.Route.extend({ model(param) { // Fetches data from both NM and RM. RM is queried to get node usage info. return Ember.RSVP.hash({ - node: this.store.findRecord('yarnNode', param.node_addr), - rmNode: this.store.findRecord('yarnRmNode', param.node_id) + node: this.store.findRecord('yarn-node', param.node_addr), + rmNode: this.store.findRecord('yarn-rm-node', param.node_id) }); } }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 f33eef8..5c46630 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 @@ -20,6 +20,6 @@ import Ember from 'ember'; export default Ember.Route.extend({ model() { - return this.store.findAll('yarnRmNode'); + return this.store.findAll('yarn-rm-node'); } }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 89858bf..06ceafb 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,15 +22,15 @@ export default Ember.Route.extend({ model(param) { return Ember.RSVP.hash({ selected : param.queue_name, - queues: this.store.findAll('yarnQueue'), + queues: this.store.findAll('yarn-queue'), selectedQueue : undefined, apps: undefined, // apps of selected queue }); }, afterModel(model) { - model.selectedQueue = this.store.peekRecord('yarnQueue', model.selected); - model.apps = this.store.findAll('yarnApp'); + model.selectedQueue = this.store.peekRecord('yarn-queue', model.selected); + model.apps = this.store.findAll('yarn-app'); model.apps.forEach(function(o) { console.log(o); }) http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 7da6f6d..4ab5716 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 @@ -18,6 +18,6 @@ export default Ember.Route.extend({ beforeModel() { - this.transitionTo('yarnQueues.root'); + this.transitionTo('yarn-queues.root'); } }); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 index 3686c83..5d14c6f 100644 --- 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 @@ -20,6 +20,6 @@ import Ember from 'ember'; export default Ember.Route.extend({ model() { - return this.store.findAll('yarnQueue'); + return this.store.findAll('yarn-queue'); }, }); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 fb0fb6f..6e8badc 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 @@ -36,7 +36,7 @@ {{#if arr}} {{#each arr as |app|}} <tr> - <td><a href="yarnApp/{{app.id}}">{{app.id}}</a></td> + <td><a href="yarn-app/{{app.id}}">{{app.id}}</a></td> <td>{{app.appName}}</td> <td>{{app.user}}</td> <td>{{app.queue}}</td> @@ -57,7 +57,7 @@ {{/each}} {{else}} <tr> - <td><a href="yarnApp/{{app.id}}">{{app.id}}</a></td> + <td><a href="yarn-app/{{app.id}}">{{app.id}}</a></td> <td>{{app.appName}}</td> <td>{{app.user}}</td> <td>{{app.queue}}</td> http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-container-log.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-container-log.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-container-log.hbs index 9cc3b0f..e9c3fed 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-container-log.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-container-log.hbs @@ -17,7 +17,7 @@ --}} <div class="col-md-12 container-fluid"> - {{node-menu path="yarnContainerLog" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id}} + {{node-menu path="yarn-container-log" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id}} <div class="col-md-10"> <div class="panel panel-default"> <div class="panel-heading"> http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-app.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-app.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-app.hbs index 4da64b8..dfd6fb5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-app.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-app.hbs @@ -18,7 +18,7 @@ <div class="col-md-12 container-fluid"> <div class="row"> - {{node-menu path="yarnNodeApp" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id}} + {{node-menu path="yarn-node-app" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id}} <div class="col-md-10 container-fluid"> <div class="panel panel-default"> <div class="panel-heading"><b>Application Information</b></div> @@ -48,7 +48,7 @@ <tbody> {{#each model.nodeApp.containers as |container|}} <tr> - <td><a href="yarnNodeContainer/{{model.nodeInfo.id}}/{{model.nodeInfo.addr}}/{{container}}">{{container}}</a></td> + <td><a href="yarn-node-container/{{model.nodeInfo.id}}/{{model.nodeInfo.addr}}/{{container}}">{{container}}</a></td> </tr> {{/each}} </tbody> http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-apps.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-apps.hbs index c195397..d897afc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-apps.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-apps.hbs @@ -18,7 +18,7 @@ <div class="col-md-12 container-fluid"> <div class="row"> - {{node-menu path="yarnNodeApps" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id}} + {{node-menu path="yarn-node-apps" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id}} <div class="col-md-10 container-fluid"> <table id="node-apps-table" class="display table table-striped table-bordered" cellspacing="0" width="100%"> <thead> @@ -35,7 +35,7 @@ <tr><td colspan="3" align="center">No apps found on this node</td></tr> {{else}} <tr> - <td><a href="yarnNodeApp/{{model.nodeInfo.id}}/{{model.nodeInfo.addr}}/{{app.appId}}">{{app.appId}}</a></td> + <td><a href="yarn-node-app/{{model.nodeInfo.id}}/{{model.nodeInfo.addr}}/{{app.appId}}">{{app.appId}}</a></td> <td><span class={{app.appStateStyle}}>{{app.state}}</span></td> <td>{{app.user}}</td> </tr> http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-container.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-container.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-container.hbs index fbbb2fc..8ddbae5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-container.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-container.hbs @@ -18,7 +18,7 @@ <div class="col-md-12 container-fluid"> <div class="row"> - {{node-menu path="yarnNodeContainer" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id}} + {{node-menu path="yarn-node-container" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id}} <div class="col-md-10 container-fluid"> <div class="panel panel-default"> <div class="panel-heading"><b>Container Information</b></div> http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-containers.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-containers.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-containers.hbs index ca80ccd..65a67a8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-containers.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-containers.hbs @@ -18,7 +18,7 @@ <div class="col-md-12 container-fluid"> <div class="row"> - {{node-menu path="yarnNodeContainers" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id}} + {{node-menu path="yarn-node-containers" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id}} <div class="col-md-10 container-fluid"> <table id="node-containers-table" class="display table table-striped table-bordered" cellspacing="0" width="100%"> <thead> @@ -36,7 +36,7 @@ <tr><td colspan="4" align="center">No containers found on this node</td></tr> {{else}} <tr> - <td><a href="yarnNodeContainer/{{model.nodeInfo.id}}/{{model.nodeInfo.addr}}/{{container.containerId}}">{{container.containerId}}</a></td> + <td><a href="yarn-node-container/{{model.nodeInfo.id}}/{{model.nodeInfo.addr}}/{{container.containerId}}">{{container.containerId}}</a></td> <td><span class={{container.containerStateStyle}}>{{container.state}}</span></td> <td>{{container.user}}</td> <td> http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0361839/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 a036076..d92a70a 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 @@ -18,7 +18,7 @@ <div class="col-md-12 container-fluid"> <div class="row"> - {{node-menu path="yarnNode" nodeId=model.rmNode.id nodeAddr=model.node.id}} + {{node-menu path="yarn-node" nodeId=model.rmNode.id nodeAddr=model.node.id}} <div class="col-md-10 container-fluid"> <div class="panel panel-default"> <div class="panel-heading">Node Information</div> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org