AMBARI-4115 Allow log4j.properties to be applied via the Ambari UI. (ababiichuk)

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

@@ -1413,6 +1413,7 @@ App.WizardStep8Controller = Em.Controller.extend({
       this.get('serviceConfigTags').pushObject(this.createGlobalSiteObj());
       this.get('serviceConfigTags').pushObject(this.createCoreSiteObj());
       this.get('serviceConfigTags').pushObject(this.createHdfsSiteObj());
+      this.get('serviceConfigTags').pushObject(this.createLog4jObj('HDFS'));
     }
     if (selectedServices.someProperty('serviceName', 'MAPREDUCE')) {
       this.get('serviceConfigTags').pushObject(this.createMrSiteObj());
@@ -1420,9 +1421,11 @@ App.WizardStep8Controller = Em.Controller.extend({
         this.get('serviceConfigTags').pushObject(this.createCapacityScheduler());
         this.get('serviceConfigTags').pushObject(this.createMapredQueueAcls());
       }
+      this.get('serviceConfigTags').pushObject(this.createLog4jObj('MAPREDUCE'));
     }
     if (selectedServices.someProperty('serviceName', 'MAPREDUCE2')) {
       this.get('serviceConfigTags').pushObject(this.createMrSiteObj());
+      this.get('serviceConfigTags').pushObject(this.createLog4jObj('MAPREDUCE2'));
     }
     if (selectedServices.someProperty('serviceName', 'YARN')) {
       this.get('serviceConfigTags').pushObject(this.createYarnSiteObj());
@@ -1430,12 +1433,15 @@ App.WizardStep8Controller = Em.Controller.extend({
     }
     if (selectedServices.someProperty('serviceName', 'HBASE')) {
       this.get('serviceConfigTags').pushObject(this.createHbaseSiteObj());
+      this.get('serviceConfigTags').pushObject(this.createLog4jObj('HBASE'));
     }
     if (selectedServices.someProperty('serviceName', 'OOZIE')) {
       this.get('serviceConfigTags').pushObject(this.createOozieSiteObj('OOZIE'));
+      this.get('serviceConfigTags').pushObject(this.createLog4jObj('OOZIE'));
     }
     if (selectedServices.someProperty('serviceName', 'HIVE')) {
       this.get('serviceConfigTags').pushObject(this.createHiveSiteObj('HIVE'));
+      this.get('serviceConfigTags').pushObject(this.createLog4jObj('HIVE'));
     }
     if (selectedServices.someProperty('serviceName', 'WEBHCAT')) {
       this.get('serviceConfigTags').pushObject(this.createWebHCatSiteObj('WEBHCAT'));
@@ -1443,6 +1449,13 @@ App.WizardStep8Controller = Em.Controller.extend({
     if (selectedServices.someProperty('serviceName', 'HUE')) {
       this.get('serviceConfigTags').pushObject(this.createHueSiteObj('HUE'));
     }
+    if (selectedServices.someProperty('serviceName', 'PIG')) {
+      this.get('serviceConfigTags').pushObject(this.createLog4jObj('PIG'));
+    }
+    if (selectedServices.someProperty('serviceName', 'ZOOKEEPER')) {
+      this.get('serviceConfigTags').pushObject(this.createLog4jObj('ZOOKEEPER'));
+    }
+
     this.applyConfigurationsToCluster();
   },
 
@@ -1593,6 +1606,31 @@ App.WizardStep8Controller = Em.Controller.extend({
     return {"type": "hdfs-site", "tag": "version1", "properties": hdfsProperties };
   },
 
+  createLog4jObj: function (serviceName) {
+    serviceName = serviceName.toLowerCase();
+    var file = '';
+    switch(serviceName) {
+      case 'zookeeper':
+        file = 'zoo';
+        break;
+      case 'mapreduce':
+      case 'mapreduce2':
+        file = 'mapred';
+        break;
+      default:
+        file = serviceName;
+    }
+    var Log4jObj = this.get('configs').filterProperty('filename', serviceName + '-log4j.xml');
+    var Log4jProperties = {};
+    Log4jObj.forEach(function (_configProperty) {
+      Log4jProperties[_configProperty.name] = App.config.escapeXMLCharacters(_configProperty.value);
+      this._recordHostOverrideFromObj(_configProperty, serviceName + '-log4j', 'version1', this);
+      console.log("STEP*: name of the property is: " + _configProperty.name);
+      console.log("STEP8: value of the property is: " + _configProperty.value);
+    }, this);
+    return {"type": serviceName + "-log4j", "tag": "version1", "properties": Log4jProperties };
+  },
+
   createHueSiteObj: function () {
     var hueSiteObj = this.get('configs').filterProperty('filename', 'hue-site.xml');
     var hueProperties = {};

ambari-web/app/data/service_configs.js

@@ -34,9 +34,10 @@ module.exports = [
       App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
       App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
       App.ServiceConfigCategory.create({ name: 'AdvancedCoreSite', displayName : 'Custom core-site.xml', siteFileName: 'core-site.xml', canAddProperty: true}),
-      App.ServiceConfigCategory.create({ name: 'AdvancedHDFSSite', displayName : 'Custom hdfs-site.xml', siteFileName: 'hdfs-site.xml', canAddProperty: true})
+      App.ServiceConfigCategory.create({ name: 'AdvancedHDFSSite', displayName : 'Custom hdfs-site.xml', siteFileName: 'hdfs-site.xml', canAddProperty: true}),
+      App.ServiceConfigCategory.create({ name: 'AdvancedHDFSLog4j', displayName : 'Custom hdfs-log4j.xml', siteFileName: 'hdfs-log4j.xml', canAddProperty: true})
     ],
-    sites: ['global', 'core-site', 'hdfs-site'],
+    sites: ['global', 'core-site', 'hdfs-site', 'hdfs-log4j'],
     configs: []
   },
   {
@@ -59,9 +60,10 @@ module.exports = [
       App.ServiceConfigCategory.create({ name: 'TaskTracker', displayName : 'TaskTracker', hostComponentNames : ['TASKTRACKER']}),
       App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
       App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
-      App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true})
+      App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true}),
+      App.ServiceConfigCategory.create({ name: 'AdvancedMapredLog4j', displayName : 'Custom mapred-log4j.xml', siteFileName: 'mapred-log4j.xml', canAddProperty: true})
     ],
-    sites: ['global', 'mapred-site', 'mapred-queue-acls'],
+    sites: ['global', 'mapred-site', 'mapred-queue-acls', 'mapred-log4j'],
     configs: []
   },
 
@@ -93,9 +95,10 @@ module.exports = [
       App.ServiceConfigCategory.create({ name: 'HistoryServer', displayName : 'History Server', hostComponentNames : ['HISTORYSERVER']}),
       App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
       App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
-      App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true})
+      App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true}),
+      App.ServiceConfigCategory.create({ name: 'AdvancedMapredLog4j', displayName : 'Custom mapred-log4j.xml', siteFileName: 'mapred-log4j.xml', canAddProperty: true})
     ],
