METRON-1807 Auto populate the recommended values to some of the metro…

…n config parameters (MohanDV via merrimanr) closes #1227
apache · Oct 8, 2018 · 269b91d · 269b91d
1 parent 891bf49
commit 269b91d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/...tron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml b/...tron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml
@@ -130,17 +130,21 @@
             <empty-value-valid>true</empty-value-valid>
         </value-attributes>
     </property>
-    <property require-input = "true">
+    <property>
         <name>storm_rest_addr</name>
         <display-name>Storm Rest Server Address</display-name>
         <description>URL of Storm UI (http://storm.ui.hostname:8744). If no protocol is provided, http is assumed.</description>
-        <value></value>
+        <value-attributes>
+            <empty-value-valid>true</empty-value-valid>
+        </value-attributes>
     </property>
-    <property require-input = "true">
+    <property >
         <name>zeppelin_server_url</name>
         <display-name>Zeppelin Server Address</display-name>
         <description>URL of Zeppelin (zeppelin.server.addr:zeppelin.server.port)</description>
-        <value></value>
+        <value-attributes>
+            <empty-value-valid>true</empty-value-valid>
+        </value-attributes>
     </property>
     <property>
         <name>metron_principal_name</name>

diff --git a/.../ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py b/.../ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py
@@ -158,6 +158,16 @@ def getServiceConfigurationRecommendations(self, configurations, clusterData, se
             putMetronEnvProperty = self.putProperty(configurations, "metron-env", services)
             putMetronEnvProperty("zeppelin_server_url", zeppelinServerUrl)
 
+        #Suggest Zookeeper quorum
+        if "solr-cloud" in services["configurations"]:
+            zookeeperHost = self.getComponentHostNames(services, "ZOOKEEPER", "ZOOKEEPER_SERVER")[0]
+            zookeeperClientPort = services["configurations"]["zoo.cfg"]["properties"]["clientPort"]
+            solrZkDir = services["configurations"]["solr-cloud"]["properties"]["solr_cloud_zk_directory"]
+            solrZookeeperUrl = zookeeperHost + ":" + zookeeperClientPort + solrZkDir
+            putMetronEnvProperty = self.putProperty(configurations, "metron-env", services)
+            putMetronEnvProperty("solr_zookeeper_url", solrZookeeperUrl)
+
+
     def validateSTORMSiteConfigurations(self, properties, recommendedDefaults, configurations, services, hosts):
         # Determine if the cluster is secured
         is_secured = self.isSecurityEnabled(services)