You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2017/04/12 12:32:07 UTC
[6/6] ambari git commit: AMBARI-20022. Log Search allow installation
without portal (Miklos Gergely via oleewere)
AMBARI-20022. Log Search allow installation without portal (Miklos Gergely via oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/76ff5e0c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/76ff5e0c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/76ff5e0c
Branch: refs/heads/branch-2.5
Commit: 76ff5e0c292ded4edc1190034d04fe21ab7f119b
Parents: edcc29f
Author: Miklos Gergely <mg...@hortonworks.com>
Authored: Fri Mar 10 14:43:00 2017 +0100
Committer: oleewere <ol...@gmail.com>
Committed: Wed Apr 12 14:31:27 2017 +0200
----------------------------------------------------------------------
.../LOGSEARCH/0.5.0/metainfo.xml | 2 +-
.../LOGSEARCH/0.5.0/package/scripts/params.py | 2 +-
.../stacks/HDP/2.2/services/stack_advisor.py | 70 ++++++++++++--------
3 files changed, 46 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/76ff5e0c/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
index fa9548b..acf829b 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml
@@ -38,7 +38,7 @@
<timelineAppid>logsearch</timelineAppid>
<displayName>Log Search Server</displayName>
<category>MASTER</category>
- <cardinality>1</cardinality>
+ <cardinality>0-1</cardinality>
<versionAdvertised>false</versionAdvertised>
<commandScript>
<script>scripts/logsearch.py</script>
http://git-wip-us.apache.org/repos/asf/ambari/blob/76ff5e0c/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
index 8dac69a..d00be4e 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
@@ -391,7 +391,7 @@ logfeeder_use_ssl = logsearch_solr_ssl_enabled or metrics_collector_protocol ==
# Smoke command
#####################################
-logsearch_server_hosts = config['clusterHostInfo']['logsearch_server_hosts']
+logsearch_server_hosts = default('/configurations/clusterHostInfo/logsearch_server_hosts', None)
logsearch_server_host = ""
if logsearch_server_hosts is not None and len(logsearch_server_hosts) > 0:
logsearch_server_host = logsearch_server_hosts[0]
http://git-wip-us.apache.org/repos/asf/ambari/blob/76ff5e0c/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index fafba14..7ef5fad 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -1008,36 +1008,54 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
putLogsearchEnvAttribute = self.putPropertyAttribute(configurations, "logsearch-env")
putLogfeederEnvAttribute = self.putPropertyAttribute(configurations, "logfeeder-env")
- infraSolrHosts = self.getComponentHostNames(services, "AMBARI_INFRA", "INFRA_SOLR")
-
- if infraSolrHosts is not None and len(infraSolrHosts) > 0 and "logsearch-properties" in services["configurations"]:
- replicationReccomendFloat = math.log(len(infraSolrHosts), 5)
- recommendedReplicationFactor = int(1 + math.floor(replicationReccomendFloat))
+ logSearchServerHosts = self.getComponentHostNames(services, "LOGSEARCH", "LOGSEARCH_SERVER")
+ if logSearchServerHosts is None or len(logSearchServerHosts) == 0:
+ for key in services['configurations']['logsearch-env']['properties']:
+ putLogsearchEnvAttribute(key, 'visible', 'false')
+ for key in services['configurations']['logsearch-properties']['properties']:
+ if key not in ['logsearch.collection.service.logs.numshards', 'logsearch.collection.audit.logs.numshards',
+ 'logsearch.solr.collection.service.logs', 'logsearch.solr.collection.audit.logs',
+ 'logsearch.service.logs.split.interval.mins', 'logsearch.audit.logs.split.interval.mins']:
+ putLogsearchAttribute(key, 'visible', 'false')
+ for key in services['configurations']['logsearch-audit_logs-solrconfig']['properties']:
+ self.putPropertyAttribute(configurations, "logsearch-audit_logs-solrconfig")(key, 'visible', 'false')
+ for key in services['configurations']['logsearch-service_logs-solrconfig']['properties']:
+ self.putPropertyAttribute(configurations, "logsearch-service_logs-solrconfig")(key, 'visible', 'false')
+ for key in services['configurations']['logsearch-log4j']['properties']:
+ self.putPropertyAttribute(configurations, "logsearch-log4j")(key, 'visible', 'false')
- recommendedMinShards = len(infraSolrHosts)
- recommendedShards = 2 * len(infraSolrHosts)
- recommendedMaxShards = 3 * len(infraSolrHosts)
+ putLogsearchProperty("logsearch.collection.service.logs.numshards", 2)
+ putLogsearchProperty("logsearch.collection.audit.logs.numshards", 2)
else:
- recommendedReplicationFactor = 2
+ infraSolrHosts = self.getComponentHostNames(services, "AMBARI_INFRA", "INFRA_SOLR")
+ if infraSolrHosts is not None and len(infraSolrHosts) > 0 and "logsearch-properties" in services["configurations"]:
+ replicationReccomendFloat = math.log(len(infraSolrHosts), 5)
+ recommendedReplicationFactor = int(1 + math.floor(replicationReccomendFloat))
+
+ recommendedMinShards = len(infraSolrHosts)
+ recommendedShards = 2 * len(infraSolrHosts)
+ recommendedMaxShards = 3 * len(infraSolrHosts)
+ else:
+ recommendedReplicationFactor = 2
+
+ recommendedMinShards = 1
+ recommendedShards = 1
+ recommendedMaxShards = 100
+
+ putLogsearchCommonEnvProperty('logsearch_use_external_solr', 'true')
+
+ # recommend number of shard
+ putLogsearchAttribute('logsearch.collection.service.logs.numshards', 'minimum', recommendedMinShards)
+ putLogsearchAttribute('logsearch.collection.service.logs.numshards', 'maximum', recommendedMaxShards)
+ putLogsearchProperty("logsearch.collection.service.logs.numshards", recommendedShards)
- recommendedMinShards = 1
- recommendedShards = 1
- recommendedMaxShards = 100
+ putLogsearchAttribute('logsearch.collection.audit.logs.numshards', 'minimum', recommendedMinShards)
+ putLogsearchAttribute('logsearch.collection.audit.logs.numshards', 'maximum', recommendedMaxShards)
+ putLogsearchProperty("logsearch.collection.audit.logs.numshards", recommendedShards)
+ # recommend replication factor
+ putLogsearchProperty("logsearch.collection.service.logs.replication.factor", recommendedReplicationFactor)
+ putLogsearchProperty("logsearch.collection.audit.logs.replication.factor", recommendedReplicationFactor)
- putLogsearchCommonEnvProperty('logsearch_use_external_solr', 'true')
-
- # recommend number of shard
- putLogsearchAttribute('logsearch.collection.service.logs.numshards', 'minimum', recommendedMinShards)
- putLogsearchAttribute('logsearch.collection.service.logs.numshards', 'maximum', recommendedMaxShards)
- putLogsearchProperty("logsearch.collection.service.logs.numshards", recommendedShards)
-
- putLogsearchAttribute('logsearch.collection.audit.logs.numshards', 'minimum', recommendedMinShards)
- putLogsearchAttribute('logsearch.collection.audit.logs.numshards', 'maximum', recommendedMaxShards)
- putLogsearchProperty("logsearch.collection.audit.logs.numshards", recommendedShards)
- # recommend replication factor
- putLogsearchProperty("logsearch.collection.service.logs.replication.factor", recommendedReplicationFactor)
- putLogsearchProperty("logsearch.collection.audit.logs.replication.factor", recommendedReplicationFactor)
-
kerberos_authentication_enabled = self.isSecurityEnabled(services)
if not kerberos_authentication_enabled:
putLogsearchCommonEnvProperty('logsearch_external_solr_kerberos_enabled', 'false')