AMBARI-16676. Consistent logsearch/logfeeder property names (Miklos Gergely via oleewere)

ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/LogFeeder.java

@@ -79,12 +79,12 @@ public class LogFeeder {
 
     // loop the properties and load them
     // Load the configs
-    String configFiles = LogFeederUtil.getStringProperty("config.files");
+    String configFiles = LogFeederUtil.getStringProperty("logfeeder.config.files");
     if (configFiles == null) {
       configFiles = LogFeederUtil.getStringProperty("config.file",
         "config.json");
     }
-    logger.info("config.files=" + configFiles);
+    logger.info("logfeeder.config.files=" + configFiles);
     String[] configFileList = configFiles.split(",");
     for (String configFileName : configFileList) {
       logger.info("Going to load config file:" + configFileName);

ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/LogFeederAMSClient.java

@@ -30,7 +30,7 @@ public class LogFeederAMSClient extends AbstractTimelineMetricsSink {
 
   public LogFeederAMSClient() {
     collectorHosts = LogFeederUtil
-      .getStringProperty("metrics.collector.hosts");
+      .getStringProperty("logfeeder.metrics.collector.hosts");
     if (collectorHosts != null && collectorHosts.trim().length() == 0) {
       collectorHosts = null;
     }

ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/config.json.j2

@@ -928,10 +928,10 @@
 			"is_enabled":"{{solr_service_logs_enable}}",
 			"comment":"Output to solr for service logs",
 			"destination":"solr",
-			"zk_hosts":"{{zookeeper_quorum}}{{solr_znode}}",
-			"collection":"{{solr_collection_service_logs}}",
-			"number_of_shards": "{{logsearch_numshards}}",
-			"splits_interval_mins": "{{service_logs_collection_splits_interval_mins}}",
+			"zk_hosts":"{{zookeeper_quorum}}{{logsearch_solr_znode}}",
+			"collection":"{{logsearch_solr_collection_service_logs}}",
+			"number_of_shards": "{{logsearch_collection_service_logs_numshards}}",
+			"splits_interval_mins": "{{logsearch_service_logs_split_interval_mins}}",
 			"conditions":{
 				"fields":{
 					"rowtype":[
@@ -947,10 +947,10 @@
 			"comment":"Output to solr for audit records",
 			"is_enabled":"{{solr_audit_logs_enable}}",
 			"destination":"solr",
-			"zk_hosts":"{{zookeeper_quorum}}{{solr_znode}}",
-			"collection":"{{solr_collection_audit_logs}}",
-			"number_of_shards": "{{logsearch_numshards}}",
-			"splits_interval_mins": "{{audit_logs_collection_splits_interval_mins}}",
+			"zk_hosts":"{{zookeeper_quorum}}{{logsearch_solr_znode}}",
+			"collection":"{{logsearch_solr_collection_audit_logs}}",
+			"number_of_shards": "{{logsearch_collection_audit_logs_numshards}}",
+			"splits_interval_mins": "{{logsearch_audit_logs_split_interval_mins}}",
 			"conditions":{
 				"fields":{
 					"rowtype":[

ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/logfeeder.properties

@@ -14,12 +14,11 @@
 # limitations under the License.
 
 logfeeder.checkpoint.folder=
-metrics.collector.hosts=
+logfeeder.metrics.collector.hosts=
 
 #filter config
-logfeeder.solr.url=
-logfeeder.solr.zkhosts=
-logfeeder.solr.core.history=history
 logfeeder.log.filter.enable=true
-#Internal to fetch filter config from solr in sec
-logfeeder.solr.config.interval=5
+logfeeder.solr.config.interval=5
+logfeeder.solr.core.history=history
+logfeeder.solr.zkhosts=
+logfeeder.solr.url=

ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/output.config.json.j2

@@ -21,10 +21,10 @@
 			"is_enabled":"{{solr_service_logs_enable}}",
 			"comment":"Output to solr for service logs",
 			"destination":"solr",
-			"zk_hosts":"{{zookeeper_quorum}}{{solr_znode}}",
-			"collection":"{{solr_collection_service_logs}}",
-			"number_of_shards": "{{logsearch_numshards}}",
-			"splits_interval_mins": "{{service_logs_collection_splits_interval_mins}}",
+			"zk_hosts":"{{zookeeper_quorum}}{{logsearch_solr_znode}}",
+			"collection":"{{logsearch_solr_collection_service_logs}}",
+			"number_of_shards": "{{logsearch_collection_service_logs_numshards}}",
+			"splits_interval_mins": "{{logsearch_service_logs_split_interval_mins}}",
 			"conditions":{
 				"fields":{
 					"rowtype":[
@@ -40,10 +40,10 @@
 			"comment":"Output to solr for audit records",
 			"is_enabled":"{{solr_audit_logs_enable}}",
 			"destination":"solr",
-			"zk_hosts":"{{zookeeper_quorum}}{{solr_znode}}",
-			"collection":"{{solr_collection_audit_logs}}",
-			"number_of_shards": "{{logsearch_numshards}}",
-			"splits_interval_mins": "{{audit_logs_collection_splits_interval_mins}}",
+			"zk_hosts":"{{zookeeper_quorum}}{{logsearch_solr_znode}}",
+			"collection":"{{logsearch_solr_collection_audit_logs}}",
+			"number_of_shards": "{{logsearch_collection_audit_logs_numshards}}",
+			"splits_interval_mins": "{{logsearch_audit_logs_split_interval_mins}}",
 			"conditions":{
 				"fields":{
 					"rowtype":[

ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java

@@ -37,18 +37,18 @@ public class AuditSolrDao extends SolrDaoBase {
 
   @PostConstruct
   public void postConstructor() {
-    String solrUrl = PropertiesUtil.getProperty("auditlog.solr.url");
-    String zkHosts = PropertiesUtil.getProperty("auditlog.solr.zkhosts");
+    String solrUrl = PropertiesUtil.getProperty("logsearch.solr.audit.logs.url");
+    String zkHosts = PropertiesUtil.getProperty("logsearch.solr.audit.logs.zkhosts");
     String collection = PropertiesUtil.getProperty(
-      "auditlog.solr.core.logs", "audit_logs");
+      "logsearch.solr.collection.audit.logs", "audit_logs");
     String splitInterval = PropertiesUtil.getProperty(
-      "solr.audit_logs.split_interval_mins", "none");
+      "logsearch.audit.logs.split.interval.mins", "none");
     String configName = PropertiesUtil.getProperty(
-      "solr.audit_logs.config_name", "audit_logs");
+      "logsearch.solr.audit.logs.config.name", "audit_logs");
     int numberOfShards = PropertiesUtil.getIntProperty(
-      "solr.audit_logs.shards", 1);
+      "logsearch.collection.audit.logs.numshards", 1);
     int replicationFactor = PropertiesUtil.getIntProperty(
-      "solr.audit_logs.replication_factor", 1);
+      "logsearch.collection.audit.logs.replication.factor", 1);
 
     try {
       connectToSolr(solrUrl, zkHosts, collection);

ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java

@@ -38,18 +38,18 @@ public class ServiceLogsSolrDao extends SolrDaoBase {
   @PostConstruct
   public void postConstructor() {
     logger.info("postConstructor() called.");
-    String solrUrl = PropertiesUtil.getProperty("solr.url");
-    String zkHosts = PropertiesUtil.getProperty("solr.zkhosts");
-    String collection = PropertiesUtil.getProperty("solr.core.logs",
+    String solrUrl = PropertiesUtil.getProperty("logsearch.solr.url");
+    String zkHosts = PropertiesUtil.getProperty("logsearch.solr.zkhosts");
+    String collection = PropertiesUtil.getProperty("logsearch.solr.collection.service.logs",
       "hadoop_logs");
     String splitInterval = PropertiesUtil.getProperty(
-      "solr.service_logs.split_interval_mins", "none");
+      "logsearch.service.logs.split.interval.mins", "none");
     String configName = PropertiesUtil.getProperty(
-      "solr.service_logs.config_name", "hadoop_logs");
+      "logsearch.solr.service.logs.config.name", "hadoop_logs");
     int numberOfShards = PropertiesUtil.getIntProperty(
-      "solr.service_logs.shards", 1);
+      "logsearch.collection.service.logs.numshards", 1);
     int replicationFactor = PropertiesUtil.getIntProperty(
-      "solr.service_logs.replication_factor", 1);
+      "logsearch.collection.service.logs.replication.factor", 1);
 
     try {
       connectToSolr(solrUrl, zkHosts, collection);

ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java

@@ -38,14 +38,14 @@ public class UserConfigSolrDao extends SolrDaoBase {
   @PostConstruct
   public void postConstructor() {
 
-    String solrUrl = PropertiesUtil.getProperty("solr.url");
-    String zkHosts = PropertiesUtil.getProperty("solr.zkhosts");
-    String collection = PropertiesUtil.getProperty("solr.core.history",
+    String solrUrl = PropertiesUtil.getProperty("logsearch.solr.url");
+    String zkHosts = PropertiesUtil.getProperty("logsearch.solr.zkhosts");
+    String collection = PropertiesUtil.getProperty("logsearch.solr.collection.history",
       "history");
     String configName = PropertiesUtil.getProperty(
-      "solr.history.config_name", "history");
+      "logsearch.solr.history.config.name", "history");
     int replicationFactor = PropertiesUtil.getIntProperty(
-      "solr.history.replication_factor", 2);
+      "logsearch.collection.history.replication.factor", 2);
     String splitInterval = "none";
     int numberOfShards = 1;
 

ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/AuditMgr.java

@@ -458,9 +458,9 @@ public class AuditMgr extends MgrBase {
   }
 
   public String getAuditLogsSchemaFieldsName() {
-    String suffix = PropertiesUtil.getProperty("auditlog.solr.core.logs");
+    String suffix = PropertiesUtil.getProperty("logsearch.solr.collection.audit.logs");
     String excludeArray[] = PropertiesUtil
-        .getPropertyStringList("auditlog.exclude.columnlist");
+        .getPropertyStringList("logsearch.solr.audit.logs.exclude.columnlist");
     List<String> fieldNames = new ArrayList<String>();
     HashMap<String, String> uiFieldColumnMapping = new HashMap<String, String>();
     ConfigUtil.getSchemaFieldsName(suffix, excludeArray, fieldNames);
@@ -482,7 +482,7 @@ public class AuditMgr extends MgrBase {
 
   public String getAnyGraphData(SearchCriteria searchCriteria) {
     searchCriteria.addParam("fieldTime", LogSearchConstants.AUDIT_EVTTIME);
-    String suffix = PropertiesUtil.getProperty("auditlog.solr.core.logs");
+    String suffix = PropertiesUtil.getProperty("logsearch.solr.collection.audit.logs");
     searchCriteria.addParam("suffix", suffix);
     SolrQuery solrQuery = queryGenerator.commonAuditFilterQuery(searchCriteria);
     VBarDataList result = graphDataGenerator.getAnyGraphData(searchCriteria,

ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/LogsMgr.java

@@ -1661,7 +1661,7 @@ public class LogsMgr extends MgrBase {
 
   public String getServiceLogsFieldsName() {
     String fieldsNameStrArry[] = PropertiesUtil
-      .getPropertyStringList("solr.servicelogs.fields");
+      .getPropertyStringList("logsearch.service.logs.fields");
     if (fieldsNameStrArry.length > 0) {
 
       List<String> uiFieldNames = new ArrayList<String>();
@@ -1687,9 +1687,9 @@ public class LogsMgr extends MgrBase {
   public String getServiceLogsSchemaFieldsName() {
 
     List<String> fieldNames = new ArrayList<String>();
-    String suffix = PropertiesUtil.getProperty("solr.core.logs");
+    String suffix = PropertiesUtil.getProperty("logsearch.solr.collection.service.logs");
     String excludeArray[] = PropertiesUtil
-        .getPropertyStringList("servicelogs.exclude.columnlist");
+        .getPropertyStringList("logsearch.solr.service.logs.exclude.columnlist");
 
     HashMap<String, String> uiFieldColumnMapping = new LinkedHashMap<String, String>();
     ConfigUtil.getSchemaFieldsName(suffix, excludeArray, fieldNames);
@@ -1756,7 +1756,7 @@ public class LogsMgr extends MgrBase {
 
   public String getAnyGraphData(SearchCriteria searchCriteria) {
     searchCriteria.addParam("fieldTime", LogSearchConstants.LOGTIME);
-    String suffix = PropertiesUtil.getProperty("solr.core.logs");
+    String suffix = PropertiesUtil.getProperty("logsearch.solr.collection.service.logs");
     searchCriteria.addParam("suffix", suffix);
     SolrQuery solrQuery = queryGenerator.commonServiceFilterQuery(searchCriteria);
     VBarDataList result = graphDataGenerator.getAnyGraphData(searchCriteria,

ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/UserConfigMgr.java

@@ -277,7 +277,7 @@ public class UserConfigMgr extends MgrBase {
 
       } else {
         String logfeederDefaultLevels = PropertiesUtil
-            .getProperty("logfeeder.include.default.level", DEFAULT_LEVELS);
+            .getProperty("logsearch.logfeeder.include.default.level", DEFAULT_LEVELS);
         JSONArray levelJsonArray = new JSONArray();
         try {
           String levelArray[] = logfeederDefaultLevels.split(",");

ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/QueryGeneration.java

@@ -341,11 +341,11 @@ public class QueryGeneration extends QueryGenerationBase {
     switch (logType) {
     case AUDIT:
       String auditSuffix = PropertiesUtil
-          .getProperty("auditlog.solr.core.logs");
+          .getProperty("logsearch.solr.collection.audit.logs");
       type = ConfigUtil.schemaFieldsName.get(key + auditSuffix);
       break;
     case SERVICE:
-      String serviceLogs = PropertiesUtil.getProperty("solr.core.logs");
+      String serviceLogs = PropertiesUtil.getProperty("logsearch.solr.collection.service.logs");
       type = ConfigUtil.schemaFieldsName.get(key + serviceLogs);
       break;
     default:

ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/solr/metrics/SolrMetricsLoader.java

@@ -172,15 +172,15 @@ public class SolrMetricsLoader extends TimerTask {
 
   public static void startSolrMetricsLoaderTasks() {
     try {
-      String collectorHosts = PropertiesUtil.getProperty("metrics.collector.hosts");
+      String collectorHosts = PropertiesUtil.getProperty("logsearch.solr.metrics.collector.hosts");
       if (StringUtils.isEmpty(collectorHosts)) {
         LOG.warn("No Ambari Metrics service is available, no Solr metrics will be loaded!");
         return;
       }
 
-      int solrJmxPort = PropertiesUtil.getIntProperty("solr.jmx.port");
+      int solrJmxPort = PropertiesUtil.getIntProperty("logsearch.solr.jmx.port");
 
-      String zkHosts = PropertiesUtil.getProperty("solr.zkhosts");
+      String zkHosts = PropertiesUtil.getProperty("logsearch.solr.zkhosts");
       AmbariSolrCloudClient ambariSolrCloudClient = new AmbariSolrCloudClientBuilder()
           .withZookeeperHosts(zkHosts)
           .build();

ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/util/ConfigUtil.java

@@ -102,9 +102,9 @@ public class ConfigUtil {
 
   private static void initializeColumnMapping() {
     String serviceLogsColumnMappingArray[] = PropertiesUtil
-      .getPropertyStringList("servicelog.column.mapping");
+      .getPropertyStringList("logsearch.solr.service.logs.column.mapping");
     String auditLogsColumnMappingArray[] = PropertiesUtil
-      .getPropertyStringList("auditlog.column.mapping");
+      .getPropertyStringList("logsearch.solr.audit.logs.column.mapping");
 
     // Initializing column mapping for Service Logs
     intializeUISolrColumnMapping(serviceLogsColumnMappingArray,

ambari-logsearch/ambari-logsearch-portal/src/main/resources/default.properties

@@ -14,13 +14,13 @@
 # limitations under the License.
 
 #Service Logs Field Names
-solr.servicelogs.fields=logtime,level,event_count,ip,type,path,file,line_number,host,log_message,method,id
+logsearch.service.logs.fields=logtime,level,event_count,ip,type,path,file,line_number,host,log_message,method,id
 
 #Exclude Column List for Service Logs
-servicelogs.exclude.columnlist=tags,text,message,seq_num
+logsearch.solr.service.logs.exclude.columnlist=tags,text,message,seq_num
 
 #Exclude Column List for Ranger Audits
-auditlog.exclude.columnlist=tags,tags_str
+logsearch.solr.audit.logs.exclude.columnlist=tags,tags_str
 
 #Value Mapping for Audit Fields
 #Example FieldName=ValueOfUI:ValueOfSolr
@@ -29,10 +29,10 @@ result=Allowed:1,Denied:0
 #Column Mapping
 #Example  CoulumnInSolr:ColumnInUI
 #For Service Logs
-servicelog.column.mapping=bundle_id:Bundle Id,thread_name:Thread,log_emessage:message
+logsearch.solr.service.logs.column.mapping=bundle_id:Bundle Id,thread_name:Thread,log_emessage:message
 
 #For Audit Logs
-auditlog.column.mapping=access:Access Type,reqUser:User,enforcer:Access Enfocer,ip:Client IP
+logsearch.solr.audit.logs.column.mapping=access:Access Type,reqUser:User,enforcer:Access Enfocer,ip:Client IP
 
 #login method
 #Note: Simple will be supported only if both file and ldap is disabled.

ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties

@@ -13,29 +13,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#solr.url=http://host:port/solr
-solr.url=
+#logsearch.solr.url=http://host:port/solr
+logsearch.solr.url=
 
 #Solr Core
-solr.core.logs=hadoop_logs
-#solr.core.logs=ranger_audits
-solr.core.history=history
-solr.service_logs.split_interval_mins=none
-solr.service_logs.shards=1
-solr.service_logs.replication_factor=1
+logsearch.solr.collection.service.logs=hadoop_logs
+#logsearch.solr.collection.service.logs=ranger_audits
+logsearch.solr.collection.history=history
+logsearch.service.logs.split.interval.mins=none
+logsearch.collection.service.logs.numshards=1
+logsearch.collection.service.logs.replication.factor=1
 	
 #If set, metrics will be sent to Ambari
-#metrics.collector.hosts=example.com
-metrics.collector.hosts=
-auditlog.solr.url=
-#auditlog.solr.core.logs=collection_name
-auditlog.solr.core.logs=ranger_audits
-solr.audit_logs.split_interval_mins=none
-solr.audit_logs.shards=1
-solr.audit_logs.replication_factor=1
+#logsearch.solr.metrics.collector.hosts=example.com
+logsearch.solr.metrics.collector.hosts=
+logsearch.solr.audit.logs.url=
+#logsearch.solr.collection.audit.logs=collection_name
+logsearch.solr.collection.audit.logs=ranger_audits
+logsearch.audit.logs.split.interval.mins=none
+logsearch.collection.audit.logs.numshards=1
+logsearch.collection.audit.logs.replication.factor=1
 
 #Logfeeder Settings
-logfeeder.include.default.level=fatal,error,warn
+logsearch.logfeeder.include.default.level=fatal,error,warn
 
 #Authentication settings
 #Note: Simple will be supported only if file ,ldap and external_auth all three are disabled.

ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties.j2

@@ -13,23 +13,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-solr.zkhosts={{zookeeper_quorum}}{{logsearch_solr_znode}}
-solr.core.logs={{logsearch_collection_service_logs}}
+logsearch.solr.zkhosts={{zookeeper_quorum}}{{logsearch_solr_znode}}
+logsearch.solr.collection.service.logs={{logsearch_solr_collection_service_logs}}
 
-solr.service_logs.split_interval_mins={{service_logs_collection_splits_interval_mins}}
-solr.service_logs.shards={{logsearch_numshards}}
-solr.service_logs.replication_factor={{logsearch_repfactor}}
+logsearch.service.logs.split.interval.mins={{logsearch_service_logs_split_interval_mins}}
+logsearch.collection.service.logs.numshards={{logsearch_collection_service_logs_numshards}}
+logsearch.collection.service.logs.replication.factor={{logsearch_collection_service_logs_replication_factor}}
 
-solr.core.history={{solr_collection_history}}
+logsearch.solr.collection.history={{logsearch_solr_collection_history}}
 
 #Audit logs
-auditlog.solr.zkhosts={{solr_audit_logs_zk_quorum}}{{solr_audit_logs_zk_node}}
-auditlog.solr.core.logs={{logsearch_solr_collection_audit_logs}}
-auditlog.solr.url={{solr_audit_logs_url}}
+logsearch.solr.audit.logs.zkhosts={{logsearch_solr_audit_logs_zk_quorum}}{{logsearch_solr_audit_logs_zk_node}}
+logsearch.solr.collection.audit.logs={{logsearch_solr_collection_audit_logs}}
+logsearch.solr.audit.logs.url={{logsearch_solr_audit_logs_url}}
 
-solr.audit_logs.split_interval_mins={{audit_logs_collection_splits_interval_mins}}
-solr.audit_logs.shards={{logsearch_numshards}}
-solr.audit_logs.replication_factor={{logsearch_repfactor}}
+logsearch.audit.logs.split.interval.mins={{logsearch_audit_logs_split_interval_mins}}
+logsearch.collection.audit.logs.numshards={{logsearch_collection_audit_logs_numshards}}
+logsearch.collection.audit.logs.replication.factor={{logsearch_collection_audit_logs_replication_factor}}
 
 #Authentication settings
 #Note: Simple will be supported only if both file and ldap is disabled.

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py

@@ -103,8 +103,8 @@ logsearch_solr_jmx_port = config['configurations']['logsearch-solr-env']['logsea
 
 logsearch_service_logs_fields = config['configurations']['logsearch-properties']['logsearch.service.logs.fields']
 
-audit_logs_collection_splits_interval_mins = config['configurations']['logsearch-properties']['logsearch.audit.logs.split.interval.mins']
-service_logs_collection_splits_interval_mins = config['configurations']['logsearch-properties']['logsearch.service.logs.split.interval.mins']
+logsearch_audit_logs_split_interval_mins = config['configurations']['logsearch-properties']['logsearch.audit.logs.split.interval.mins']
+logsearch_service_logs_split_interval_mins = config['configurations']['logsearch-properties']['logsearch.service.logs.split.interval.mins']
 
 zookeeper_port = default('/configurations/zoo.cfg/clientPort', None)
 # get comma separated list of zookeeper hosts from clusterHostInfo
@@ -141,57 +141,60 @@ solr_client_log4j_content = config['configurations']['logsearch-solr-client-log4
 #####################################
 logsearch_dir = '/usr/lib/ambari-logsearch-portal'
 
-logsearch_service_numshards_config = config['configurations']['logsearch-properties']['logsearch.collection.service.logs.numshards']
-logsearch_audit_numshards_config = config['configurations']['logsearch-properties']['logsearch.collection.audit.logs.numshards']
+logsearch_collection_service_logs_numshards_config = config['configurations']['logsearch-properties']['logsearch.collection.service.logs.numshards']
+logsearch_collection_audit_logs_numshards_config = config['configurations']['logsearch-properties']['logsearch.collection.audit.logs.numshards']
 
-if logsearch_service_numshards_config > 0:
-  logsearch_service_logs_numshards = str(logsearch_service_numshards_config)
+if logsearch_collection_service_logs_numshards_config > 0:
+  logsearch_collection_service_logs_numshards = str(logsearch_collection_service_logs_numshards_config)
 else:
-  logsearch_service_logs_numshards = format(str(logsearch_solr_instance_count))
+  logsearch_collection_service_logs_numshards = format(str(logsearch_solr_instance_count))
 
-if logsearch_audit_numshards_config > 0:
-  logsearch_audit_logs_numshards = str(logsearch_audit_numshards_config)
+if logsearch_collection_audit_logs_numshards_config > 0:
+  logsearch_collection_audit_logs_numshards = str(logsearch_collection_audit_logs_numshards_config)
 else:
-  logsearch_audit_logs_numshards = format(str(logsearch_audit_numshards_config))
+  logsearch_collection_audit_logs_numshards = format(str(logsearch_solr_instance_count))
 
-logsearch_service_logs_repfactor = str(config['configurations']['logsearch-properties']['logsearch.collection.service.logs.replication.factor'])
-logsearch_audit_logs_repfactor = str(config['configurations']['logsearch-properties']['logsearch.collection.audit.logs.replication.factor'])
+logsearch_collection_service_logs_replication_factor = str(config['configurations']['logsearch-properties']['logsearch.collection.service.logs.replication.factor'])
+logsearch_collection_audit_logs_replication_factor = str(config['configurations']['logsearch-properties']['logsearch.collection.audit.logs.replication.factor'])
 
 logsearch_solr_collection_service_logs = default('/configurations/logsearch-properties/logsearch.solr.collection.service.logs', 'hadoop_logs')
 logsearch_solr_collection_audit_logs = default('/configurations/logsearch-properties/logsearch.solr.collection.audit.logs','audit_logs')
-logsearch_logfeeder_log_level_include = default('/configurations/logsearch-properties/logsearch.logfeeder.include.default.level', 'fatal,error,warn')
+logsearch_logfeeder_include_default_level = default('/configurations/logsearch-properties/logsearch.logfeeder.include.default.level', 'fatal,error,warn')
 
-solr_audit_logs_use_ranger = default('/configurations/logsearch-env/logsearch_solr_audit_logs_use_ranger', False)
-solr_audit_logs_url = ''
+logsearch_solr_audit_logs_use_ranger = default('/configurations/logsearch-env/logsearch_solr_audit_logs_use_ranger', False)
+logsearch_solr_audit_logs_url = ''
 
-if solr_audit_logs_use_ranger:
+if logsearch_solr_audit_logs_use_ranger:
   # In Ranger, this contain the /zkNode also
   ranger_audit_solr_zookeepers = default('/configurations/ranger-admin-site/ranger.audit.solr.zookeepers', None)
   # TODO: ranger property already has zk node appended. We need to remove it.
   # For now, let's assume it is going to be URL
-  solr_audit_logs_url = default('/configurations/ranger-admin-site/ranger.audit.solr.urls', solr_audit_logs_url)
+  logsearch_solr_audit_logs_url = default('/configurations/ranger-admin-site/ranger.audit.solr.urls', solr_audit_logs_url)
 else:
-  solr_audit_logs_zk_node = default('/configurations/logsearch-env/logsearch_solr_audit_logs_zk_node', None)
-  solr_audit_logs_zk_quorum = default('/configurations/logsearch-env/logsearch_solr_audit_logs_zk_quorum', None)
+  logsearch_solr_audit_logs_zk_node = default('/configurations/logsearch-env/logsearch_solr_audit_logs_zk_node', None)
+  logsearch_solr_audit_logs_zk_quorum = default('/configurations/logsearch-env/logsearch_solr_audit_logs_zk_quorum', None)
 
-  if not (solr_audit_logs_zk_quorum):
-    solr_audit_logs_zk_quorum = zookeeper_quorum
-  if not (solr_audit_logs_zk_node):
-    solr_audit_logs_zk_node = logsearch_solr_znode
+  if not (logsearch_solr_audit_logs_zk_quorum):
+    logsearch_solr_audit_logs_zk_quorum = zookeeper_quorum
+  if not (logsearch_solr_audit_logs_zk_node):
+    logsearch_solr_audit_logs_zk_node = logsearch_solr_znode
 
-  solr_audit_logs_zk_node = format(solr_audit_logs_zk_node)
-  solr_audit_logs_zk_quorum = format(solr_audit_logs_zk_quorum)
+  logsearch_solr_audit_logs_zk_node = format(logsearch_solr_audit_logs_zk_node)
+  logsearch_solr_audit_logs_zk_quorum = format(logsearch_solr_audit_logs_zk_quorum)
 
 # create custom properties - remove defaults
 logsearch_custom_properties = dict(config['configurations']['logsearch-properties'])
-logsearch_custom_properties.pop("logsearch.collection.numshards", None)
-logsearch_custom_properties.pop("logsearch.collection.replication.factor", None)
-logsearch_custom_properties.pop("logsearch.solr.collection.service.logs", None)
-logsearch_custom_properties.pop("logsearch.solr.collection.audit.logs", None)
 logsearch_custom_properties.pop("logsearch.service.logs.fields", None)
-logsearch_custom_properties.pop("logsearch.service.logs.split.interval.mins", None)
 logsearch_custom_properties.pop("logsearch.audit.logs.split.interval.mins", None)
+logsearch_custom_properties.pop("logsearch.collection.service.logs.replication.factor", None)
+logsearch_custom_properties.pop("logsearch.solr.collection.service.logs", None)
+logsearch_custom_properties.pop("logsearch.solr.metrics.collector.hosts", None)
+logsearch_custom_properties.pop("logsearch.solr.collection.audit.logs", None)
 logsearch_custom_properties.pop("logsearch.logfeeder.include.default.level", None)
+logsearch_custom_properties.pop("logsearch.collection.audit.logs.replication.factor", None)
+logsearch_custom_properties.pop("logsearch.collection.service.logs.numshards", None)
+logsearch_custom_properties.pop("logsearch.service.logs.split.interval.mins", None)
+logsearch_custom_properties.pop("logsearch.collection.audit.logs.numshards", None)
 
 # logsearch-env configs
 logsearch_user = config['configurations']['logsearch-env']['logsearch_user']

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-ambari.json.j2

@@ -185,7 +185,7 @@
       "post_map_values":{
         "logtime":{
           "map_date":{
-            "date_pattern":"yyyy-MM-dd HH:mm:ss,SSS"
+            "date_pattern":"yyyy-MM-dd HH:mm:ss.SSS"
           }
 
         },
@@ -242,7 +242,7 @@
       "post_map_values":{
         "logtime":{
           "map_date":{
-            "date_pattern":"yyyy-MM-dd'T'HH:mm:ss,SSSZ"
+            "date_pattern":"yyyy-MM-dd'T'HH:mm:ss.SSSZ"
           }
 
         }

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 logfeeder.checkpoint.folder={{logfeeder_checkpoint_folder}}
-metrics.collector.hosts={{logfeeder_metrics_collector_hosts}}
-config.files={{logfeeder_config_files}}
+logfeeder.metrics.collector.hosts={{logfeeder_metrics_collector_hosts}}
+logfeeder.config.files={{logfeeder_config_files}}
 logfeeder.log.filter.enable={{logfeeder_log_filter_enable}}
 logfeeder.solr.config.interval={{logfeeder_solr_config_interval}}
 logfeeder.solr.core.history=history

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logsearch.properties.j2

@@ -13,39 +13,38 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#solr.url=http://solr_host:{{logsearch_solr_port}}/solr
-solr.zkhosts={{zookeeper_quorum}}{{logsearch_solr_znode}}
+logsearch.solr.zkhosts={{zookeeper_quorum}}{{logsearch_solr_znode}}
 
 # Service Logs
-solr.core.logs={{logsearch_solr_collection_service_logs}}
+logsearch.solr.collection.service.logs={{logsearch_solr_collection_service_logs}}
 
-solr.service_logs.split_interval_mins={{service_logs_collection_splits_interval_mins}}
-solr.service_logs.shards={{logsearch_service_logs_numshards}}
-solr.service_logs.replication_factor={{logsearch_service_logs_repfactor}}
+logsearch.service.logs.split.interval.mins={{logsearch_service_logs_split_interval_mins}}
+logsearch.collection.service.logs.numshards={{logsearch_collection_service_logs_numshards}}
+logsearch.collection.service.logs.replication.factor={{logsearch_collection_service_logs_replication_factor}}
 
-solr.servicelogs.fields={{logsearch_service_logs_fields}}
+logsearch.service.logs.fields={{logsearch_service_logs_fields}}
 
 # Audit logs
-auditlog.solr.zkhosts={{solr_audit_logs_zk_quorum}}{{solr_audit_logs_zk_node}}
-auditlog.solr.core.logs={{logsearch_solr_collection_audit_logs}}
-auditlog.solr.url={{solr_audit_logs_url}}
+logsearch.solr.audit.logs.zkhosts={{logsearch_solr_audit_logs_zk_quorum}}{{logsearch_solr_audit_logs_zk_node}}
+logsearch.solr.collection.audit.logs={{logsearch_solr_collection_audit_logs}}
+logsearch.solr.audit.logs.url={{logsearch_solr_audit_logs_url}}
 
-solr.audit_logs.split_interval_mins={{audit_logs_collection_splits_interval_mins}}
-solr.audit_logs.shards={{logsearch_audit_logs_numshards}}
-solr.audit_logs.replication_factor={{logsearch_audit_logs_repfactor}}
+logsearch.audit.logs.split.interval.mins={{logsearch_audit_logs_split_interval_mins}}
+logsearch.collection.audit.logs.numshards={{logsearch_collection_audit_logs_numshards}}
+logsearch.collection.audit.logs.replication.factor={{logsearch_collection_audit_logs_replication_factor}}
 
 # History logs
-solr.core.history=history
-solr.history.config_name=history
-solr.history.replication_factor=1
+logsearch.solr.collection.history=history
+logsearch.solr.history.config.name=history
+logsearch.collection.history.replication.factor=1
 
 # Metrics
-metrics.collector.hosts={{logsearch_solr_metrics_collector_hosts}}
-solr.jmx.port={{logsearch_solr_jmx_port}}
+logsearch.solr.metrics.collector.hosts={{logsearch_solr_metrics_collector_hosts}}
+logsearch.solr.jmx.port={{logsearch_solr_jmx_port}}
 
 # Logfeeder Settings
 
-logfeeder.include.default.level={{logsearch_logfeeder_log_level_include}}
+logsearch.logfeeder.include.default.level={{logsearch_logfeeder_include_default_level}}
 
 # logsearch-admin.json
 logsearch.login.credentials.file={{logsearch_admin_credential_file}}

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/output.config.json.j2

@@ -23,8 +23,8 @@
       "destination":"solr",
       "zk_hosts":"{{zookeeper_quorum}}{{logsearch_solr_znode}}",
       "collection":"{{logsearch_solr_collection_service_logs}}",
-      "number_of_shards": "{{logsearch_service_logs_numshards}}",
-      "splits_interval_mins": "{{service_logs_collection_splits_interval_mins}}",
+      "number_of_shards": "{{logsearch_collection_service_logs_numshards}}",
+      "splits_interval_mins": "{{logsearch_service_logs_split_interval_mins}}",
       "conditions":{
         "fields":{
           "rowtype":[
@@ -42,8 +42,8 @@
       "destination":"solr",
       "zk_hosts":"{{zookeeper_quorum}}{{logsearch_solr_znode}}",
       "collection":"{{logsearch_solr_collection_audit_logs}}",
-      "number_of_shards": "{{logsearch_audit_logs_numshards}}",
-      "splits_interval_mins": "{{audit_logs_collection_splits_interval_mins}}",
+      "number_of_shards": "{{logsearch_collection_audit_logs_numshards}}",
+      "splits_interval_mins": "{{logsearch_audit_logs_split_interval_mins}}",
       "conditions":{
         "fields":{
           "rowtype":[