Repository: ambari Updated Branches: refs/heads/trunk 6c7c63fb3 -> 02a7eb72e
AMBARI-16261. LogFeeder logs are not showing up in LogSearch (Bosco Durai via oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/02a7eb72 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/02a7eb72 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/02a7eb72 Branch: refs/heads/trunk Commit: 02a7eb72e603cefe919106aaece9457d8cbbdc33 Parents: 06e51e5 Author: oleewere <oleew...@gmail.com> Authored: Tue May 10 01:17:58 2016 +0200 Committer: oleewere <oleew...@gmail.com> Committed: Tue May 10 11:34:51 2016 +0200 ---------------------------------------------------------------------- .../templates/input.config-logsearch.json.j2 | 2 +- .../0.5.0/properties/logsearch-log4j.xml.j2 | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/02a7eb72/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2 index 06aaba6..e942b73 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-logsearch.json.j2 @@ -25,7 +25,7 @@ { "type":"logsearch_feeder", "rowtype":"service", - "path":"{{logfeeder_log_dir}}/logfeeder.json" + "path":"{{logfeeder_log_dir}}/logsearch-logfeeder.json" }, { "type":"logsearch_perf", http://git-wip-us.apache.org/repos/asf/ambari/blob/02a7eb72/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2 index 7dc09ba2..15345cf 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-log4j.xml.j2 @@ -24,35 +24,29 @@ limitations under the License. </layout> </appender> - <appender name="rolling_file_json" class="org.apache.log4j.RollingFileAppender"> + <appender name="rolling_file_json" class="org.apache.ambari.logsearch.appender.LogsearchRollingFileAppender"> <param name="file" value="{{logsearch_log_dir}}/logsearch.json"/> <param name="append" value="true"/> <param name="maxFileSize" value="10MB"/> <param name="maxBackupIndex" value="10"/> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d [%t] %-5p %C{6} (%F:%L) - %m%n"/> - </layout> + <layout class="org.apache.ambari.logsearch.appender.LogsearchConversion" /> </appender> - <appender name="audit_rolling_file_json" class="org.apache.log4j.RollingFileAppender"> + <appender name="audit_rolling_file_json" class="org.apache.ambari.logsearch.appender.LogsearchRollingFileAppender"> <param name="file" value="{{logsearch_log_dir}}/logsearch-audit.json"/> <param name="append" value="true"/> <param name="maxFileSize" value="10MB"/> <param name="maxBackupIndex" value="10"/> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d [%t] %-5p %C{6} (%F:%L) - %m%n"/> - </layout> + <layout class="org.apache.ambari.logsearch.appender.LogsearchConversion" /> </appender> - <appender name="performance_analyzer_json" class="org.apache.log4j.RollingFileAppender"> + <appender name="performance_analyzer_json" class="org.apache.ambari.logsearch.appender.LogsearchRollingFileAppender"> <param name="file" value="{{logsearch_log_dir}}/logsearch-performance.json"/> <param name="Threshold" value="info"/> <param name="append" value="true"/> <param name="maxFileSize" value="10MB"/> <param name="maxBackupIndex" value="10"/> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d [%t] %-5p %C{6} (%F:%L) - %m%n"/> - </layout> + <layout class="org.apache.ambari.logsearch.appender.LogsearchConversion" /> </appender> <logger name="org.apache.ambari.logsearch.audit" additivity="true"> @@ -74,4 +68,4 @@ limitations under the License. <!--<appender-ref ref="rolling_file" /> --> <appender-ref ref="rolling_file_json"/> </root> -</log4j:configuration> \ No newline at end of file +</log4j:configuration>
