Apply fluentd v1.3.2 change to images

Signed-off-by: Masahiro Nakagawa <repeatedly@gmail.com>
fluent · Dec 16, 2018 · d2d32ad · d2d32ad
1 parent cbec62f
commit d2d32ad
Show file tree

Hide file tree

Showing 53 changed files with 167 additions and 154 deletions.
diff --git a/docker-image/v1.3/debian-cloudwatch/Dockerfile b/docker-image/v1.3/debian-cloudwatch/Dockerfile
@@ -1,7 +1,7 @@
 # AUTOMATICALLY GENERATED
 # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb
 
-FROM fluent/fluentd:v1.3.1-debian
+FROM fluent/fluentd:v1.3.2-debian
 
 LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
 USER root

diff --git a/docker-image/v1.3/debian-cloudwatch/Gemfile b/docker-image/v1.3/debian-cloudwatch/Gemfile
@@ -3,7 +3,7 @@
 
 source "https://rubygems.org"
 
-gem "fluentd", "1.3.1"
+gem "fluentd", "1.3.2"
 gem "oj", "3.5.1"
 gem "fluent-plugin-rewrite-tag-filter", "~> 2.1.0"
 gem "aws-sdk-cloudwatchlogs", "~> 1.0"

diff --git a/docker-image/v1.3/debian-cloudwatch/Gemfile.lock b/docker-image/v1.3/debian-cloudwatch/Gemfile.lock
@@ -1,25 +1,25 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.119.0)
+    aws-partitions (1.125.0)
     aws-sdk-cloudwatchlogs (1.12.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.41.0)
+    aws-sdk-core (3.44.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
     aws-sigv4 (1.0.3)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     cool.io (1.5.3)
     dig_rb (1.0.1)
     domain_name (0.5.20180417)
@@ -30,7 +30,7 @@ GEM
     fluent-plugin-cloudwatch-logs (0.6.1)
       aws-sdk-cloudwatchlogs (~> 1.0)
       fluentd (>= 0.14.15)
-    fluent-plugin-kubernetes_metadata_filter (2.1.5)
+    fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
       kubeclient (~> 1.1.4)
       lru_redux
@@ -40,7 +40,7 @@ GEM
     fluent-plugin-systemd (1.0.1)
       fluentd (>= 0.14.11, < 2)
       systemd-journal (~> 1.3.2)
-    fluentd (1.3.1)
+    fluentd (1.3.2)
       cool.io (>= 1.4.5, < 2.0.0)
       dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
@@ -60,7 +60,7 @@ GEM
       domain_name (~> 0.5)
     http-form_data (1.0.3)
     http_parser.rb (0.6.0)
-    i18n (1.1.1)
+    i18n (1.2.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     kubeclient (1.1.4)
@@ -108,7 +108,7 @@ DEPENDENCIES
   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.1)
+  fluentd (= 1.3.2)
   oj (= 3.5.1)
 
 BUNDLED WITH

diff --git a/docker-image/v1.3/debian-cloudwatch/hooks/post_push b/docker-image/v1.3/debian-cloudwatch/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.3.1-debian-cloudwatch,v1.3-debian-cloudwatch}; do
+for tag in {v1.3.2-debian-cloudwatch,v1.3-debian-cloudwatch}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 done
diff --git a/docker-image/v1.3/debian-elasticsearch/Dockerfile b/docker-image/v1.3/debian-elasticsearch/Dockerfile
@@ -1,7 +1,7 @@
 # AUTOMATICALLY GENERATED
 # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb
 
-FROM fluent/fluentd:v1.3.1-debian
+FROM fluent/fluentd:v1.3.2-debian
 
 LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
 USER root

diff --git a/docker-image/v1.3/debian-elasticsearch/Gemfile b/docker-image/v1.3/debian-elasticsearch/Gemfile
@@ -3,7 +3,7 @@
 
 source "https://rubygems.org"
 
-gem "fluentd", "1.3.1"
+gem "fluentd", "1.3.2"
 gem "oj", "3.5.1"
 gem "fluent-plugin-rewrite-tag-filter", "~> 2.1.0"
 gem "fluent-plugin-elasticsearch", "~> 2.11.0"

