diff --git a/Dockerfile b/Dockerfile index 8f8af76..1f075ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,8 +30,7 @@ ENV PATH /home/fluent/.gem/ruby/2.3.0/bin:$PATH RUN mkdir -p /mnt/pos EXPOSE 24284 -RUN mkdir -p /fluentd/conf.d && \ - mkdir -p /fluentd/etc && \ +RUN mkdir -p /fluentd/etc && \ mkdir -p /fluentd/plugins # Default settings @@ -66,8 +65,6 @@ ENV FORWARD_INPUT_BIND "0.0.0.0" ENV FORWARD_INPUT_PORT "24224" COPY --from=builder /var/lib/gems /var/lib/gems -COPY ./conf.d/ /fluentd/conf.d/ -COPY ./etc/* /fluentd/etc/ COPY ./entrypoint.sh /fluentd/ ENTRYPOINT ["/fluentd/entrypoint.sh"] diff --git a/conf.d/file/source.containers.conf b/conf.d/file/source.containers.conf deleted file mode 100644 index 64b48cd..0000000 --- a/conf.d/file/source.containers.conf +++ /dev/null @@ -1,64 +0,0 @@ - - @type tail - format json - time_key "#{ENV['TIME_KEY']}" - path "#{ENV['CONTAINER_LOGS_PATH']}" - exclude_path "#{ENV['EXCLUDE_PATH']}" - pos_file /mnt/pos/ggcp-containers.log.pos - time_format %Y-%m-%dT%H:%M:%S.%NZ - tag containers.* - read_from_head "#{ENV['READ_FROM_HEAD']}" - enable_stat_watcher "#{ENV['ENABLE_STAT_WATCHER']}" - - - - @type concat - key log - multiline_start_regexp "#{ENV['MULTILINE_START_REGEXP']}" - separator "#{ENV['CONCAT_SEPARATOR']}" - timeout_label @NORMAL - - - - @type relabel - @label @NORMAL - - - \ No newline at end of file diff --git a/conf.d/file/source.docker.conf b/conf.d/file/source.docker.conf deleted file mode 100644 index 934a26c..0000000 --- a/conf.d/file/source.docker.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Examples: -# time="2016-02-04T06:51:03.053580605Z" level=info msg="GET /containers/json" -# time="2016-02-04T07:53:57.505612354Z" level=error msg="HTTP Error" err="No such image: -f" statusCode=404 - - @type tail - format /^time="(?