Add fluent-plugin-concat to all docker images

See https://github.com/fluent-plugins-nursery/fluent-plugin-concat for details
inoxio · Feb 2, 2019 · 7254073 · 7254073
1 parent 04d141d
commit 7254073
Show file tree

Hide file tree

Showing 28 changed files with 70 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@
 
 ## Supported tags and respective `Dockerfile` links
 
+See also dockerhub tags page: https://hub.docker.com/r/fluent/fluentd-kubernetes-daemonset/tags
 
 ### Debian
 
@@ -98,7 +99,7 @@ You can suppress these messages by setting `disable` to `FLUENTD_SYSTEMD_CONF` e
 ### Disable sed execution on elasticsearch image
 
 By historical reason, elasaticsearch image executes `sed` command during startup phase when `FLUENT_ELASTICSEARCH_USER` or `FLUENT_ELASTICSEARCH_PASSWORD` is specified. This sometimes causes a problem with read only mount.
-To avoid this problem, set "true" to `FLUENT_ELASTICSEARCH_SED_DISABLE` environment variable.
+To avoid this problem, set "true" to `FLUENT_ELASTICSEARCH_SED_DISABLE` environment variable in your kubernetes configuration.
 
 ## Maintainers
 

diff --git a/docker-image/v1.3/debian-cloudwatch/Gemfile b/docker-image/v1.3/debian-cloudwatch/Gemfile
@@ -11,3 +11,4 @@ gem "fluent-plugin-cloudwatch-logs", "~> 0.7.2"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"
 gem "fluent-plugin-systemd", "~> 1.0.1"
+gem 'fluent-plugin-concat'
diff --git a/docker-image/v1.3/debian-cloudwatch/Gemfile.lock b/docker-image/v1.3/debian-cloudwatch/Gemfile.lock
@@ -27,9 +27,11 @@ GEM
     ffi (1.10.0)
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
-    fluent-plugin-cloudwatch-logs (0.7.2)
+    fluent-plugin-cloudwatch-logs (0.7.3)
       aws-sdk-cloudwatchlogs (~> 1.0)
       fluentd (>= 0.14.15)
