AMBARI-16305. Lowercase log level filter and add zkHosts (oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/41aa2474 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/41aa2474 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/41aa2474 Branch: refs/heads/trunk Commit: 41aa24740e06accc9faf9a591ec09505106f4f1b Parents: 3861add Author: oleewere <oleew...@gmail.com> Authored: Wed May 11 16:33:51 2016 +0200 Committer: oleewere <oleew...@gmail.com> Committed: Wed May 11 16:33:51 2016 +0200 ---------------------------------------------------------------------- .../common-services/LOGSEARCH/0.5.0/package/scripts/params.py | 2 +- .../LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/41aa2474/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 183425a..8bc82e9 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 @@ -262,7 +262,7 @@ logfeeder_log4j_content = config['configurations']['logfeeder-log4j']['content'] logfeeder_checkpoint_folder = default('/configurations/logfeeder-env/logfeeder.checkpoint.folder', '/etc/ambari-logsearch-logfeeder/conf/checkpoints') -logfeeder_log_filter_enable = default('/configurations/logfeeder-properties/logfeeder.log.filter.enable', True) +logfeeder_log_filter_enable = str(default('/configurations/logfeeder-properties/logfeeder.log.filter.enable', True)).lower() logfeeder_solr_config_interval = default('/configurations/logfeeder-properties/logfeeder.solr.config.interval', 5) logfeeder_supported_services = ['accumulo', 'ambari', 'ams', 'atlas', 'falcon', 'hbase', 'hdfs', 'hive', 'kafka', http://git-wip-us.apache.org/repos/asf/ambari/blob/41aa2474/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 index bd93846..c6d73ea 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 @@ -19,6 +19,7 @@ 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 +logfeeder.solr.zkhosts={{zookeeper_quorum}}{{logsearch_solr_znode}} # Custom properties {% for key, value in logfeeder_custom_properties.items() %}
