Repository: ambari Updated Branches: refs/heads/trunk e342bf927 -> 0fc46d029
AMBARI-17013. Fix logfeeder filter name of logsearch (oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0fc46d02 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0fc46d02 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0fc46d02 Branch: refs/heads/trunk Commit: 0fc46d0298edea1dd6e0b6dbea305172aea232be Parents: e342bf9 Author: oleewere <oleew...@gmail.com> Authored: Fri Jun 3 12:59:47 2016 +0200 Committer: oleewere <oleew...@gmail.com> Committed: Fri Jun 3 15:08:03 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java | 2 +- .../ambari-logsearch-portal/src/main/resources/default.properties | 2 ++ .../LOGSEARCH/0.5.0/configuration/logsearch-properties.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0fc46d02/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java index f9f81b4..edf1dcc 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java @@ -134,7 +134,7 @@ public class UserConfigSolrDao extends SolrDaoBase { } else { String logfeederDefaultLevels = PropertiesUtil.getProperty( - "logfeeder.include.default.level", DEFAULT_LEVELS); + "logsearch.logfeeder.include.default.level", DEFAULT_LEVELS); JSONArray levelJsonArray = new JSONArray(); try { String levelArray[] = logfeederDefaultLevels.split(","); http://git-wip-us.apache.org/repos/asf/ambari/blob/0fc46d02/ambari-logsearch/ambari-logsearch-portal/src/main/resources/default.properties ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/resources/default.properties b/ambari-logsearch/ambari-logsearch-portal/src/main/resources/default.properties index 7c2f858..25b4f1a 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/resources/default.properties +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/resources/default.properties @@ -40,6 +40,8 @@ logsearch.auth.file.enable=true logsearch.auth.ldap.enable=false logsearch.auth.simple.enable=false +logsearch.logfeeder.include.default.level=FATAL,ERROR,WARN,INFO,DEBUG,TRACE + #login config logsearch.login.credentials.file=user_pass.json logsearch.login.ldap.config=logsearch-admin-site.xml http://git-wip-us.apache.org/repos/asf/ambari/blob/0fc46d02/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml index eaa1106..65dc378 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml @@ -133,7 +133,7 @@ <property> <name>logsearch.logfeeder.include.default.level</name> - <value>fatal,error,warn</value> + <value>FATAL,ERROR,WARN</value> <description>Include default Logfeeder log levels for Log Search</description> <display-name>Logfeeder log levels</display-name> <on-ambari-upgrade add="false" change="true" delete="true"/>