AMBARI-3004. Categorize YARN properties properly. (atkach via yusaku)

ambari-server/src/main/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml

@@ -74,6 +74,16 @@
       and will get capped to this value.
     </description>
   </property>
+  
+  <property>
+    <name>yarn.acl.enable</name>
+    <value>true</value>
+  </property>
+  
+  <property>
+    <name>yarn.admin.acl</name>
+    <value>*</value>
+  </property>
 
 <!-- NodeManager -->
 

ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/YARN/configuration/yarn-site.xml

@@ -74,6 +74,16 @@
       and will get capped to this value.
     </description>
   </property>
+  
+  <property>
+    <name>yarn.acl.enable</name>
+    <value>true</value>
+  </property>
+  
+  <property>
+    <name>yarn.admin.acl</name>
+    <value>*</value>
+  </property>
 
   <!-- NodeManager -->
 

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

@@ -18,5 +18,124 @@
 module.exports =
 {
   "configProperties": [
+    {
+      "id": "site property",
+      "name": "yarn.acl.enable",
+      "displayName": "yarn.acl.enable",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "ResourceManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.admin.acl",
+      "displayName": "yarn.admin.acl",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "ResourceManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.log-aggregation-enable",
+      "displayName": "yarn.log-aggregation-enable",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "ResourceManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.resourcemanager.scheduler.class",
+      "displayName": "yarn.resourcemanager.scheduler.class",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "CapacityScheduler"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.scheduler.minimum-allocation-mb",
+      "displayName": "yarn.scheduler.minimum-allocation-mb",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "CapacityScheduler"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.scheduler.maximum-allocation-mb",
+      "displayName": "yarn.scheduler.maximum-allocation-mb",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "CapacityScheduler"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.nodemanager.resource.memory-mb",
+      "displayName": "yarn.nodemanager.resource.memory-mb",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "NodeManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.nodemanager.vmem-pmem-ratio",
+      "displayName": "yarn.nodemanager.vmem-pmem-ratio",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "NodeManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.nodemanager.log-dirs",
+      "displayName": "yarn.nodemanager.log-dirs",
+      "value": "",
+      "defaultValue": "",
+      "displayType": "directories",
+      "serviceName": "YARN",
+      "category": "NodeManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.nodemanager.remote-app-log-dir",
+      "displayName": "yarn.nodemanager.remote-app-log-dir",
+      "value": "",
+      "defaultValue": "",
+      "displayType": "directory",
+      "serviceName": "YARN",
+      "category": "NodeManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.nodemanager.remote-app-log-dir-suffix",
+      "displayName": "yarn.nodemanager.remote-app-log-dir-suffix",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "NodeManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.nodemanager.aux-services",
+      "displayName": "yarn.nodemanager.aux-services",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "NodeManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.nodemanager.log.retain-second",
+      "displayName": "yarn.nodemanager.log.retain-second",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "NodeManager"
+    }
   ]
 };

ambari-web/app/data/service_configs.js

@@ -69,10 +69,10 @@ module.exports = [
     displayName: 'YARN',
     filename: 'yarn-site',
     configCategories: [
-      App.ServiceConfigCategory.create({ name: 'ResourceManager', displayName : 'ResourceManager', hostComponentNames : ['RESOURCEMANAGER']}),
-      App.ServiceConfigCategory.create({ name: 'NodeManager', displayName : 'NodeManager', hostComponentNames : ['NODEMANAGER']}),
+      App.ServiceConfigCategory.create({ name: 'ResourceManager', displayName : 'Resource Manager', hostComponentNames : ['RESOURCEMANAGER']}),
+      App.ServiceConfigCategory.create({ name: 'NodeManager', displayName : 'Node Manager', 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: 'CapacityScheduler', displayName : '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'}),
       App.ServiceConfigCategory.create({ name: 'AdvancedYARNSite', displayName : 'Custom yarn-site.xml', siteFileName: 'yarn-site.xml', canAddProperty: true})
     ],

ambari-web/app/utils/config.js

@@ -287,7 +287,10 @@ App.config = Em.Object.create({
       } else if (preDefined && !stored) {
         configData = preDefined;
         if (isAdvanced) {
-          configData.filename = advancedConfigs.findProperty('name', configData.name).filename;
+          var advanced = advancedConfigs.findProperty('name', configData.name);
+          configData.value = advanced.value;
+          configData.defaultValue = advanced.value;
+          configData.filename = advanced.filename;
         }
       }
       mergedConfigs.push(configData);