METRON-1807 Auto populate the recommended values to some of the metron config parameters (MohanDV via merrimanr) closes apache/metron#1227
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/269b91d0 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/269b91d0 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/269b91d0 Branch: refs/heads/feature/METRON-1090-stellar-assignment Commit: 269b91d015c67b0ae49a78e5c457408e1b431c25 Parents: 891bf49 Author: MohanDV <mohan...@gmail.com> Authored: Mon Oct 8 11:20:53 2018 -0500 Committer: rmerriman <merrim...@gmail.com> Committed: Mon Oct 8 11:20:53 2018 -0500 ---------------------------------------------------------------------- .../METRON/CURRENT/configuration/metron-env.xml | 12 ++++++++---- .../common-services/METRON/CURRENT/service_advisor.py | 10 ++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/269b91d0/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml index cdef7cf..81dda6c 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-env.xml +++ b/metron-deployment/packaging/ambari/metron-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> http://git-wip-us.apache.org/repos/asf/metron/blob/269b91d0/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py index b008fc0..36cec7c 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py @@ -158,6 +158,16 @@ class METRON${metron.short.version}ServiceAdvisor(service_advisor.ServiceAdvisor 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)
