Apply @include conf.d/* change

Signed-off-by: Masahiro Nakagawa <[email protected]>
fluent · Dec 16, 2018 · 2d0ee98 · 2d0ee98
1 parent 2bf1b46
commit 2d0ee98
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 0 deletions.
diff --git a/docker-image/v1.3/debian-cloudwatch/conf/fluent.conf b/docker-image/v1.3/debian-cloudwatch/conf/fluent.conf
@@ -4,6 +4,7 @@
 
 @include systemd.conf
 @include kubernetes.conf
+@include conf.d/*.conf
 
 <match **>
   @type cloudwatch_logs

diff --git a/docker-image/v1.3/debian-elasticsearch/conf/fluent.conf b/docker-image/v1.3/debian-elasticsearch/conf/fluent.conf
@@ -4,6 +4,7 @@
 
 @include systemd.conf
 @include kubernetes.conf
+@include conf.d/*.conf
 
 <match **>
    @type elasticsearch

diff --git a/docker-image/v1.3/debian-gcs/conf/fluent.conf b/docker-image/v1.3/debian-gcs/conf/fluent.conf
@@ -4,6 +4,7 @@
 
 @include systemd.conf
 @include kubernetes.conf
+@include conf.d/*.conf
 
 <match **>
   # docs: https://github.com/daichirata/fluent-plugin-gcs

diff --git a/docker-image/v1.3/debian-graylog/conf/fluent.conf b/docker-image/v1.3/debian-graylog/conf/fluent.conf
@@ -4,6 +4,7 @@
 
 @include systemd.conf
 @include kubernetes.conf
+@include conf.d/*.conf
 
 <match **>
    @type gelf

diff --git a/docker-image/v1.3/debian-kafka/conf/fluent.conf b/docker-image/v1.3/debian-kafka/conf/fluent.conf
@@ -4,6 +4,7 @@
 
 @include systemd.conf
 @include kubernetes.conf
+@include conf.d/*.conf
 
 <match **>
   @type kafka_buffered

diff --git a/docker-image/v1.3/debian-kinesis/conf/fluent.conf b/docker-image/v1.3/debian-kinesis/conf/fluent.conf
@@ -4,6 +4,7 @@
 
 @include systemd.conf
 @include kubernetes.conf
+@include conf.d/*.conf
 
 <match **>
   @type kinesis_streams

diff --git a/docker-image/v1.3/debian-logentries/conf/fluent.conf b/docker-image/v1.3/debian-logentries/conf/fluent.conf
@@ -4,6 +4,7 @@
 
 @include systemd.conf
 @include kubernetes.conf
+@include conf.d/*.conf
 
 <match **>
    @type logentries

diff --git a/docker-image/v1.3/debian-loggly/conf/fluent.conf b/docker-image/v1.3/debian-loggly/conf/fluent.conf
@@ -4,6 +4,7 @@
 
 @include systemd.conf
 @include kubernetes.conf
+@include conf.d/*.conf
 
 <match **>
    @type loggly

diff --git a/docker-image/v1.3/debian-logzio/conf/fluent.conf b/docker-image/v1.3/debian-logzio/conf/fluent.conf
@@ -4,6 +4,7 @@
 
 @include systemd.conf
 @include kubernetes.conf
+@include conf.d/*.conf
 
 <match **>
   @type logzio_buffered

diff --git a/docker-image/v1.3/debian-papertrail/conf/fluent.conf b/docker-image/v1.3/debian-papertrail/conf/fluent.conf
@@ -4,6 +4,7 @@
 
 @include systemd.conf
 @include kubernetes.conf
+@include conf.d/*.conf
 
 
 ## Capture audit logs

diff --git a/docker-image/v1.3/debian-s3/conf/fluent.conf b/docker-image/v1.3/debian-s3/conf/fluent.conf
@@ -4,6 +4,7 @@
 
 @include systemd.conf
 @include kubernetes.conf
+@include conf.d/*.conf
 
 <match **>
   # docs: https://docs.fluentd.org/v0.12/articles/out_s3

diff --git a/docker-image/v1.3/debian-stackdriver/conf/fluent.conf b/docker-image/v1.3/debian-stackdriver/conf/fluent.conf
@@ -4,6 +4,7 @@
 
 @include systemd.conf
 @include kubernetes.conf
+@include conf.d/*.conf
 
 <match **>
   @type google_cloud

diff --git a/docker-image/v1.3/debian-syslog/conf/fluent.conf b/docker-image/v1.3/debian-syslog/conf/fluent.conf
@@ -4,6 +4,7 @@
 
 @include systemd.conf
 @include kubernetes.conf
+@include conf.d/*.conf
 
 <match **>
   @type kubernetes_remote_syslog