From 8deb8692315cf1957ab268dbfdfadbf3a3c730a4 Mon Sep 17 00:00:00 2001 From: Sunil G Date: Mon, 30 Oct 2017 14:52:10 +0530 Subject: [PATCH] YARN-7331.yarn-native-services --- .../main/webapp/app/adapters/yarn-servicedef.js | 2 +- .../webapp/app/controllers/yarn-app/components.js | 8 ++--- .../controllers/yarn-component-instances/info.js | 2 +- .../app/serializers/yarn-component-instance.js | 2 +- .../app/templates/components/metrics-table.hbs | 37 +++------------------- .../app/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(-) 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 dc5dbfdc2ae..3fb4a818925 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", 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 947cb9808ae..b4bac0d98c7 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); 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 a676b34e6d8..0d1a4bbf801 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) { 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 82eb273cebd..1bd3b2ca1c3 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, 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 6e4e99073b4..17d38cb495b 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 @@
-
{{type}} Metrics: Success Information
+
{{type}} Metrics: Detailed Information
@@ -28,45 +28,18 @@ - - - - - - - - - - - - - - -
Desired Containers Running ContainersCompleted ContainersPending ContainersSurplus Containers
{{metrics.ContainersDesired}}{{metrics.ContainersRunning}}{{metrics.ContainersCompleted}}{{metrics.ContainersPending}}{{metrics.SurplusContainers}}
-
-
-
-
-
-
-
{{type}} Metrics: Failure Information
-
-
- - - + - - + + + - -
Ready Containers Failed ContainersContainers Failed Since Last Threshold Preempted ContainersPending Anti-Affinity Containers
{{metrics.ContainersDesired}}{{metrics.ContainersRunning}}{{metrics.ContainersReady}} {{metrics.ContainersFailed}}{{metrics.FailedSinceLastThreshold}} {{metrics.ContainersPreempted}}{{metrics.PendingAAContainers}}
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 3d5720e8fda..5a94575aa44 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 @@ - + @@ -42,10 +42,6 @@ - - - - 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 a795fc5689b..04577c970fe 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. */ 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 d24e96014f4..792f4427d48 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' }, }; -- 2.13.5 (Apple Git-94)
Component NameComponent Instance {{check-availability model.container.instanceName}}
{{check-availability model.container.state}}
Created Time{{check-availability model.container.createdDate}}
Started Time {{check-availability model.container.startedDate}}