YARN-7331. Change in few metrics in new YARN UI related to native-services. Contributed by Sunil G

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",
 

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);

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) {

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,

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>

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>
@@ -41,10 +41,6 @@
             <td>State</td>
             <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>

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.
      */

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'
     },
 };