update filebeat plugin and test example

AliyunContainerService · Jul 25, 2018 · b213444 · b213444
1 parent 1ba208a
commit b213444
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 3 deletions.
diff --git a/Dockerfile.filebeat b/Dockerfile.filebeat
@@ -11,7 +11,7 @@ RUN go install
 
 FROM alpine:3.6
 
-ENV FILEBEAT_VERSION=6.1.1-2
+ENV FILEBEAT_VERSION=6.1.1-3
 COPY assets/glibc/glibc-2.26-r0.apk /tmp/
 RUN apk update && \ 
     apk add python && \

diff --git a/assets/filebeat/config.filebeat b/assets/filebeat/config.filebeat
@@ -30,6 +30,9 @@ filebeat.registry_file: /var/lib/filebeat/registry
 filebeat.shutdown_timeout: ${FILEBEAT_SHUTDOWN_TIMEOUT:-0}
 logging.level: ${FILEBEAT_LOG_LEVEL:-info}
 logging.metrics.enabled: ${FILEBEAT_METRICS_ENABLED:-false}
+logging.files.rotateeverybytes: ${FILEBEAT_LOG_MAX_SIZE:-104857600}
+logging.files.keepfiles: ${FILEBEAT_LOG_MAX_FILE:-10}
+logging.files.permissions: ${FILEBEAT_LOG_PERMISSION:-0600}
 ${FILEBEAT_MAX_PROCS:+max_procs: ${FILEBEAT_MAX_PROCS}}
 setup.template.name: "${FILEBEAT_INDEX:-filebeat}"
 setup.template.pattern: "${FILEBEAT_INDEX:-filebeat}-*"

diff --git a/quickstart/filebeat/busybox.yml b/quickstart/filebeat/busybox.yml
@@ -0,0 +1,10 @@
+busybox:
+  image: busybox
+  restart: always
+  labels:
+    aliyun.logs.busybox: stdout
+    aliyun.logs.busybox.tags: app=busybox,stage=test
+  command: ['ping', 'localhost']
+  log_opt:
+    max-size: '10k'
+    max-file: '2'
diff --git a/quickstart/filebeat/run b/quickstart/filebeat/run
@@ -46,10 +46,12 @@ done
 blue "\nCleanup"
 docker-compose -p tomcat -f tomcat.yml down
 docker-compose -p tomcat2 -f tomcat2.yml down
+#docker-compose -p busybox -f busybox.yml down
 
 blue "Starting tomcat"
 docker-compose -p tomcat -f tomcat.yml up -d
 docker-compose -p tomcat2 -f tomcat2.yml up -d
+#docker-compose -p busybox -f busybox.yml up -d
 
 pwd=$(pwd)
 project=$(basename $pwd)

diff --git a/quickstart/filebeat/tomcat.yml b/quickstart/filebeat/tomcat.yml
@@ -4,7 +4,7 @@ tomcat:
     - "8080"
   restart: always
   volumes:
-    - /tmp/tomcat:/usr/local/tomcat/logs
+    - /tomcat:/usr/local/tomcat/logs
   labels:
     aliyun.logs.catalina: stdout
     aliyun.logs.catalina.tags: app=tomcat,stage=test

diff --git a/quickstart/filebeat/tomcat2.yml b/quickstart/filebeat/tomcat2.yml
@@ -4,7 +4,7 @@ tomcat2:
     - "8080"
   restart: always
   volumes:
-    - /tmp/tomcat:/usr/local/tomcat/logs
+    - /tomcat:/usr/local/tomcat/logs
   labels:
     aliyun.logs.catalina: stdout
     aliyun.logs.catalina.tags: app=tomcat2,stage=test