diff --git a/images/filebeat-log-collector.jpg b/images/filebeat-log-collector.jpg deleted file mode 100644 index 57d53ea8f..000000000 Binary files a/images/filebeat-log-collector.jpg and /dev/null differ diff --git a/manifests/test/filebeat-test.yaml b/manifests/test/filebeat-test.yaml index 006e63890..67fb8f4f8 100644 --- a/manifests/test/filebeat-test.yaml +++ b/manifests/test/filebeat-test.yaml @@ -59,6 +59,6 @@ data: - "/log/usermange/common/*" output.elasticsearch: hosts: ["172.23.5.255:9200"] - username: "elastic" - password: "changeme" - index: "filebeat-test" + username: "elastic" + password: "changeme" + index: "filebeat-test" diff --git a/practice/app-log-collection.md b/practice/app-log-collection.md index 10474b4ce..f5d8ffe4e 100644 --- a/practice/app-log-collection.md +++ b/practice/app-log-collection.md @@ -27,9 +27,9 @@ Kubernetes官方提供了EFK的日志收集解决方案,但是这种方案并 该方案在扩展性、个性化、部署和后期维护方面都能做到均衡,因此选择该方案。 -![logstash日志收集架构图](../images/filebeat-log-collector.jpg) +![logstash日志收集架构图](../images/filebeat-log-collector.png) -我们创建了自己的logstash镜像。创建过程和使用方式见https://github.com/rootsongjc/docker-images +我们创建了自己的filebeat镜像。创建过程和使用方式见https://github.com/rootsongjc/docker-images 镜像地址:`index.tenxcloud.com/jimmy/filebeat:5.4.0` @@ -114,7 +114,7 @@ data: 例如对filebeat的容器进行如下配置: -``` +```yaml containers: - image: sz-pg-oam-docker-hub-001.tendcloud.com/library/filebeat:5.4.0 name: filebeat