diff --git a/docker-image/v1.3/debian-elasticsearch/Gemfile.lock b/docker-image/v1.3/debian-elasticsearch/Gemfile.lock
@@ -1,14 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     cool.io (1.5.3)
     dig_rb (1.0.1)
     domain_name (0.5.20180417)
@@ -31,7 +31,7 @@ GEM
       elasticsearch
       excon
       fluentd (>= 0.14.20)
-    fluent-plugin-kubernetes_metadata_filter (2.1.5)
+    fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
       kubeclient (~> 1.1.4)
       lru_redux
@@ -41,7 +41,7 @@ GEM
     fluent-plugin-systemd (1.0.1)
       fluentd (>= 0.14.11, < 2)
       systemd-journal (~> 1.3.2)
-    fluentd (1.3.1)
+    fluentd (1.3.2)
       cool.io (>= 1.4.5, < 2.0.0)
       dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
@@ -61,7 +61,7 @@ GEM
       domain_name (~> 0.5)
     http-form_data (1.0.3)
     http_parser.rb (0.6.0)
-    i18n (1.1.1)
+    i18n (1.2.0)
       concurrent-ruby (~> 1.0)
     kubeclient (1.1.4)
       activesupport
@@ -109,7 +109,7 @@ DEPENDENCIES
   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.1)
+  fluentd (= 1.3.2)
   oj (= 3.5.1)
 
 BUNDLED WITH

diff --git a/docker-image/v1.3/debian-elasticsearch/conf/fluent.conf b/docker-image/v1.3/debian-elasticsearch/conf/fluent.conf
@@ -12,6 +12,7 @@
    include_tag_key true
    host "#{ENV['FLUENT_ELASTICSEARCH_HOST']}"
    port "#{ENV['FLUENT_ELASTICSEARCH_PORT']}"
+   path "#{ENV['FLUENT_ELASTICSEARCH_PATH']}"
    scheme "#{ENV['FLUENT_ELASTICSEARCH_SCHEME'] || 'http'}"
    ssl_verify "#{ENV['FLUENT_ELASTICSEARCH_SSL_VERIFY'] || 'true'}"
    user "#{ENV['FLUENT_ELASTICSEARCH_USER']}"

diff --git a/docker-image/v1.3/debian-elasticsearch/hooks/post_push b/docker-image/v1.3/debian-elasticsearch/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.3.1-debian-elasticsearch,v1.3-debian-elasticsearch}; do
+for tag in {v1.3.2-debian-elasticsearch,v1.3-debian-elasticsearch}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 done
diff --git a/docker-image/v1.3/debian-gcs/Dockerfile b/docker-image/v1.3/debian-gcs/Dockerfile
@@ -1,7 +1,7 @@
 # AUTOMATICALLY GENERATED
 # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb
 
-FROM fluent/fluentd:v1.3.1-debian
+FROM fluent/fluentd:v1.3.2-debian
 
 LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
 USER root

diff --git a/docker-image/v1.3/debian-gcs/Gemfile b/docker-image/v1.3/debian-gcs/Gemfile
@@ -3,7 +3,7 @@
 
 source "https://rubygems.org"
 
-gem "fluentd", "1.3.1"
+gem "fluentd", "1.3.2"
 gem "oj", "3.5.1"
 gem "fluent-plugin-rewrite-tag-filter", "~> 2.1.0"
 gem "fluent-plugin-gcs", "0.4.0.beta1"

diff --git a/docker-image/v1.3/debian-gcs/Gemfile.lock b/docker-image/v1.3/debian-gcs/Gemfile.lock
@@ -1,14 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     cool.io (1.5.3)
     declarative (0.0.10)
     declarative-option (0.1.0)
@@ -24,7 +24,7 @@ GEM
     fluent-plugin-gcs (0.4.0.beta1)
       fluentd (>= 0.14.0, < 2)
       google-cloud-storage (~> 1.1.0)
-    fluent-plugin-kubernetes_metadata_filter (2.1.5)
+    fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
       kubeclient (~> 1.1.4)
       lru_redux
@@ -34,7 +34,7 @@ GEM
     fluent-plugin-systemd (1.0.1)
       fluentd (>= 0.14.11, < 2)
       systemd-journal (~> 1.3.2)
-    fluentd (1.3.1)
+    fluentd (1.3.2)
       cool.io (>= 1.4.5, < 2.0.0)
       dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