-    sites: ['global', 'mapred-site', 'mapred-queue-acls'],
+    sites: ['global', 'mapred-site', 'mapred-queue-acls', 'mapred-log4j'],
     configs: []
   },
 
@@ -106,9 +109,10 @@ module.exports = [
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'Hive Metastore', displayName : 'Hive Metastore'}),
       App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
-      App.ServiceConfigCategory.create({ name: 'AdvancedHiveSite', displayName : 'Custom hive-site.xml', siteFileName: 'hive-site.xml', canAddProperty: true})
+      App.ServiceConfigCategory.create({ name: 'AdvancedHiveSite', displayName : 'Custom hive-site.xml', siteFileName: 'hive-site.xml', canAddProperty: true}),
+      App.ServiceConfigCategory.create({ name: 'AdvancedHiveLog4j', displayName : 'Custom hive-log4j.xml', siteFileName: 'hive-log4j.xml', canAddProperty: true})
     ],
-    sites: ['global', 'hive-site'],
+    sites: ['global', 'hive-site', 'hive-log4j'],
     configs: []
   },
 
@@ -134,9 +138,10 @@ module.exports = [
       App.ServiceConfigCategory.create({ name: 'RegionServer', displayName : 'RegionServer'}),
       App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
       App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
-      App.ServiceConfigCategory.create({ name: 'AdvancedHbaseSite', displayName : 'Custom hbase-site.xml', siteFileName: 'hbase-site.xml', canAddProperty: true})
+      App.ServiceConfigCategory.create({ name: 'AdvancedHbaseSite', displayName : 'Custom hbase-site.xml', siteFileName: 'hbase-site.xml', canAddProperty: true}),
+      App.ServiceConfigCategory.create({ name: 'AdvancedHbaseLog4j', displayName : 'Custom hbase-log4j.xml', siteFileName: 'hbase-log4j.xml', canAddProperty: true})
     ],
-    sites: ['global', 'hbase-site'],
+    sites: ['global', 'hbase-site', 'hbase-log4j'],
     configs: []
   },
 
@@ -145,9 +150,10 @@ module.exports = [
     displayName: 'ZooKeeper',
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'ZooKeeper Server', displayName : 'ZooKeeper Server'}),
-      App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'})
+      App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
+      App.ServiceConfigCategory.create({ name: 'AdvancedZooLog4j', displayName : 'Custom zoo-log4j.xml', siteFileName: 'zoo-log4j.xml', canAddProperty: true})
     ],
-    sites: ['global'],
+    sites: ['global', 'zoo-log4j'],
     configs: []
   },
 
@@ -158,9 +164,10 @@ module.exports = [
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'Oozie Server', displayName : 'Oozie Server'}),
       App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
-      App.ServiceConfigCategory.create({ name: 'AdvancedOozieSite', displayName : 'Custom oozie-site.xml', siteFileName: 'oozie-site.xml', canAddProperty: true})
+      App.ServiceConfigCategory.create({ name: 'AdvancedOozieSite', displayName : 'Custom oozie-site.xml', siteFileName: 'oozie-site.xml', canAddProperty: true}),
+      App.ServiceConfigCategory.create({ name: 'AdvancedOozieLog4j', displayName : 'Custom oozie-log4j.xml', siteFileName: 'oozie-log4j.xml', canAddProperty: true})
     ],
-    sites: ['global', 'oozie-site'],
+    sites: ['global', 'oozie-site', 'oozie-log4j'],
     configs: []
   },