AMBARI-17117. Fix misnamed Zookeeper connect strings in Log Search (Miklos Gergely via oleewere)

ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/logconfig/FetchConfigFromSolr.java

@@ -47,12 +47,12 @@ public class FetchConfigFromSolr extends Thread {
 
   @Override
   public void run() {
-    String zkHosts = LogFeederUtil.getStringProperty("logfeeder.solr.zkhosts");
+    String zkConnectString = LogFeederUtil.getStringProperty("logfeeder.solr.zk_connect_string");
     String solrUrl = LogFeederUtil.getStringProperty("logfeeder.solr.url");
-    if ((zkHosts == null || zkHosts.trim().length() == 0)
+    if ((zkConnectString == null || zkConnectString.trim().length() == 0 )
         && (solrUrl == null || solrUrl.trim().length() == 0)) {
-      logger
-          .warn("Solr ZKHosts or solrUrl for UserConfig/History is not set. Won't look for level configuration from Solr.");
+      logger.warn("Neither Solr ZK Connect String nor solr Uril for UserConfig/History is set." +
+          "Won't look for level configuration from Solr.");
       return;
     }
     solrConfigInterval = LogFeederUtil.getIntProperty("logfeeder.solr.config.interval", solrConfigInterval);

ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputSolr.java

@@ -133,45 +133,49 @@ public class OutputSolr extends Output {
 
   private void createSolrWorkers() throws Exception, MalformedURLException {
     String solrUrl = getStringValue("url");
-    String zkHosts = getStringValue("zk_hosts");
-    if (StringUtils.isEmpty(solrUrl) && StringUtils.isEmpty(zkHosts)) {
-      throw new Exception("For solr output, either url or zk_hosts property need to be set");
+    String zkConnectString = getStringValue("zk_connect_string");
+    if (StringUtils.isEmpty(solrUrl) && StringUtils.isEmpty(zkConnectString)) {
+      throw new Exception("For solr output, either url or zk_connect_string property need to be set");
     }
 
     for (int count = 0; count < workers; count++) {
-      SolrClient solrClient = getSolrClient(solrUrl, zkHosts, count);
+      SolrClient solrClient = getSolrClient(solrUrl, zkConnectString, count);
       createSolrWorkerThread(count, solrClient);
     }
   }
 
-  SolrClient getSolrClient(String solrUrl, String zkHosts, int count) throws Exception, MalformedURLException {
-    SolrClient solrClient = createSolrClient(solrUrl, zkHosts, collection);
-    pingSolr(solrUrl, zkHosts, count, solrClient);
+  SolrClient getSolrClient(String solrUrl, String zkConnectString, int count) throws Exception, MalformedURLException {
+    SolrClient solrClient = createSolrClient(solrUrl, zkConnectString);
+    pingSolr(solrUrl, zkConnectString, count, solrClient);
     waitForConfig();
 
     return solrClient;
   }
 
-  private SolrClient createSolrClient(String solrUrl, String zkHosts, String collection) throws Exception, MalformedURLException {
+  private SolrClient createSolrClient(String solrUrl, String zkConnectString) throws Exception, MalformedURLException {
     SolrClient solrClient;
-    if (zkHosts != null) {
-      solrClient = createCloudSolrClient(zkHosts, collection);
+    if (zkConnectString != null) {
+      solrClient = createCloudSolrClient(zkConnectString);
     } else {
-      solrClient = createHttpSolarClient(solrUrl, collection);
+      solrClient = createHttpSolarClient(solrUrl);
     }
     return solrClient;
   }
 
-  private SolrClient createCloudSolrClient(String zkHosts, String collection) throws Exception {
-    LOG.info("Using zookeepr. zkHosts=" + zkHosts);
+  private SolrClient createCloudSolrClient(String zkConnectString) throws Exception {
+    LOG.info("Using zookeepr. zkConnectString=" + zkConnectString);
+    collection = getStringValue("collection");
+    if (StringUtils.isEmpty(collection)) {
+      throw new Exception("For solr cloud property collection is mandatory");
+    }
     LOG.info("Using collection=" + collection);
 
-    CloudSolrClient solrClient = new CloudSolrClient(zkHosts);
+    CloudSolrClient solrClient = new CloudSolrClient(zkConnectString);
     solrClient.setDefaultCollection(collection);
     return solrClient;
   }
 
-  private SolrClient createHttpSolarClient(String solrUrl, String collection) throws MalformedURLException {
+  private SolrClient createHttpSolarClient(String solrUrl) throws MalformedURLException {
     String[] solrUrls = StringUtils.split(solrUrl, ",");
     if (solrUrls.length == 1) {
       LOG.info("Using SolrURL=" + solrUrl);
@@ -188,9 +192,9 @@ public class OutputSolr extends Output {
     }
   }
 
-  private void pingSolr(String solrUrl, String zkHosts, int count, SolrClient solrClient) {
+  private void pingSolr(String solrUrl, String zkConnectString, int count, SolrClient solrClient) {
     try {
-      LOG.info("Pinging Solr server. zkHosts=" + zkHosts + ", urls=" + solrUrl);
+      LOG.info("Pinging Solr server. zkConnectString=" + zkConnectString + ", urls=" + solrUrl);
       SolrPingResponse response = solrClient.ping();
       if (response.getStatus() == 0) {
         LOG.info("Ping to Solr server is successful for worker=" + count);
@@ -198,13 +202,13 @@ public class OutputSolr extends Output {
         LOG.warn(
             String.format(
                 "Ping to Solr server failed. It would check again. worker=%d, "
-                    + "solrUrl=%s, zkHosts=%s, collection=%s, response=%s",
-                count, solrUrl, zkHosts, collection, response));
+                    + "solrUrl=%s, zkConnectString=%s, collection=%s, response=%s",
+                count, solrUrl, zkConnectString, collection, response));
       }
     } catch (Throwable t) {
       LOG.warn(String.format(
-          "Ping to Solr server failed. It would check again. worker=%d, solrUrl=%s, zkHosts=%s, collection=%s",
-          count, solrUrl, zkHosts, collection), t);
+          "Ping to Solr server failed. It would check again. worker=%d, " + "solrUrl=%s, zkConnectString=%s, collection=%s",
+          count, solrUrl, zkConnectString, collection), t);
     }
   }
 

ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/SolrUtil.java

@@ -53,9 +53,9 @@ public class SolrUtil {
 
   private SolrUtil() throws Exception {
     String url = LogFeederUtil.getStringProperty("logfeeder.solr.url");
-    String zkHosts = LogFeederUtil.getStringProperty("logfeeder.solr.zkhosts");
+    String zkConnectString = LogFeederUtil.getStringProperty("logfeeder.solr.zk_connect_string");
     String collection = LogFeederUtil.getStringProperty("logfeeder.solr.core.config.name", "history");
-    connectToSolr(url, zkHosts, collection);
+    connectToSolr(url, zkConnectString, collection);
   }
 
   public static SolrUtil getInstance() {
@@ -78,10 +78,10 @@ public class SolrUtil {
     return instance;
   }
 
-  public SolrClient connectToSolr(String url, String zkHosts,
+  public SolrClient connectToSolr(String url, String zkConnectString,
                                   String collection) throws Exception {
     this.collectionName = collection;
-    solrDetail = "zkHosts=" + zkHosts + ", collection=" + collection
+    solrDetail = "zkConnectString=" + zkConnectString + ", collection=" + collection
       + ", url=" + url;
 
     logger.info("connectToSolr() " + solrDetail);
@@ -89,18 +89,18 @@ public class SolrUtil {
       throw new Exception("For solr, collection name is mandatory. "
         + solrDetail);
     }
-    if (zkHosts != null && !zkHosts.isEmpty()) {
-      solrDetail = "zkHosts=" + zkHosts + ", collection=" + collection;
+    if (zkConnectString != null && !zkConnectString.isEmpty()) {
+      solrDetail = "zkConnectString=" + zkConnectString + ", collection=" + collection;
       logger.info("Using zookeepr. " + solrDetail);
-      solrClouldClient = new CloudSolrClient(zkHosts);
+      solrClouldClient = new CloudSolrClient(zkConnectString);
       solrClouldClient.setDefaultCollection(collection);
       solrClient = solrClouldClient;
       int waitDurationMS = 3 * 60 * 1000;
       checkSolrStatus(waitDurationMS);
     } else {
       if (url == null || url.trim().isEmpty()) {
-        throw new Exception("Both zkHosts and URL are empty. zkHosts="
-          + zkHosts + ", collection=" + collection + ", url="
+        throw new Exception("Both zkConnectString and URL are empty. zkConnectString="
+          + zkConnectString + ", collection=" + collection + ", url="
           + url);
       }
       solrDetail = "collection=" + collection + ", url=" + url;

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

@@ -928,7 +928,7 @@
 			"is_enabled":"{{solr_service_logs_enable}}",
 			"comment":"Output to solr for service logs",
 			"destination":"solr",
-			"zk_hosts":"{{zookeeper_quorum}}{{logsearch_solr_znode}}",
+			"zk_connect_string":"{{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}}",
@@ -947,7 +947,7 @@
 			"comment":"Output to solr for audit records",
 			"is_enabled":"{{solr_audit_logs_enable}}",
 			"destination":"solr",
-			"zk_hosts":"{{zookeeper_quorum}}{{logsearch_solr_znode}}",
+			"zk_connect_string":"{{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}}",

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

@@ -19,7 +19,7 @@ logfeeder.metrics.collector.hosts=
 #filter config
 logfeeder.log.filter.enable=true
 logfeeder.solr.config.interval=5
-logfeeder.solr.zkhosts=
+logfeeder.solr.zk_connect_string=
 logfeeder.solr.url=
 
 logfeeder.solr.kerberos.enable=false

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

@@ -21,7 +21,7 @@
 			"is_enabled":"{{solr_service_logs_enable}}",
 			"comment":"Output to solr for service logs",
 			"destination":"solr",
-			"zk_hosts":"{{zookeeper_quorum}}{{logsearch_solr_znode}}",
+			"zk_connect_string":"{{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}}",
@@ -40,7 +40,7 @@
 			"comment":"Output to solr for audit records",
 			"is_enabled":"{{solr_audit_logs_enable}}",
 			"destination":"solr",
-			"zk_hosts":"{{zookeeper_quorum}}{{logsearch_solr_znode}}",
+			"zk_connect_string":"{{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}}",

ambari-logsearch/ambari-logsearch-logfeeder/src/test/java/org/apache/ambari/logfeeder/output/OutputSolrTest.java

@@ -57,7 +57,7 @@ public class OutputSolrTest {
   public void init() throws Exception {
     outputSolr = new OutputSolr() {
       @Override
-      SolrClient getSolrClient(String solrUrl, String zkHosts, int count) throws Exception, MalformedURLException {
+      SolrClient getSolrClient(String solrUrl, String zkConnectString, int count) throws Exception, MalformedURLException {
         return new CloudSolrClient(null) {
           private static final long serialVersionUID = 1L;
 
@@ -146,11 +146,11 @@ public class OutputSolrTest {
   }
 
   @Test
-  public void testOutputToSolr_noUrlOrZKHost() throws Exception {
-    LOG.info("testOutputToSolr_noUrlOrZKHost()");
+  public void testOutputToSolr_noUrlOrZkConnectString() throws Exception {
+    LOG.info("testOutputToSolr_noUrlOrZkConnectString()");
 
     expectedException.expect(Exception.class);
-    expectedException.expectMessage("For solr output, either url or zk_hosts property need to be set");
+    expectedException.expectMessage("For solr output, either url or zk_connect_string property need to be set");
 
     Map<String, Object> config = new HashMap<String, Object>();
     config.put("workers", "3");

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

@@ -38,7 +38,7 @@ public class AuditSolrDao extends SolrDaoBase {
   @PostConstruct
   public void postConstructor() {
     String solrUrl = PropertiesUtil.getProperty("logsearch.solr.audit.logs.url");
-    String zkHosts = PropertiesUtil.getProperty("logsearch.solr.audit.logs.zkhosts");
+    String zkConnectString = PropertiesUtil.getProperty("logsearch.solr.audit.logs.zk_connect_string");
     String collection = PropertiesUtil.getProperty(
       "logsearch.solr.collection.audit.logs", "audit_logs");
     String splitInterval = PropertiesUtil.getProperty(
@@ -51,13 +51,13 @@ public class AuditSolrDao extends SolrDaoBase {
       "logsearch.collection.audit.logs.replication.factor", 1);
 
     try {
-      connectToSolr(solrUrl, zkHosts, collection);
+      connectToSolr(solrUrl, zkConnectString, collection);
       setupCollections(splitInterval, configName, numberOfShards,
         replicationFactor);
     } catch (Exception e) {
       logger.error(
         "Error while connecting to Solr for audit logs : solrUrl="
-          + solrUrl + ", zkHosts=" + zkHosts
+          + solrUrl + ", zkConnectString=" + zkConnectString
           + ", collection=" + collection, e);
     }
   }

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

@@ -39,7 +39,7 @@ public class ServiceLogsSolrDao extends SolrDaoBase {
   public void postConstructor() {
     logger.info("postConstructor() called.");
     String solrUrl = PropertiesUtil.getProperty("logsearch.solr.url");
-    String zkHosts = PropertiesUtil.getProperty("logsearch.solr.zkhosts");
+    String zkConnectString = PropertiesUtil.getProperty("logsearch.solr.zk_connect_string");
     String collection = PropertiesUtil.getProperty("logsearch.solr.collection.service.logs",
       "hadoop_logs");
     String splitInterval = PropertiesUtil.getProperty(
@@ -52,13 +52,13 @@ public class ServiceLogsSolrDao extends SolrDaoBase {
       "logsearch.collection.service.logs.replication.factor", 1);
 
     try {
-      connectToSolr(solrUrl, zkHosts, collection);
+      connectToSolr(solrUrl, zkConnectString, collection);
       setupCollections(splitInterval, configName, numberOfShards,
         replicationFactor);
     } catch (Exception e) {
       logger.error(
         "error while connecting to Solr for service logs : solrUrl="
-          + solrUrl + ", zkHosts=" + zkHosts
+          + solrUrl + ", zkConnectString=" + zkConnectString
           + ", collection=" + collection, e);
     }
   }

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

@@ -93,17 +93,17 @@ public abstract class SolrDaoBase {
 
   int SETUP_RETRY_SECOND = 30;
   
-  private boolean isZkhost=false;//by default its false
+  private boolean isZkConnectString=false;//by default its false
   
   //set logtype
   public SolrDaoBase(LOG_TYPE logType) {
     this.logType = logType;
   }
 
-  public SolrClient connectToSolr(String url, String zkHosts,
+  public SolrClient connectToSolr(String url, String zkConnectString,
                                   String collection) throws Exception {
     this.collectionName = collection;
-    solrDetail = "zkHosts=" + zkHosts + ", collection=" + collection
+    solrDetail = "zkConnectString=" + zkConnectString + ", collection=" + collection
       + ", url=" + url;
 
     logger.info("connectToSolr() " + solrDetail);
@@ -112,19 +112,19 @@ public abstract class SolrDaoBase {
         + solrDetail);
     }
     setupSecurity();
-    if (!stringUtil.isEmpty(zkHosts)) {
-      isZkhost=true;
-      solrDetail = "zkHosts=" + zkHosts + ", collection=" + collection;
+    if (!stringUtil.isEmpty(zkConnectString)) {
+      isZkConnectString=true;
+      solrDetail = "zkConnectString=" + zkConnectString + ", collection=" + collection;
       logger.info("Using zookeepr. " + solrDetail);
-      solrClouldClient = new CloudSolrClient(zkHosts);
+      solrClouldClient = new CloudSolrClient(zkConnectString);
       solrClouldClient.setDefaultCollection(collection);
       solrClient = solrClouldClient;
       int waitDurationMS = 3 * 60 * 1000;
       checkSolrStatus(waitDurationMS);
     } else {
       if (stringUtil.isEmpty(url)) {
-        throw new Exception("Both zkHosts and URL are empty. zkHosts="
-          + zkHosts + ", collection=" + collection + ", url="
+        throw new Exception("Both zkConnectString and URL are empty. zkConnectString="
+          + zkConnectString + ", collection=" + collection + ", url="
           + url);
       }
       solrDetail = "collection=" + collection + ", url=" + url;
@@ -192,7 +192,7 @@ public abstract class SolrDaoBase {
 
   public void setupCollections(final String splitMode, final String configName,
       final int numberOfShards, final int replicationFactor) throws Exception {
-    if (isZkhost) {
+    if (isZkConnectString) {
       setup_status = createCollectionsIfNeeded(splitMode, configName,
           numberOfShards, replicationFactor);
       logger.info("Setup status for " + collectionName + " is " + setup_status);

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

@@ -59,7 +59,7 @@ public class UserConfigSolrDao extends SolrDaoBase {
   public void postConstructor() {
 
     String solrUrl = PropertiesUtil.getProperty("logsearch.solr.url");
-    String zkHosts = PropertiesUtil.getProperty("logsearch.solr.zkhosts");
+    String zkConnectString = PropertiesUtil.getProperty("logsearch.solr.zk_connect_string");
     String collection = PropertiesUtil.getProperty("logsearch.solr.collection.history",
       "history");
     String configName = PropertiesUtil.getProperty(
@@ -70,7 +70,7 @@ public class UserConfigSolrDao extends SolrDaoBase {
     int numberOfShards = 1;
 
     try {
-      connectToSolr(solrUrl, zkHosts, collection);
+      connectToSolr(solrUrl, zkConnectString, collection);
       setupCollections(splitInterval, configName, numberOfShards,
         replicationFactor);
       intializeLogFeederFilter();
@@ -78,7 +78,7 @@ public class UserConfigSolrDao extends SolrDaoBase {
     } catch (Exception e) {
       logger.error(
         "error while connecting to Solr for history logs : solrUrl="
-          + solrUrl + ", zkHosts=" + zkHosts
+          + solrUrl + ", zkConnectString=" + zkConnectString
           + ", collection=" + collection, e);
     }
   }

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

@@ -180,9 +180,9 @@ public class SolrMetricsLoader extends TimerTask {
 
       int solrJmxPort = PropertiesUtil.getIntProperty("logsearch.solr.jmx.port");
 
-      String zkHosts = PropertiesUtil.getProperty("logsearch.solr.zkhosts");
+      String zkConnectString = PropertiesUtil.getProperty("logsearch.solr.zk_connect_string");
       AmbariSolrCloudClient ambariSolrCloudClient = new AmbariSolrCloudClientBuilder()
-          .withZookeeperHosts(zkHosts)
+          .withZkConnectString(zkConnectString)
           .build();
 
       Collection<String> solrHosts = ambariSolrCloudClient.getSolrHosts();

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

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-logsearch.solr.zkhosts={{zookeeper_quorum}}{{logsearch_solr_znode}}
+logsearch.solr.zk_connect_string={{zookeeper_quorum}}{{logsearch_solr_znode}}
 logsearch.solr.collection.service.logs={{logsearch_solr_collection_service_logs}}
 
 logsearch.service.logs.split.interval.mins={{logsearch_service_logs_split_interval_mins}}
@@ -23,7 +23,7 @@ logsearch.collection.service.logs.replication.factor={{logsearch_collection_serv
 logsearch.solr.collection.history={{logsearch_solr_collection_history}}
 
 #Audit logs
-logsearch.solr.audit.logs.zkhosts={{logsearch_solr_audit_logs_zk_quorum}}{{logsearch_solr_audit_logs_zk_node}}
+logsearch.solr.audit.logs.zk_connect_string={{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}}
 

ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/AmbariSolrCloudCLI.java

@@ -99,11 +99,11 @@ public class AmbariSolrCloudCLI {
       .desc("Sharding not used when creating collection")
       .build();
 
-    final Option zookeeperHostOption = Option.builder("z")
-      .longOpt("zookeeper-host")
-      .desc("Zookeeper quorum and Znode")
+    final Option zkConnectStringOption = Option.builder("z")
+      .longOpt("zookeeper-connect-string")
+      .desc("Zookeeper quorum [and a Znode]")
       .numberOfArgs(1)
-      .argName("host:port,host:port../ambari-solr")
+      .argName("host:port,host:port[/ambari-solr]")
       .build();
 
     final Option collectionOption = Option.builder("c")
@@ -190,7 +190,7 @@ public class AmbariSolrCloudCLI {
     options.addOption(helpOption);
     options.addOption(retryOption);
     options.addOption(intervalOption);
-    options.addOption(zookeeperHostOption);
+    options.addOption(zkConnectStringOption);
     options.addOption(configSetOption);
     options.addOption(configDirOption);
     options.addOption(collectionOption);
@@ -220,19 +220,19 @@ public class AmbariSolrCloudCLI {
       String command = "";
       if (cli.hasOption("cc")) {
         command = CREATE_COLLECTION_COMMAND;
-        validateRequiredOptions(cli, command, zookeeperHostOption, collectionOption, configSetOption);
+        validateRequiredOptions(cli, command, zkConnectStringOption, collectionOption, configSetOption);
       } else if (cli.hasOption("uc")) {
         command = UPLOAD_CONFIG_COMMAND;
-        validateRequiredOptions(cli, command, zookeeperHostOption, configSetOption, configDirOption);
+        validateRequiredOptions(cli, command, zkConnectStringOption, configSetOption, configDirOption);
       } else if (cli.hasOption("dc")) {
         command = DOWNLOAD_CONFIG_COMMAND;
-        validateRequiredOptions(cli, command, zookeeperHostOption, configSetOption, configDirOption);
+        validateRequiredOptions(cli, command, zkConnectStringOption, configSetOption, configDirOption);
       } else if (cli.hasOption("csh")) {
         command = CREATE_SHARD_COMMAND;
-        validateRequiredOptions(cli, command, zookeeperHostOption, collectionOption, shardNameOption);
+        validateRequiredOptions(cli, command, zkConnectStringOption, collectionOption, shardNameOption);
       } else if (cli.hasOption("chc")) {
         command = CONFIG_CHECK_COMMAND;
-        validateRequiredOptions(cli, command, zookeeperHostOption, configSetOption);
+        validateRequiredOptions(cli, command, zkConnectStringOption, configSetOption);
       } else {
         List<String> commands = Arrays.asList(CREATE_COLLECTION_COMMAND, CREATE_SHARD_COMMAND, UPLOAD_CONFIG_COMMAND,
           DOWNLOAD_CONFIG_COMMAND, CONFIG_CHECK_COMMAND);
@@ -240,7 +240,7 @@ public class AmbariSolrCloudCLI {
         exit(1, String.format("One of the supported commands is required (%s)", StringUtils.join(commands, "|")));
       }
 
-      String zookeeperHosts = cli.getOptionValue('z');
+      String zkConnectString = cli.getOptionValue('z');
       String collection = cli.getOptionValue('c');
       String configSet = cli.getOptionValue("cs");
       String configDir = cli.getOptionValue("d");
@@ -257,7 +257,7 @@ public class AmbariSolrCloudCLI {
 
 
       AmbariSolrCloudClientBuilder clientBuilder = new AmbariSolrCloudClientBuilder()
-        .withZookeeperHosts(zookeeperHosts)
+        .withZkConnectString(zkConnectString)
         .withCollection(collection)
         .withConfigSet(configSet)
         .withShards(shards)

ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/AmbariSolrCloudClient.java

@@ -43,7 +43,7 @@ public class AmbariSolrCloudClient {
 
   private static final Logger LOG = LoggerFactory.getLogger(AmbariSolrCloudClient.class);
 
-  private final String zookeeperHosts;
+  private final String zkConnectString;
   private final String collection;
   private final String configSet;
   private final String configDir;
@@ -60,7 +60,7 @@ public class AmbariSolrCloudClient {
   private String jaasFile;
 
   public AmbariSolrCloudClient(AmbariSolrCloudClientBuilder builder) {
-    this.zookeeperHosts = builder.zookeeperHosts;
+    this.zkConnectString = builder.zkConnectString;
     this.collection = builder.collection;
     this.configSet = builder.configSet;
     this.configDir = builder.configDir;
@@ -172,8 +172,8 @@ public class AmbariSolrCloudClient {
     return new GetSolrHostsCommand(getRetryTimes(), getInterval()).run(this);
   }
 
-  public String getZookeeperHosts() {
-    return zookeeperHosts;
+  public String getZkConnectString() {
+    return zkConnectString;
   }
 
   public String getCollection() {

ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/AmbariSolrCloudClientBuilder.java

@@ -25,7 +25,7 @@ import org.apache.solr.client.solrj.impl.Krb5HttpClientConfigurer;
 import org.apache.solr.common.cloud.SolrZkClient;
 
 public class AmbariSolrCloudClientBuilder {
-  String zookeeperHosts;
+  String zkConnectString;
   String collection;
   String configSet;
   String configDir;
@@ -45,8 +45,8 @@ public class AmbariSolrCloudClientBuilder {
     return new AmbariSolrCloudClient(this);
   }
 
-  public AmbariSolrCloudClientBuilder withZookeeperHosts(String zookeeperHosts) {
-    this.zookeeperHosts = zookeeperHosts;
+  public AmbariSolrCloudClientBuilder withZkConnectString(String zkConnectString) {
+    this.zkConnectString = zkConnectString;
     return this;
   }
 
@@ -112,12 +112,12 @@ public class AmbariSolrCloudClientBuilder {
   }
 
   public AmbariSolrCloudClientBuilder withSolrCloudClient() {
-    this.solrCloudClient = new CloudSolrClient(this.zookeeperHosts);
+    this.solrCloudClient = new CloudSolrClient(this.zkConnectString);
     return this;
   }
 
   public AmbariSolrCloudClientBuilder withSolrZkClient(int zkClientTimeout, int zkClientConnectTimeout) {
-    this.solrZkClient = new SolrZkClient(this.zookeeperHosts, zkClientTimeout, zkClientConnectTimeout);
+    this.solrZkClient = new SolrZkClient(this.zkConnectString, zkClientTimeout, zkClientConnectTimeout);
     return this;
   }
 

ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/commands/GetSolrHostsCommand.java

@@ -36,7 +36,7 @@ public class GetSolrHostsCommand extends AbstractRetryCommand<Collection<String>
   public Collection<String> createAndProcessRequest(AmbariSolrCloudClient solrCloudClient) throws Exception {
     List<String> solrHosts = new ArrayList<>();
 
-    ZooKeeper zk = new ZooKeeper(solrCloudClient.getZookeeperHosts(), 10000, null);
+    ZooKeeper zk = new ZooKeeper(solrCloudClient.getZkConnectString(), 10000, null);
     List<String> ids = zk.getChildren("/live_nodes", false);
     for (String id : ids) {
       if (id.endsWith("_solr")) {

ambari-logsearch/ambari-logsearch-solr-client/src/test/java/org/apache/ambari/logsearch/solr/AmbariSolrCloudClientTest.java

@@ -60,7 +60,7 @@ public class AmbariSolrCloudClientTest {
     builder.solrZkClient = mockedSolrZkClient;
 
     underTest = builder
-      .withZookeeperHosts("localhost1:2181,localhost2:2182")
+      .withZkConnectString("localhost1:2181,localhost2:2182")
       .withCollection("collection1")
       .withConfigSet("configSet")
       .withShards(1)

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

@@ -18,8 +18,8 @@ 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.zkhosts={{zookeeper_quorum}}{{logsearch_solr_znode}}
 logfeeder.solr.core.config.name=history
+logfeeder.solr.zk_connect_string={{zookeeper_quorum}}{{logsearch_solr_znode}}
 
 # Custom properties
 {% for key, value in logfeeder_custom_properties.items() %}

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

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-logsearch.solr.zkhosts={{zookeeper_quorum}}{{logsearch_solr_znode}}
+logsearch.solr.zk_connect_string={{zookeeper_quorum}}{{logsearch_solr_znode}}
 
 # Service Logs
 logsearch.solr.collection.service.logs={{logsearch_solr_collection_service_logs}}
@@ -25,7 +25,7 @@ logsearch.collection.service.logs.replication.factor={{logsearch_collection_serv
 logsearch.service.logs.fields={{logsearch_service_logs_fields}}
 
 # Audit logs
-logsearch.solr.audit.logs.zkhosts={{logsearch_solr_audit_logs_zk_quorum}}{{logsearch_solr_audit_logs_zk_node}}
+logsearch.solr.audit.logs.zk_connect_string={{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}}
 

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

@@ -21,7 +21,7 @@
       "is_enabled":"{{solr_service_logs_enable}}",
       "comment":"Output to solr for service logs",
       "destination":"solr",
-      "zk_hosts":"{{zookeeper_quorum}}{{logsearch_solr_znode}}",
+      "zk_connect_string":"{{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}}",
@@ -40,7 +40,7 @@
       "comment":"Output to solr for audit records",
       "is_enabled":"{{solr_audit_logs_enable}}",
       "destination":"solr",
-      "zk_hosts":"{{zookeeper_quorum}}{{logsearch_solr_znode}}",
+      "zk_connect_string":"{{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}}",