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 2016/05/10 13:10:21 UTC
[4/4] ambari git commit: AMBARI-16305. Abillity to enable/disable log
level filter for LogFeeder (oleewere)
AMBARI-16305. Abillity to enable/disable log level filter for LogFeeder (oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/45be2257
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/45be2257
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/45be2257
Branch: refs/heads/trunk
Commit: 45be225713c05b3c1a9e4c88e708bec261f10395
Parents: c39996a
Author: oleewere <ol...@gmail.com>
Authored: Tue May 10 13:37:55 2016 +0200
Committer: oleewere <ol...@gmail.com>
Committed: Tue May 10 14:59:36 2016 +0200
----------------------------------------------------------------------
.../configuration/logfeeder-properties.xml | 20 ++++++++++++++++++++
.../LOGSEARCH/0.5.0/package/scripts/params.py | 8 +++++++-
.../package/templates/logfeeder.properties.j2 | 3 +++
ambari-web/app/data/HDP2/site_properties.js | 14 ++++++++++++++
4 files changed, 44 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/45be2257/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml
index 2e92ab9..5ed3c76 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml
@@ -45,4 +45,24 @@
<display-name>Metrics collector hosts</display-name>
</property>
+ <property>
+ <name>logfeeder.log.filter.enable</name>
+ <value>true</value>
+ <description>Enable Log filtering based on log level (INFO,ERROR,WARN etc.)</description>
+ <display-name>Log Filter enable</display-name>
+ <value-attributes>
+ <type>boolean</type>
+ </value-attributes>
+ </property>
+
+ <property>
+ <name>logfeeder.solr.config.interval</name>
+ <value>5</value>
+ <description>Interval to fetch filter config from Solr in sec</description>
+ <display-name>Fetch Solr config interval</display-name>
+ <value-attributes>
+ <type>int</type>
+ </value-attributes>
+ </property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/45be2257/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 97ad191..4b2d769 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
@@ -251,6 +251,10 @@ 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_solr_config_interval = default('/configurations/logfeeder-properties/logfeeder.solr.config.interval', 5)
+
logfeeder_supported_services = ['accumulo', 'ambari', 'ams', 'atlas', 'falcon', 'hbase', 'hdfs', 'hive', 'kafka',
'knox', 'logsearch', 'oozie', 'ranger', 'storm', 'yarn', 'zookeeper']
@@ -265,4 +269,6 @@ logfeeder_metrics_collector_hosts = format(config['configurations']['logfeeder-p
logfeeder_custom_properties = dict(config['configurations']['logfeeder-properties'])
logfeeder_custom_properties.pop('logfeeder.config.files', None)
logfeeder_custom_properties.pop('logfeeder.checkpoint.folder', None)
-logfeeder_custom_properties.pop('logfeeder.metrics.collector.hosts', None)
\ No newline at end of file
+logfeeder_custom_properties.pop('logfeeder.metrics.collector.hosts', None)
+logfeeder_custom_properties.pop('logfeeder.log.filter.enable', None)
+logfeeder_custom_properties.pop('logfeeder.solr.config.interval', None)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/45be2257/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 2408261..bd93846 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
@@ -16,6 +16,9 @@
logfeeder.checkpoint.folder={{logfeeder_checkpoint_folder}}
metrics.collector.hosts={{logfeeder_metrics_collector_hosts}}
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
# Custom properties
{% for key, value in logfeeder_custom_properties.items() %}
http://git-wip-us.apache.org/repos/asf/ambari/blob/45be2257/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 45c54a0..1fa70c0 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -1897,6 +1897,20 @@ var hdp2properties = [
"category": "Advanced logfeeder-properties",
"index": 3
},
+ {
+ "name": "logfeeder.solr.config.interval",
+ "serviceName": "LOGSEARCH",
+ "filename": "logfeeder-properties.xml",
+ "category": "Advanced logfeeder-properties",
+ "index": 4
+ },
+ {
+ "name": "logfeeder.log.filter.enable",
+ "serviceName": "LOGSEARCH",
+ "filename": "logfeeder-properties.xml",
+ "category": "Advanced logfeeder-properties",
+ "index": 5
+ },
/*logfeeder-env*/
{
"name": "logfeeder_log_dir",