ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oleew...@apache.org
Subject ambari git commit: AMBARI-17013. Fix logfeeder filter name of logsearch (oleewere)
Date Fri, 03 Jun 2016 13:11:29 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 6a297e8e6 -> f740a2acd


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/f740a2ac
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f740a2ac
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f740a2ac

Branch: refs/heads/branch-2.4
Commit: f740a2acdb4e4227113b2be2563e84cd5ffbe860
Parents: 6a297e8
Author: oleewere <oleewere@gmail.com>
Authored: Fri Jun 3 12:59:47 2016 +0200
Committer: oleewere <oleewere@gmail.com>
Committed: Fri Jun 3 15:10:54 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/f740a2ac/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/f740a2ac/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/f740a2ac/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 b1fb6ab..04b1cf5 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
@@ -123,7 +123,7 @@
   </property>
   <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"/>


Mime
View raw message