Merge pull request #124 from SumoLogic/migrate-to-configmap

Migrate FluentD Conf files to ConfigMap to make customizing FluentD conf simpler.
SumoLogic · Apr 18, 2019 · 9a43996 · 9a43996
2 parents fe88519 + 9a1789b
commit 9a43996
Show file tree

Hide file tree

Showing 13 changed files with 2,927 additions and 1,439 deletions.
diff --git 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
diff --git a/conf.d/file/source.docker.conf b/conf.d/file/source.docker.conf
diff --git a/conf.d/file/source.kubernetes.conf b/conf.d/file/source.kubernetes.conf
diff --git a/conf.d/forward/.gitignore b/conf.d/forward/.gitignore
diff --git a/conf.d/out.sumo.conf b/conf.d/out.sumo.conf
diff --git a/conf.d/systemd/source.containers.conf b/conf.d/systemd/source.containers.conf