@@ -77,7 +77,7 @@ GEM
     http-form_data (1.0.3)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    i18n (1.1.1)
+    i18n (1.2.0)
       concurrent-ruby (~> 1.0)
     jwt (2.1.0)
     kubeclient (1.1.4)
@@ -139,7 +139,7 @@ DEPENDENCIES
   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.1)
+  fluentd (= 1.3.2)
   oj (= 3.5.1)
 
 BUNDLED WITH

diff --git a/docker-image/v1.3/debian-gcs/hooks/post_push b/docker-image/v1.3/debian-gcs/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.3.1-debian-gcs,v1.3-debian-gcs}; do
+for tag in {v1.3.2-debian-gcs,v1.3-debian-gcs}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 done
diff --git a/docker-image/v1.3/debian-graylog/Dockerfile b/docker-image/v1.3/debian-graylog/Dockerfile
@@ -1,7 +1,7 @@
 # AUTOMATICALLY GENERATED
 # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb
 
-FROM fluent/fluentd:v1.3.1-debian
+FROM fluent/fluentd:v1.3.2-debian
 
 LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
 USER root

diff --git a/docker-image/v1.3/debian-graylog/Gemfile b/docker-image/v1.3/debian-graylog/Gemfile
@@ -3,7 +3,7 @@
 
 source "https://rubygems.org"
 
-gem "fluentd", "1.3.1"
+gem "fluentd", "1.3.2"
 gem "oj", "3.5.1"
 gem "fluent-plugin-rewrite-tag-filter", "~> 2.1.0"
 gem "gelf", "3.0.0"

diff --git a/docker-image/v1.3/debian-graylog/Gemfile.lock b/docker-image/v1.3/debian-graylog/Gemfile.lock
@@ -1,14 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     cool.io (1.5.3)
     dig_rb (1.0.1)
     domain_name (0.5.20180417)
@@ -19,7 +19,7 @@ GEM
     fluent-plugin-gelf-hs (1.0.7)
       fluentd
       gelf (>= 2.0.0)
-    fluent-plugin-kubernetes_metadata_filter (2.1.5)
+    fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
       kubeclient (~> 1.1.4)
       lru_redux
@@ -29,7 +29,7 @@ GEM
     fluent-plugin-systemd (1.0.1)
       fluentd (>= 0.14.11, < 2)
       systemd-journal (~> 1.3.2)
-    fluentd (1.3.1)
+    fluentd (1.3.2)
       cool.io (>= 1.4.5, < 2.0.0)
       dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
@@ -51,7 +51,7 @@ GEM
       domain_name (~> 0.5)
     http-form_data (1.0.3)
     http_parser.rb (0.6.0)
-    i18n (1.1.1)
+    i18n (1.2.0)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     kubeclient (1.1.4)
@@ -98,7 +98,7 @@ DEPENDENCIES
   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.1)
+  fluentd (= 1.3.2)
   gelf (= 3.0.0)
   oj (= 3.5.1)
 

diff --git a/docker-image/v1.3/debian-graylog/hooks/post_push b/docker-image/v1.3/debian-graylog/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.3.1-debian-graylog,v1.3-debian-graylog,debian-stable-graylog}; do
+for tag in {v1.3.2-debian-graylog,v1.3-debian-graylog,debian-stable-graylog}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 done
diff --git a/docker-image/v1.3/debian-kafka/Dockerfile b/docker-image/v1.3/debian-kafka/Dockerfile
@@ -1,7 +1,7 @@
 # AUTOMATICALLY GENERATED
 # DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb
 
-FROM fluent/fluentd:v1.3.1-debian
+FROM fluent/fluentd:v1.3.2-debian
 
 LABEL maintainer="Eduardo Silva <eduardo@treasure-data.com>"
 USER root

diff --git a/docker-image/v1.3/debian-kafka/Gemfile b/docker-image/v1.3/debian-kafka/Gemfile
@@ -3,7 +3,7 @@
 
 source "https://rubygems.org"
 
-gem "fluentd", "1.3.1"
+gem "fluentd", "1.3.2"
 gem "oj", "3.5.1"
 gem "fluent-plugin-rewrite-tag-filter", "~> 2.1.0"
 gem "fluent-plugin-kafka", "~> 0.7.9"