From 7aa1996252f6cb0e9c0077cabe84458bdefa228f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Tue, 8 Jun 2021 09:05:41 +0800 Subject: [PATCH] Polich 8.6.0 doc (#7079) --- .asf.yaml | 2 ++ docs/en/setup/backend/log-analyzer.md | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index d7936351b0..ff5c76ed39 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -57,3 +57,5 @@ github: whatever: Just a placehold to make it take effects website-docs/8.5.0: whatever: Just a placehold to make it take effects + website-docs/8.6.0: + whatever: Just a placehold to make it take effects diff --git a/docs/en/setup/backend/log-analyzer.md b/docs/en/setup/backend/log-analyzer.md index f82746935e..68f8a28879 100644 --- a/docs/en/setup/backend/log-analyzer.md +++ b/docs/en/setup/backend/log-analyzer.md @@ -3,6 +3,17 @@ ## Collecting There are various ways to collect logs from application. +### Log files collector + +You can use [Filebeat](https://www.elastic.co/cn/beats/filebeat) 、[Fluentd](https://fluentd.org) to +collect file logs including to use Kafka MQ to transport [native-json](../../protocols/Log-Data-Protocol.md#Native-Json-Protocol) +format logs. When use this, need to open [kafka-fetcher](backend-fetcher.md#kafka-fetcher) +and enable configs `enableNativeJsonLog`. + +Collector config examples: +- [filebeat.yml](../../../../test/e2e/e2e-test/docker/kafka/filebeat.yml) +- [fluentd.conf](../../../../test/e2e/e2e-test/docker/kafka/fluentd.conf) + ### Java agent's toolkits Java agent provides toolkit for [log4j](../service-agent/java-agent/Application-toolkit-log4j-1.x.md), @@ -14,8 +25,6 @@ to report logs through gRPC with automatic injected trace context. forward logs including to use Kafka MQ to transport logs. When use this, need to open [kafka-fetcher](backend-fetcher.md#kafka-fetcher) and enable configs `enableNativeProtoLog`. -### Log files collector - Java agent provides toolkit for [log4j](../service-agent/java-agent/Application-toolkit-log4j-1.x.md#print-skywalking-context-in-your-logs), [log4j2](../service-agent/java-agent/Application-toolkit-log4j-2.x.md#print-skywalking-context-in-your-logs), @@ -27,15 +36,6 @@ Log framework config examples: - [log4j2.x fileAppender](../../../../test/e2e/e2e-service-provider/src/main/resources/log4j2.xml) - [logback fileAppender](../../../../test/e2e/e2e-service-provider/src/main/resources/logback.xml) -You can use [Filebeat](https://www.elastic.co/cn/beats/filebeat) 、[Fluentd](https://fluentd.org) to -collect file logs including to use Kafka MQ to transport [native-json](../../protocols/Log-Data-Protocol.md#Native-Json-Protocol) -format logs. When use this, need to open [kafka-fetcher](backend-fetcher.md#kafka-fetcher) -and enable configs `enableNativeJsonLog`. - -Collector config examples: -- [filebeat.yml](../../../../test/e2e/e2e-test/docker/kafka/filebeat.yml) -- [fluentd.conf](../../../../test/e2e/e2e-test/docker/kafka/fluentd.conf) - ## Log Analyzer Log analyzer of OAP server supports native log data. OAP could use Log Analysis Language to @@ -50,4 +50,4 @@ log-analyzer: malFiles: ${SW_LOG_MAL_FILES:""} ``` -Read [Log Analysis Language](../../concepts-and-designs/lal.md) documentation to learn log structurize and metrics analysis. \ No newline at end of file +Read [Log Analysis Language](../../concepts-and-designs/lal.md) documentation to learn log structurize and metrics analysis. -- GitLab