Browse Source

AMBARI-17013. Fix logfeeder filter name of logsearch (oleewere)

oleewere 9 years ago
parent
commit
f740a2acdb

+ 1 - 1
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(",");

+ 2 - 0
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

+ 1 - 1
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"/>