fix: 彻底去掉原有脚本方式启动

filebeat.Dockerfile

@@ -1,24 +1,21 @@
 FROM tkp/base/centos-base
 
-
 ADD assets/filebeat/filebeat.tar.gz /tmp/
 ENV FILEBEAT_VERSION=5.6.9
 
-RUN mkdir /var/log/filebeat /var/lib/filebeat && \
-    mkdir -p /etc/filebeat /var/lib/filebeat /var/log/filebeat && \
+RUN mkdir -p /etc/filebeat /var/lib/filebeat /var/log/filebeat && \
     cp -rf /tmp/filebeat-${FILEBEAT_VERSION}-linux-x86_64/filebeat /usr/bin/ && \
     cp -rf /tmp/filebeat-${FILEBEAT_VERSION}-linux-x86_64/module /etc/filebeat/ && \
     cp -rf /tmp/filebeat-${FILEBEAT_VERSION}-linux-x86_64/filebeat.*.json /etc/filebeat/ && \
     cp -rf /tmp/filebeat-${FILEBEAT_VERSION}-linux-x86_64/scripts /etc/filebeat/ && \
     rm -rf /tmp/filebeat-${FILEBEAT_VERSION}-linux-x86_64.tar.gz /tmp/filebeat-${FILEBEAT_VERSION}-linux-x86_64
 
 COPY ./log-pilot /pilot/pilot
-COPY assets/entrypoint assets/filebeat/ /pilot/
+COPY assets/filebeat/ /pilot/
 
 VOLUME /var/log/filebeat
 VOLUME /var/lib/filebeat
 
 WORKDIR /pilot/
 ENV PILOT_TYPE=filebeat FILEBEAT_OUTPUT=console CONSOLE_PRETTY=true
-#ENTRYPOINT ["/pilot/entrypoint"]
 ENTRYPOINT ["/pilot/pilot"]

log-pilot.go

@@ -34,14 +34,10 @@ func main() {
 	logLevel, _ := log.ParseLevel(*level)
 	log.SetLevel(logLevel)
 
-	// 生成filebeat主配置文件
 	if err := pilot.CreateFileBeatCfg(); err != nil {
 		log.Fatal("can't make filebeat.yml. ", err)
 	}
 
-
-	// mount point 配置
-	// 主要是 umount 一下
 	if err := pilot.ConfigDockerMountPoint(); err != nil {
 		log.Fatal("can't config mount point.", err)
 	}

pilot/docker-mount.go

@@ -9,6 +9,9 @@ import (
 
 const proc_mount_file = "/proc/self/mountinfo"
 
+
+// mount point 配置
+// 主要是 umount 一下
 func ConfigDockerMountPoint() error {
 	for _, mp := range mountPoints() {
 		if err := mp.umount(); err != nil {

pilot/filebeat-config.go

@@ -56,14 +56,39 @@ output.kafka:
 `
 
 const TPL_REDIS = `
+output.redis:
+    hosts: ["$REDIS_HOST:$REDIS_PORT"]
+    key: "%{[fields.topic]:filebeat}"
+    ${REDIS_WORKER:+worker: ${REDIS_WORKER}}
+    ${REDIS_PASSWORD:+password: ${REDIS_PASSWORD}}
+    ${REDIS_DATATYPE:+datatype: ${REDIS_DATATYPE}}
+    ${REDIS_LOADBALANCE:+loadbalance: ${REDIS_LOADBALANCE}}
+    ${REDIS_TIMEOUT:+timeout: ${REDIS_TIMEOUT}}
+    ${REDIS_BULK_MAX_SIZE:+bulk_max_size: ${REDIS_BULK_MAX_SIZE}}
 `
 const TPL_ES = `
+output.elasticsearch:
+    hosts: ["$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT"]
+    index: ${FILEBEAT_INDEX:-filebeat}-%{+yyyy.MM.dd}
+    ${ELASTICSEARCH_SCHEME:+protocol: ${ELASTICSEARCH_SCHEME}}
+    ${ELASTICSEARCH_USER:+username: ${ELASTICSEARCH_USER}}
+    ${ELASTICSEARCH_PASSWORD:+password: ${ELASTICSEARCH_PASSWORD}}
+    ${ELASTICSEARCH_WORKER:+worker: ${ELASTICSEARCH_WORKER}}
+    ${ELASTICSEARCH_PATH:+path: ${ELASTICSEARCH_PATH}}
+    ${ELASTICSEARCH_BULK_MAX_SIZE:+bulk_max_size: ${ELASTICSEARCH_BULK_MAX_SIZE}}
 `
 
 const TPL_LS = `
-
+output.logstash:
+    hosts: ["$LOGSTASH_HOST:$LOGSTASH_PORT"]
+    index: ${FILEBEAT_INDEX:-filebeat}-%{+yyyy.MM.dd}
+    ${LOGSTASH_WORKER:+worker: ${LOGSTASH_WORKER}}
+    ${LOGSTASH_LOADBALANCE:+loadbalance: ${LOGSTASH_LOADBALANCE}}
+    ${LOGSTASH_BULK_MAX_SIZE:+bulk_max_size: ${LOGSTASH_BULK_MAX_SIZE}}
+    ${LOGSTASH_SLOW_START:+slow_start: ${LOGSTASH_SLOW_START}}
 `
 
+// 生成filebeat主配置文件
 func CreateFileBeatCfg() error {
 	os.Mkdir("/etc/filebeat/prospectors.d", 0666)