From 2d0ee98d9d75061ab8e28aca955a5677d6f22fb9 Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Sun, 16 Dec 2018 00:01:42 -0800 Subject: [PATCH] Apply `@include conf.d/*` change Signed-off-by: Masahiro Nakagawa --- docker-image/v1.3/debian-cloudwatch/conf/fluent.conf | 1 + docker-image/v1.3/debian-elasticsearch/conf/fluent.conf | 1 + docker-image/v1.3/debian-gcs/conf/fluent.conf | 1 + docker-image/v1.3/debian-graylog/conf/fluent.conf | 1 + docker-image/v1.3/debian-kafka/conf/fluent.conf | 1 + docker-image/v1.3/debian-kinesis/conf/fluent.conf | 1 + docker-image/v1.3/debian-logentries/conf/fluent.conf | 1 + docker-image/v1.3/debian-loggly/conf/fluent.conf | 1 + docker-image/v1.3/debian-logzio/conf/fluent.conf | 1 + docker-image/v1.3/debian-papertrail/conf/fluent.conf | 1 + docker-image/v1.3/debian-s3/conf/fluent.conf | 1 + docker-image/v1.3/debian-stackdriver/conf/fluent.conf | 1 + docker-image/v1.3/debian-syslog/conf/fluent.conf | 1 + 13 files changed, 13 insertions(+) diff --git a/docker-image/v1.3/debian-cloudwatch/conf/fluent.conf b/docker-image/v1.3/debian-cloudwatch/conf/fluent.conf index 0f0dbe04a..81ed3c7e9 100644 --- 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 @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 index 6bd3d522a..f6f23f1b6 100644 --- 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 @type elasticsearch diff --git a/docker-image/v1.3/debian-gcs/conf/fluent.conf b/docker-image/v1.3/debian-gcs/conf/fluent.conf index 4c417fb1c..944bf7827 100644 --- 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 # 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 index 582821d4d..4974c2222 100644 --- 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 @type gelf diff --git a/docker-image/v1.3/debian-kafka/conf/fluent.conf b/docker-image/v1.3/debian-kafka/conf/fluent.conf index c6558a594..b09cbfca5 100644 --- 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 @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 index 11fa58787..df39b9863 100644 --- 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 @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 index f39b837f8..db46e2d2c 100644 --- 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 @type logentries diff --git a/docker-image/v1.3/debian-loggly/conf/fluent.conf b/docker-image/v1.3/debian-loggly/conf/fluent.conf index e14b9f25b..dca07c24e 100644 --- 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 @type loggly diff --git a/docker-image/v1.3/debian-logzio/conf/fluent.conf b/docker-image/v1.3/debian-logzio/conf/fluent.conf index a8330fe89..3783cfed8 100644 --- 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 @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 index 1e6a0b022..f86245568 100644 --- 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 index d5ad2b798..52c7c5663 100644 --- 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 # 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 index c518ced12..a013ee44b 100644 --- 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 @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 index f3bcf36a6..4e923860c 100644 --- 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 @type kubernetes_remote_syslog