You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/05/20 08:34:00 UTC
[skywalking] branch master updated (015d387 -> 47fef5d)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 015d387 Introduce method interceptor v2 (#6937)
add 47fef5d Support native-json format log in kafka-fetcher-plugin (#6952)
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 1 +
docs/en/protocols/Log-Data-Protocol.md | 40 ++++++++++
docs/en/setup/backend/backend-fetcher.md | 4 +-
docs/en/setup/backend/configuration-vocabulary.md | 6 +-
docs/en/setup/backend/log-analyzer.md | 26 ++++++-
.../src/main/resources/application.yml | 3 +-
.../agent/kafka/KafkaFetcherHandlerRegister.java | 4 +-
.../agent/kafka/module/KafkaFetcherConfig.java | 6 +-
.../agent/kafka/provider/KafkaFetcherProvider.java | 7 +-
...stractKafkaHandler.java => JsonLogHandler.java} | 47 +++++------
.../agent/kafka/provider/handler/LogHandler.java | 14 +++-
.../{LogController.java => FileLogController.java} | 17 ++--
.../src/main/resources/log4j.properties | 8 ++
.../src/main/resources/log4j2.xml | 8 ++
.../src/main/resources/logback.xml | 12 +++
.../e2e/e2e-test/docker/kafka/Dockerfile.fluentd | 7 +-
.../e2e-test/docker/kafka/docker-compose.log.yml | 50 +++++++++++-
test/e2e/e2e-test/docker/kafka/filebeat.yml | 91 ++++++++++++++++++++++
test/e2e/e2e-test/docker/kafka/fluentd.conf | 66 ++++++++++++++++
.../apache/skywalking/e2e/kafka/KafkaLogE2E.java | 31 ++++++++
20 files changed, 398 insertions(+), 50 deletions(-)
copy oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/{AbstractKafkaHandler.java => JsonLogHandler.java} (53%)
copy test/e2e/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/controller/{LogController.java => FileLogController.java} (76%)
copy oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine => test/e2e/e2e-test/docker/kafka/Dockerfile.fluentd (88%)
create mode 100644 test/e2e/e2e-test/docker/kafka/filebeat.yml
create mode 100644 test/e2e/e2e-test/docker/kafka/fluentd.conf