+    fluent-plugin-concat (2.3.0)
+      fluentd (>= 0.14.0, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
       kubeclient (~> 1.1.4)
@@ -105,11 +107,12 @@ DEPENDENCIES
   aws-sdk-cloudwatchlogs (~> 1.0)
   ffi
   fluent-plugin-cloudwatch-logs (~> 0.7.2)
+  fluent-plugin-concat
   fluent-plugin-kubernetes_metadata_filter (~> 2.1.4)
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
   fluent-plugin-systemd (~> 1.0.1)
   fluentd (= 1.3.3)
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-elasticsearch/Gemfile b/docker-image/v1.3/debian-elasticsearch/Gemfile
@@ -10,3 +10,4 @@ gem "fluent-plugin-elasticsearch", "~> 2.11.0"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"
 gem "fluent-plugin-systemd", "~> 1.0.1"
+gem 'fluent-plugin-concat'
diff --git a/docker-image/v1.3/debian-elasticsearch/Gemfile.lock b/docker-image/v1.3/debian-elasticsearch/Gemfile.lock
@@ -27,6 +27,8 @@ GEM
     ffi (1.10.0)
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
+    fluent-plugin-concat (2.3.0)
+      fluentd (>= 0.14.0, < 2)
     fluent-plugin-elasticsearch (2.11.11)
       elasticsearch
       excon
@@ -105,6 +107,7 @@ PLATFORMS
 
 DEPENDENCIES
   ffi
+  fluent-plugin-concat
   fluent-plugin-elasticsearch (~> 2.11.0)
   fluent-plugin-kubernetes_metadata_filter (~> 2.1.4)
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
@@ -113,4 +116,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-gcs/Gemfile b/docker-image/v1.3/debian-gcs/Gemfile
@@ -10,3 +10,4 @@ gem "fluent-plugin-gcs", "0.4.0.beta1"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"
 gem "fluent-plugin-systemd", "~> 1.0.1"
+gem 'fluent-plugin-concat'
diff --git a/docker-image/v1.3/debian-gcs/Gemfile.lock b/docker-image/v1.3/debian-gcs/Gemfile.lock
@@ -21,6 +21,8 @@ GEM
     ffi (1.10.0)
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
+    fluent-plugin-concat (2.3.0)
+      fluentd (>= 0.14.0, < 2)
     fluent-plugin-gcs (0.4.0.beta1)
       fluentd (>= 0.14.0, < 2)
       google-cloud-storage (~> 1.1.0)
@@ -52,7 +54,7 @@ GEM
       mime-types (>= 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    google-cloud-core (1.2.7)
+    google-cloud-core (1.3.0)
       google-cloud-env (~> 1.0)
     google-cloud-env (1.0.5)
       faraday (~> 0.11)
@@ -135,6 +137,7 @@ PLATFORMS
 
 DEPENDENCIES
   ffi
+  fluent-plugin-concat
   fluent-plugin-gcs (= 0.4.0.beta1)
   fluent-plugin-kubernetes_metadata_filter (~> 2.1.4)
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
@@ -143,4 +146,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-graylog/Gemfile b/docker-image/v1.3/debian-graylog/Gemfile
@@ -11,3 +11,4 @@ gem "fluent-plugin-gelf-hs", "~> 1.0.7"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"
 gem "fluent-plugin-systemd", "~> 1.0.1"
+gem 'fluent-plugin-concat'
diff --git a/docker-image/v1.3/debian-graylog/Gemfile.lock b/docker-image/v1.3/debian-graylog/Gemfile.lock
@@ -16,6 +16,8 @@ GEM
     ffi (1.10.0)
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
+    fluent-plugin-concat (2.3.0)
+      fluentd (>= 0.14.0, < 2)
     fluent-plugin-gelf-hs (1.0.8)
       fluentd
       gelf (>= 2.0.0)
@@ -94,6 +96,7 @@ PLATFORMS
 
 DEPENDENCIES
   ffi
+  fluent-plugin-concat
   fluent-plugin-gelf-hs (~> 1.0.7)
   fluent-plugin-kubernetes_metadata_filter (~> 2.1.4)
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
@@ -103,4 +106,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-kafka/Gemfile b/docker-image/v1.3/debian-kafka/Gemfile
@@ -10,3 +10,4 @@ gem "fluent-plugin-kafka", "~> 0.7.9"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"
 gem "fluent-plugin-systemd", "~> 1.0.1"
+gem 'fluent-plugin-concat'
diff --git a/docker-image/v1.3/debian-kafka/Gemfile.lock b/docker-image/v1.3/debian-kafka/Gemfile.lock
@@ -16,6 +16,8 @@ GEM
     ffi (1.10.0)
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
+    fluent-plugin-concat (2.3.0)
+      fluentd (>= 0.14.0, < 2)
     fluent-plugin-kafka (0.7.9)
       fluentd (>= 0.10.58, < 2)
       ltsv
@@ -94,6 +96,7 @@ PLATFORMS
 
 DEPENDENCIES
   ffi
+  fluent-plugin-concat
   fluent-plugin-kafka (~> 0.7.9)
   fluent-plugin-kubernetes_metadata_filter (~> 2.1.4)
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
@@ -102,4 +105,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-kinesis/Gemfile b/docker-image/v1.3/debian-kinesis/Gemfile
@@ -10,3 +10,4 @@ gem "fluent-plugin-kinesis", "~> 2.1.1"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"
 gem "fluent-plugin-systemd", "~> 1.0.1"
+gem 'fluent-plugin-concat'
diff --git a/docker-image/v1.3/debian-kinesis/Gemfile.lock b/docker-image/v1.3/debian-kinesis/Gemfile.lock
@@ -713,6 +713,8 @@ GEM
     ffi (1.10.0)
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
+    fluent-plugin-concat (2.3.0)
+      fluentd (>= 0.14.0, < 2)
     fluent-plugin-kinesis (2.1.1)
       aws-sdk (>= 2.9.9, < 4)
       fluentd (>= 0.12.35, < 2)
@@ -791,6 +793,7 @@ PLATFORMS
 
 DEPENDENCIES
   ffi
+  fluent-plugin-concat
   fluent-plugin-kinesis (~> 2.1.1)
   fluent-plugin-kubernetes_metadata_filter (~> 2.1.4)
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
@@ -799,4 +802,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-logentries/Gemfile b/docker-image/v1.3/debian-logentries/Gemfile
@@ -10,3 +10,4 @@ gem "fluent-plugin-rewrite-tag-filter", "~> 2.1.0"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"
 gem "fluent-plugin-systemd", "~> 1.0.1"
+gem 'fluent-plugin-concat'
diff --git a/docker-image/v1.3/debian-logentries/Gemfile.lock b/docker-image/v1.3/debian-logentries/Gemfile.lock
@@ -16,6 +16,8 @@ GEM
     ffi (1.10.0)
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
+    fluent-plugin-concat (2.3.0)
+      fluentd (>= 0.14.0, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
       kubeclient (~> 1.1.4)
@@ -88,11 +90,12 @@ PLATFORMS
 
 DEPENDENCIES
   ffi
+  fluent-plugin-concat
   fluent-plugin-kubernetes_metadata_filter (~> 2.1.4)
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
   fluent-plugin-systemd (~> 1.0.1)
   fluentd (= 1.3.3)
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-loggly/Gemfile b/docker-image/v1.3/debian-loggly/Gemfile
@@ -10,3 +10,4 @@ gem "fluent-plugin-loggly", "~> 0.0.9"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"
 gem "fluent-plugin-systemd", "~> 1.0.1"
+gem 'fluent-plugin-concat'
diff --git a/docker-image/v1.3/debian-loggly/Gemfile.lock b/docker-image/v1.3/debian-loggly/Gemfile.lock
@@ -16,6 +16,8 @@ GEM
     ffi (1.10.0)
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
+    fluent-plugin-concat (2.3.0)
+      fluentd (>= 0.14.0, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
       kubeclient (~> 1.1.4)
@@ -92,6 +94,7 @@ PLATFORMS
 
 DEPENDENCIES
   ffi
+  fluent-plugin-concat
   fluent-plugin-kubernetes_metadata_filter (~> 2.1.4)
   fluent-plugin-loggly (~> 0.0.9)
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
@@ -100,4 +103,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-logzio/Gemfile b/docker-image/v1.3/debian-logzio/Gemfile
@@ -10,3 +10,4 @@ gem "fluent-plugin-logzio", "~> 0.0.18"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"
 gem "fluent-plugin-systemd", "~> 1.0.1"
+gem 'fluent-plugin-concat'
diff --git a/docker-image/v1.3/debian-logzio/Gemfile.lock b/docker-image/v1.3/debian-logzio/Gemfile.lock
@@ -16,6 +16,8 @@ GEM
     ffi (1.10.0)
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
+    fluent-plugin-concat (2.3.0)
+      fluentd (>= 0.14.0, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
       kubeclient (~> 1.1.4)
@@ -92,6 +94,7 @@ PLATFORMS
 
 DEPENDENCIES
   ffi
+  fluent-plugin-concat
   fluent-plugin-kubernetes_metadata_filter (~> 2.1.4)
   fluent-plugin-logzio (~> 0.0.18)
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
@@ -100,4 +103,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-papertrail/Gemfile b/docker-image/v1.3/debian-papertrail/Gemfile
@@ -10,3 +10,4 @@ gem "fluent-plugin-papertrail", "~> 0.2.6"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"
 gem "fluent-plugin-systemd", "~> 1.0.1"
+gem 'fluent-plugin-concat'
diff --git a/docker-image/v1.3/debian-papertrail/Gemfile.lock b/docker-image/v1.3/debian-papertrail/Gemfile.lock
@@ -19,6 +19,8 @@ GEM
     fluent-mixin-config-placeholders (0.4.0)
       fluentd
       uuidtools (>= 2.1.5)
+    fluent-plugin-concat (2.3.0)
+      fluentd (>= 0.14.0, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
       kubeclient (~> 1.1.4)
@@ -97,6 +99,7 @@ PLATFORMS
 
 DEPENDENCIES
   ffi
+  fluent-plugin-concat
   fluent-plugin-kubernetes_metadata_filter (~> 2.1.4)
   fluent-plugin-papertrail (~> 0.2.6)
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
@@ -105,4 +108,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-s3/Gemfile b/docker-image/v1.3/debian-s3/Gemfile
@@ -11,3 +11,4 @@ gem "fluent-plugin-s3", "~> 1.1.6"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"
 gem "fluent-plugin-systemd", "~> 1.0.1"
+gem 'fluent-plugin-concat'
diff --git a/docker-image/v1.3/debian-s3/Gemfile.lock b/docker-image/v1.3/debian-s3/Gemfile.lock
@@ -34,6 +34,8 @@ GEM
     ffi (1.10.0)
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
+    fluent-plugin-concat (2.3.0)
+      fluentd (>= 0.14.0, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
       kubeclient (~> 1.1.4)
@@ -112,6 +114,7 @@ PLATFORMS
 DEPENDENCIES
   aws-sdk-s3 (~> 1.0)
   ffi
+  fluent-plugin-concat
   fluent-plugin-kubernetes_metadata_filter (~> 2.1.4)
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
   fluent-plugin-s3 (~> 1.1.6)
@@ -120,4 +123,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-stackdriver/Gemfile b/docker-image/v1.3/debian-stackdriver/Gemfile
@@ -10,3 +10,4 @@ gem "fluent-plugin-google-cloud", "~> 0.4.10"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"
 gem "fluent-plugin-systemd", "~> 1.0.1"
+gem 'fluent-plugin-concat'
diff --git a/docker-image/v1.3/debian-stackdriver/Gemfile.lock b/docker-image/v1.3/debian-stackdriver/Gemfile.lock
@@ -23,6 +23,8 @@ GEM
     ffi (1.10.0)
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
+    fluent-plugin-concat (2.3.0)
+      fluentd (>= 0.14.0, < 2)
     fluent-plugin-google-cloud (0.4.10)
       fluentd (>= 0.10)
       google-api-client (~> 0.8.6)
@@ -132,6 +134,7 @@ PLATFORMS
 
 DEPENDENCIES
   ffi
+  fluent-plugin-concat
   fluent-plugin-google-cloud (~> 0.4.10)
   fluent-plugin-kubernetes_metadata_filter (~> 2.1.4)
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
@@ -140,4 +143,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/docker-image/v1.3/debian-syslog/Gemfile b/docker-image/v1.3/debian-syslog/Gemfile
@@ -10,3 +10,4 @@ gem "fluent-plugin-kubernetes_remote_syslog"
 gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.1.4"
 gem "ffi"
 gem "fluent-plugin-systemd", "~> 1.0.1"
+gem 'fluent-plugin-concat'
diff --git a/docker-image/v1.3/debian-syslog/Gemfile.lock b/docker-image/v1.3/debian-syslog/Gemfile.lock
@@ -24,6 +24,8 @@ GEM
       ltsv
     fluent-mixin-rewrite-tag-name (0.1.0)
       fluentd
+    fluent-plugin-concat (2.3.0)
+      fluentd (>= 0.14.0, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
       kubeclient (~> 1.1.4)
@@ -107,6 +109,7 @@ PLATFORMS
 
 DEPENDENCIES
   ffi
+  fluent-plugin-concat
   fluent-plugin-kubernetes_metadata_filter (~> 2.1.4)
   fluent-plugin-kubernetes_remote_syslog
   fluent-plugin-rewrite-tag-filter (~> 2.1.0)
@@ -115,4 +118,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/templates/Gemfile.erb b/templates/Gemfile.erb
@@ -100,4 +100,5 @@ gem "fluent-plugin-systemd", "~> 1.0.1"
 <% else %>
 gem "fluent-plugin-systemd"
 <% end %>
+gem 'fluent-plugin-concat'
 <% end %>