YARN-7331. Change in few metrics in new YARN UI related to native-services. 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/a288b0ac Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a288b0ac Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a288b0ac Branch: refs/heads/trunk Commit: a288b0accf8e0df0375cd5ca3aafdbfb142aa8c3 Parents: ba7ed7b Author: Jian He <jia...@apache.org> Authored: Mon Oct 30 13:16:19 2017 -0700 Committer: Jian He <jia...@apache.org> Committed: Mon Nov 6 13:30:20 2017 -0800 ---------------------------------------------------------------------- .../main/webapp/app/adapters/yarn-servicedef.js | 2 +- .../app/controllers/yarn-app/components.js | 8 ++--- .../yarn-component-instances/info.js | 2 +- .../app/serializers/yarn-component-instance.js | 2 +- .../app/templates/components/metrics-table.hbs | 37 +++----------------- .../templates/yarn-component-instance/info.hbs | 6 +--- .../src/main/webapp/config/configs.env | 7 ---- .../src/main/webapp/config/default-config.js | 3 +- 8 files changed, 12 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a288b0ac/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-servicedef.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-servicedef.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-servicedef.js index dc5dbfd..3fb4a81 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-servicedef.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-servicedef.js @@ -20,7 +20,7 @@ import Ember from 'ember'; import RESTAbstractAdapter from './restabstract'; export default RESTAbstractAdapter.extend({ - address: "dashWebAddress", + address: "rmWebAddress", restNameSpace: "dashService", serverName: "DASH", http://git-wip-us.apache.org/repos/asf/hadoop/blob/a288b0ac/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/components.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/components.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/components.js index 947cb98..b4bac0d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/components.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/components.js @@ -30,7 +30,7 @@ export default Ember.Controller.extend({ cols.push({ id: 'name', - headerTitle: 'Component Group', + headerTitle: 'Component', contentPath: 'name', cellComponentName: 'em-table-linked-cell', getCellContent: function(row) { @@ -49,13 +49,9 @@ export default Ember.Controller.extend({ contentPath: 'memory' }, { id: 'instances', - headerTitle: '# Components', + headerTitle: 'Number Of Instances', contentPath: 'instances', observePath: true - }, { - id: 'createdDate', - headerTitle: 'Created Time', - contentPath: 'createdDate' }); return ColumnDef.make(cols); http://git-wip-us.apache.org/repos/asf/hadoop/blob/a288b0ac/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/info.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/info.js index a676b34..0d1a4bb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/info.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/info.js @@ -31,7 +31,7 @@ export default Ember.Controller.extend({ cols.push({ id: 'instanceName', - headerTitle: 'Component Name', + headerTitle: 'Component Instance', contentPath: 'instanceName', cellComponentName: 'em-table-linked-cell', getCellContent: function(row) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/a288b0ac/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-component-instance.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-component-instance.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-component-instance.js index 82eb273..1bd3b2c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-component-instance.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-component-instance.js @@ -28,7 +28,7 @@ export default DS.JSONAPISerializer.extend({ attributes: { containerId: payload.id, component: info.COMPONENT_NAME, - instanceName: info.COMPONENT_NAME + '_' + payload.instanceId, + instanceName: info.COMPONENT_INSTANCE_NAME, state: info.STATE, createdTimestamp: payload.createdtime, startedTimestamp: info.LAUNCH_TIME, http://git-wip-us.apache.org/repos/asf/hadoop/blob/a288b0ac/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/metrics-table.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/metrics-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/metrics-table.hbs index 6e4e990..17d38cb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/metrics-table.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/metrics-table.hbs @@ -20,7 +20,7 @@ <div class="row"> <div class="panel panel-default"> <div class="panel-heading"> - <div class="panel-title">{{type}} Metrics: Success Information</div> + <div class="panel-title">{{type}} Metrics: Detailed Information</div> </div> <div class=""> <table class="table table-hover table-custom-bordered table-custom-stripped table-radius-none table-border-none"> @@ -28,45 +28,18 @@ <tr> <th>Desired Containers</th> <th>Running Containers</th> - <th>Completed Containers</th> - <th>Pending Containers</th> - <th>Surplus Containers</th> - </tr> - </thead> - <tbody> - <tr> - <td>{{metrics.ContainersDesired}}</td> - <td>{{metrics.ContainersRunning}}</td> - <td>{{metrics.ContainersCompleted}}</td> - <td>{{metrics.ContainersPending}}</td> - <td>{{metrics.SurplusContainers}}</td> - </tr> - </tbody> - </table> - </div> - </div> - </div> - <div class="row"> - <div class="panel panel-default"> - <div class="panel-heading"> - <div class="panel-title">{{type}} Metrics: Failure Information</div> - </div> - <div class=""> - <table class="table table-hover table-custom-bordered table-custom-stripped table-radius-none table-border-none"> - <thead> - <tr> + <th>Ready Containers</th> <th>Failed Containers</th> - <th>Containers Failed Since Last Threshold</th> <th>Preempted Containers</th> - <th>Pending Anti-Affinity Containers</th> </tr> </thead> <tbody> <tr> + <td>{{metrics.ContainersDesired}}</td> + <td>{{metrics.ContainersRunning}}</td> + <td>{{metrics.ContainersReady}}</td> <td>{{metrics.ContainersFailed}}</td> - <td>{{metrics.FailedSinceLastThreshold}}</td> <td>{{metrics.ContainersPreempted}}</td> - <td>{{metrics.PendingAAContainers}}</td> </tr> </tbody> </table> http://git-wip-us.apache.org/repos/asf/hadoop/blob/a288b0ac/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance/info.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance/info.hbs index 3d5720e..5a94575 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance/info.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance/info.hbs @@ -26,7 +26,7 @@ <table class="table table-striped table-bordered table-hover"> <tbody> <tr> - <td>Component Name</td> + <td>Component Instance</td> <td>{{check-availability model.container.instanceName}}</td> </tr> <tr> @@ -42,10 +42,6 @@ <td>{{check-availability model.container.state}}</td> </tr> <tr> - <td>Created Time</td> - <td>{{check-availability model.container.createdDate}}</td> - </tr> - <tr> <td>Started Time</td> <td>{{check-availability model.container.startedDate}}</td> </tr> http://git-wip-us.apache.org/repos/asf/hadoop/blob/a288b0ac/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/configs.env ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/configs.env b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/configs.env index a795fc5..04577c9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/configs.env +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/configs.env @@ -40,13 +40,6 @@ ENV = { */ //rmWebAddress: "localhost:8088", - /* - * Dash server web interface can be configured below. - * By default dash web address is set as localhost:9191, uncomment and change - * the following value for pointing to a different address. - */ - //dashWebAddress: "localhost:9191", - /* * Protocol scheme. It can be "http:" or "https:". By default, http is used. */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/a288b0ac/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 d24e960..792f442 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 @@ -21,7 +21,6 @@ module.exports = { // YARN UI App configurations localBaseAddress: "", timelineWebAddress: "localhost:8188", rmWebAddress: "localhost:8088", - dashWebAddress: "localhost:9191", protocolScheme: "http:" }, namespaces: { @@ -30,7 +29,7 @@ module.exports = { // YARN UI App configurations cluster: 'ws/v1/cluster', metrics: 'ws/v1/cluster/metrics', timelineV2: 'ws/v2/timeline', - dashService: 'services/v1/applications', + dashService: 'ws/v1/services', node: '{nodeAddress}/ws/v1/node' }, }; --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
