AMBARI-2878. UI should show NodeManager and ResourceManager. (xiwang via yusaku)

ambari-web/app/assets/data/alerts/HDP2/alerts.json

@@ -122,7 +122,7 @@
               "service_type" : "GANGLIA"
             },
             {
-              "service_description" : "Ganglia Collector [gmond] process down alert for Node Manager",
+              "service_description" : "Ganglia Collector [gmond] process down alert for NodeManager",
               "host_name" : "dev01.hortonworks.com",
               "current_attempt" : "1",
               "current_state" : "0",
@@ -138,7 +138,7 @@
               "service_type" : "GANGLIA"
             },
             {
-              "service_description" : "Ganglia Collector [gmond] process down alert for Resource Manager",
+              "service_description" : "Ganglia Collector [gmond] process down alert for ResourceManager",
               "host_name" : "dev01.hortonworks.com",
               "current_attempt" : "1",
               "current_state" : "0",
@@ -490,7 +490,7 @@
               "service_type" : "HDFS"
             },
             {
-              "service_description" : "Node Manager process down",
+              "service_description" : "NodeManager process down",
               "host_name" : "dev01.hortonworks.com",
               "current_attempt" : "1",
               "current_state" : "0",
@@ -538,7 +538,7 @@
               "service_type" : "HBASE"
             },
             {
-              "service_description" : "Resource Manager CPU utilization",
+              "service_description" : "ResourceManager CPU utilization",
               "host_name" : "dev01.hortonworks.com",
               "current_attempt" : "1",
               "current_state" : "0",
@@ -554,7 +554,7 @@
               "service_type" : "UNKNOWN"
             },
             {
-              "service_description" : "Resource Manager RPC latency",
+              "service_description" : "ResourceManager RPC latency",
               "host_name" : "dev01.hortonworks.com",
               "current_attempt" : "1",
               "current_state" : "0",
@@ -570,7 +570,7 @@
               "service_type" : "UNKNOWN"
             },
             {
-              "service_description" : "Resource Manager Web UI down",
+              "service_description" : "ResourceManager Web UI down",
               "host_name" : "dev01.hortonworks.com",
               "current_attempt" : "1",
               "current_state" : "0",

ambari-web/app/assets/data/dashboard/HDP2/services.json

@@ -1087,7 +1087,7 @@
                       "service_type" : "GANGLIA"
                     },
                     {
-                      "service_description" : "Ganglia Collector [gmond] process down alert for Node Manager",
+                      "service_description" : "Ganglia Collector [gmond] process down alert for NodeManager",
                       "host_name" : "dev01.ambari.apache.org",
                       "current_attempt" : "1",
                       "current_state" : "0",
@@ -1103,7 +1103,7 @@
                       "service_type" : "GANGLIA"
                     },
                     {
-                      "service_description" : "Ganglia Collector [gmond] process down alert for Resource Manager",
+                      "service_description" : "Ganglia Collector [gmond] process down alert for ResourceManager",
                       "host_name" : "dev01.ambari.apache.org",
                       "current_attempt" : "1",
                       "current_state" : "0",
@@ -1455,7 +1455,7 @@
                       "service_type" : "HDFS"
                     },
                     {
-                      "service_description" : "Node Manager process down",
+                      "service_description" : "NodeManager process down",
                       "host_name" : "dev01.ambari.apache.org",
                       "current_attempt" : "1",
                       "current_state" : "0",
@@ -1503,7 +1503,7 @@
                       "service_type" : "HBASE"
                     },
                     {
-                      "service_description" : "Resource Manager CPU utilization",
+                      "service_description" : "ResourceManager CPU utilization",
                       "host_name" : "dev01.ambari.apache.org",
                       "current_attempt" : "1",
                       "current_state" : "0",
@@ -1519,7 +1519,7 @@
                       "service_type" : "UNKNOWN"
                     },
                     {
-                      "service_description" : "Resource Manager RPC latency",
+                      "service_description" : "ResourceManager RPC latency",
                       "host_name" : "dev01.ambari.apache.org",
                       "current_attempt" : "1",
                       "current_state" : "0",
@@ -1535,7 +1535,7 @@
                       "service_type" : "UNKNOWN"
                     },
                     {
-                      "service_description" : "Resource Manager Web UI down",
+                      "service_description" : "ResourceManager Web UI down",
                       "host_name" : "dev01.ambari.apache.org",
                       "current_attempt" : "1",
                       "current_state" : "0",

ambari-web/app/controllers/wizard/step8_controller.js

@@ -555,10 +555,10 @@ App.WizardStep8Controller = Em.Controller.extend({
   loadYARN: function(mrObj){
     mrObj.get('service_components').forEach(function (_component) {
       switch (_component.get('display_name')) {
-        case 'Node Manager':
+        case 'NodeManager':
           this.loadNMValue(_component);
           break;
-        case 'Resource Manager':
+        case 'ResourceManager':
           _component.set('component_value', this.get('content.masterComponentHosts').findProperty('component', 'RESOURCEMANAGER').hostName);
           break;
         case 'History Server':

ambari-web/app/data/HDP2/config_properties.js

@@ -689,8 +689,8 @@ module.exports =
     {
       "id": "puppet var",
       "name": "rm_host",
-      "displayName": "Resource Manager",
-      "description": "Resource Manager",
+      "displayName": "ResourceManager",
+      "description": "ResourceManager",
       "defaultValue": "",
       "isOverridable": false,
       "displayType": "masterHost",
@@ -703,8 +703,8 @@ module.exports =
     {
       "id": "puppet var",
       "name": "nm_hosts",
-      "displayName": "Node Manager",
-      "description": "List of Node Manager Hosts.",
+      "displayName": "NodeManager",
+      "description": "List of NodeManager Hosts.",
       "defaultValue": "",
       "isOverridable": false,
       "displayType": "slaveHosts",

ambari-web/app/data/HDP2/secure_configs.js

@@ -63,8 +63,8 @@ module.exports = [
     displayName: 'YARN',
     filename: 'yarn-site',
     configCategories: [
-      App.ServiceConfigCategory.create({ name: 'ResourceManager', displayName : 'Resource Manager'}),
-      App.ServiceConfigCategory.create({ name: 'NodeManager', displayName : 'Node Manager'})
+      App.ServiceConfigCategory.create({ name: 'ResourceManager', displayName : 'ResourceManager'}),
+      App.ServiceConfigCategory.create({ name: 'NodeManager', displayName : 'NodeManager'})
       ],
     sites: ['yarn-site'],
     configs: configProperties.filterProperty('serviceName', 'YARN')

ambari-web/app/data/HDP2/secure_properties.js

@@ -439,10 +439,10 @@ module.exports =
     {
       "id": "puppet var",
       "name": "resourcemanager_host",
-      "displayName": "Resource Manager",
+      "displayName": "ResourceManager",
       "value": "",
       "defaultValue": "",
-      "description": "The host that has been assigned to run Resource Manager",
+      "description": "The host that has been assigned to run ResourceManager",
       "displayType": "masterHost",
       "isOverridable": false,
       "isVisible": true,
@@ -455,7 +455,7 @@ module.exports =
       "displayName": "Principal name",
       "value": "",
       "defaultValue": "rs/_HOST",
-      "description": "Principal name for Resource Manager. _HOST will get automatically replaced with actual hostname at an instance of Resource Manager",
+      "description": "Principal name for ResourceManager. _HOST will get automatically replaced with actual hostname at an instance of ResourceManager",
       "displayType": "principal",
       "isVisible": true,
       "isOverridable": false,
@@ -469,7 +469,7 @@ module.exports =
       "displayName": "Path to keytab file",
       "value": "",
       "defaultValue": "/etc/security/keytabs/rs.service.keytab",
-      "description": "Path to Resource Manager keytab file",
+      "description": "Path to ResourceManager keytab file",
       "displayType": "directory",
       "isVisible": true,
       "isOverridable": false,
@@ -480,10 +480,10 @@ module.exports =
     {
       "id": "puppet var",
       "name": "nodemanager_host",
-      "displayName": "Node Manager",
+      "displayName": "NodeManager",
       "value": "",
       "defaultValue": "",
-      "description": "The hosts that has been assigned to run Node Manager",
+      "description": "The hosts that has been assigned to run NodeManager",
       "displayType": "slaveHosts",
       "isOverridable": false,
       "isVisible": true,
@@ -496,7 +496,7 @@ module.exports =
       "displayName": "Principal name",
       "value": "",
       "defaultValue": "nm/_HOST",
-      "description": "Principal name for Node Manager. _HOST will get automatically replaced with actual hostname at all instances of Node Manager",
+      "description": "Principal name for NodeManager. _HOST will get automatically replaced with actual hostname at all instances of NodeManager",
       "displayType": "principal",
       "isVisible": true,
       "isOverridable": false,
@@ -510,7 +510,7 @@ module.exports =
       "displayName": "Path to keytab file",
       "value": "",
       "defaultValue": "/etc/security/keytabs/nm.service.keytab",
-      "description": "Path to Node Manager keytab file",
+      "description": "Path to NodeManager keytab file",
       "displayType": "directory",
       "isVisible": true,
       "isOverridable": false,

ambari-web/app/data/review_configs.js

@@ -89,11 +89,11 @@ module.exports = [
         display_name: 'YARN + MapReduce2',
         service_components: [
           Ember.Object.create({
-            display_name: 'Node Manager',
+            display_name: 'NodeManager',
             component_value: ''
           }),
           Ember.Object.create({
-            display_name: 'Resource Manager',
+            display_name: 'ResourceManager',
             component_value: ''
           }),
           Ember.Object.create({

ambari-web/app/data/service_components.js

@@ -101,7 +101,7 @@ module.exports = new Ember.Set([
   {
     service_name: 'YARN',
     component_name: 'RESOURCEMANAGER',
-    display_name: 'Resource Manager',
+    display_name: 'ResourceManager',
     isMaster: true,
     isClient: false,
     description: ''
@@ -117,7 +117,7 @@ module.exports = new Ember.Set([
   {
     service_name: 'YARN',
     component_name: 'NODEMANAGER',
-    display_name: 'Node Manager',
+    display_name: 'NodeManager',
     isMaster: false,
     isClient: false,
     description: ''

ambari-web/app/data/service_configs.js

@@ -82,8 +82,8 @@ module.exports = [
     displayName: 'YARN',
     filename: 'yarn-site',
     configCategories: [
-      App.ServiceConfigCategory.create({ name: 'ResourceManager', displayName : 'Resource Manager', hostComponentNames : ['RESOURCEMANAGER']}),
-      App.ServiceConfigCategory.create({ name: 'NodeManager', displayName : 'Node Manager', hostComponentNames : ['NODEMANAGER']}),
+      App.ServiceConfigCategory.create({ name: 'ResourceManager', displayName : 'ResourceManager', hostComponentNames : ['RESOURCEMANAGER']}),
+      App.ServiceConfigCategory.create({ name: 'NodeManager', displayName : 'NodeManager', hostComponentNames : ['NODEMANAGER']}),
       App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
       App.ServiceConfigCategory.create({ name: 'CapacityScheduler', displayName : 'Capacity Scheduler', isCapacityScheduler : true, isCustomView: true, siteFileName: 'capacity-scheduler.xml', siteFileNames: ['capacity-scheduler.xml', 'mapred-queue-acls.xml'], canAddProperty: App.supports.capacitySchedulerUi}),
       App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),

ambari-web/app/messages.js

@@ -517,7 +517,7 @@ Em.I18n.translations = {
   'installer.step10.master.secondaryNameNode':'SecondaryNameNode installed on ',
   'installer.step10.master.jobTracker':'JobTracker installed on ',
   'installer.step10.master.historyServer':'History Server installed on ',
-  'installer.step10.master.resourceManager':'Resource Manager installed on ',
+  'installer.step10.master.resourceManager':'ResourceManager installed on ',
   'installer.step10.master.zooKeeper':'ZooKeeper installed on ',
   'installer.step10.master.hbase':'HBase Master installed on ',
   'installer.step10.master.hiveMetastore':'Hive Metastore installed on ',

ambari-web/app/templates/main/dashboard/service/yarn.hbs

@@ -44,7 +44,7 @@
 
     {{view view.dashboardMasterComponentView}}
 
-      <!-- Node Managers -->
+      <!-- NodeManagers -->
       <tr>
         <td>{{t dashboard.services.yarn.nodeManagers}}</td>
         <td>
@@ -71,12 +71,12 @@
           </div>
         </td>
       </tr>
-      <!-- Resource Manager Uptime -->
+      <!-- ResourceManager Uptime -->
       <tr>
         <td>{{t dashboard.services.yarn.resourceManager.uptime}}</td>
         <td>{{view.nodeUptime}}</td>
       </tr>
-      <!-- Resource Manager Heap -->
+      <!-- ResourceManager Heap -->
       <tr>
         <td>{{t dashboard.services.resourceManager.nodes.heap}}</td>
         <td>{{view.nodeHeap}}</td>

ambari-web/app/utils/helper.js

@@ -248,9 +248,9 @@ App.format = {
       case 'HISTORYSERVER':
         return 'History Server';
       case 'NODEMANAGER':
-        return 'Node Manager';
+        return 'NodeManager';
       case 'RESOURCEMANAGER':
-        return 'Resource Manager';
+        return 'ResourceManager';
       case 'TEZ_CLIENT':
         return 'Tez Client';
       case 'MAPREDUCE2_CLIENT':