Reset

fluent · Oct 25, 2018 · f03300b · f03300b
1 parent 2656558
commit f03300b
Show file tree

Hide file tree

Showing 15 changed files with 464 additions and 473 deletions.
diff --git a/docker-image/v0.12/alpine-cloudwatch/Gemfile.lock b/docker-image/v0.12/alpine-cloudwatch/Gemfile.lock
@@ -1,19 +1,19 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.0)
       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.106.0)
-    aws-sdk-cloudwatchlogs (1.10.0)
-      aws-sdk-core (~> 3, >= 3.26.0)
+    aws-partitions (1.95.0)
+    aws-sdk-cloudwatchlogs (1.4.0)
+      aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.35.0)
+    aws-sdk-core (3.22.1)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
@@ -30,7 +30,7 @@ GEM
       aws-sdk-cloudwatchlogs (~> 1.0)
       fluent-mixin-config-placeholders (>= 0.2.0)
       fluentd
-    fluent-plugin-kubernetes_metadata_filter (1.2.1)
+    fluent-plugin-kubernetes_metadata_filter (1.1.0)
       fluentd (>= 0.12.0)
       kubeclient (~> 1.1.4)
       lru_redux
@@ -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.0.1)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     json (2.1.0)
@@ -71,15 +71,15 @@ GEM
       recursive-open-struct (= 1.0.0)
       rest-client
     lru_redux (1.1.0)
-    mime-types (3.2.2)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2016.0521)
     minitest (5.11.3)
     msgpack (1.2.4)
     netrc (0.11.0)
     oj (3.5.1)
     proxifier (1.0.3)
-    public_suffix (3.0.3)
+    public_suffix (3.0.2)
     recursive-open-struct (1.0.0)
     resolve-hostname (0.1.0)
     rest-client (2.0.2)
@@ -91,13 +91,13 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2018.6)
+    tzinfo-data (1.2018.5)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
     uuidtools (2.1.5)
-    yajl-ruby (1.4.1)
+    yajl-ruby (1.4.0)
 
 PLATFORMS
   ruby
@@ -113,4 +113,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.6
+   1.16.1
diff --git a/docker-image/v0.12/alpine-elasticsearch/Gemfile.lock b/docker-image/v0.12/alpine-elasticsearch/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -21,13 +21,13 @@ GEM
       faraday
       multi_json
     excon (0.62.0)
-    faraday (0.15.3)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
-    fluent-plugin-elasticsearch (1.18.0)
+    fluent-plugin-elasticsearch (1.17.0)
       elasticsearch
       excon
       fluentd (>= 0.12.10)
-    fluent-plugin-kubernetes_metadata_filter (1.2.1)
+    fluent-plugin-kubernetes_metadata_filter (1.1.0)
       fluentd (>= 0.12.0)
       kubeclient (~> 1.1.4)
       lru_redux
@@ -58,7 +58,7 @@ GEM
       domain_name (~> 0.5)
     http-form_data (1.0.3)
     http_parser.rb (0.6.0)
-    i18n (1.1.1)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     kubeclient (1.1.4)
@@ -67,17 +67,17 @@ GEM
       recursive-open-struct (= 1.0.0)
       rest-client
     lru_redux (1.1.0)
-    mime-types (3.2.2)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2016.0521)
     minitest (5.11.3)
     msgpack (1.2.4)
     multi_json (1.13.1)
     multipart-post (2.0.0)
     netrc (0.11.0)
     oj (3.5.1)
     proxifier (1.0.3)
-    public_suffix (3.0.3)
+    public_suffix (3.0.2)
     recursive-open-struct (1.0.0)
     resolve-hostname (0.1.0)
     rest-client (2.0.2)
@@ -89,12 +89,12 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2018.6)
+    tzinfo-data (1.2018.5)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    yajl-ruby (1.4.1)
+    yajl-ruby (1.4.0)
 
 PLATFORMS
   ruby
@@ -109,4 +109,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.6
+   1.16.1
diff --git a/docker-image/v0.12/alpine-elasticsearch/conf/fluent.conf b/docker-image/v0.12/alpine-elasticsearch/conf/fluent.conf
@@ -19,10 +19,10 @@
    logstash_prefix "#{ENV['FLUENT_ELASTICSEARCH_LOGSTASH_PREFIX'] || 'logstash'}"
    logstash_format true
    type_name fluentd
-   buffer_chunk_limit "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_CHUNK_LIMIT_SIZE'] || '2M'}"
-   buffer_queue_limit "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_QUEUE_LIMIT_LENGTH'] || '32'}"
-   flush_interval "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_FLUSH_INTERVAL'] || '5s'}"
-   max_retry_wait "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_RETRY_MAX_INTERVAL'] || '30'}"
+   buffer_chunk_limit 2M
+   buffer_queue_limit 32
+   flush_interval 5s
+   max_retry_wait 30
    disable_retry_limit
-   num_threads "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_FLUSH_THREAD_COUNT'] || '8'}"
+   num_threads 8
 </match>
diff --git a/docker-image/v0.12/alpine-gcs/Gemfile.lock b/docker-image/v0.12/alpine-gcs/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -13,12 +13,12 @@ GEM
     digest-crc (0.4.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    faraday (0.15.3)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     fluent-plugin-gcs (0.3.0)
       fluentd (~> 0.12.0)
       google-cloud-storage (~> 0.23.2)
-    fluent-plugin-kubernetes_metadata_filter (1.2.1)
+    fluent-plugin-kubernetes_metadata_filter (1.1.0)
       fluentd (>= 0.12.0)
       kubeclient (~> 1.1.4)
       lru_redux
@@ -49,15 +49,14 @@ GEM
       mime-types (>= 1.6)
       representable (~> 2.3.0)
       retriable (~> 2.0)
-    google-cloud-core (0.21.1)
-      googleauth (~> 0.5.1)
+    google-cloud-core (0.21.0)
     google-cloud-storage (0.23.2)
       digest-crc (~> 0.4)
       google-api-client (~> 0.9.11)
       google-cloud-core (~> 0.21.0)
-    googleauth (0.5.3)
+    googleauth (0.6.2)
       faraday (~> 0.12)
-      jwt (~> 1.4)
+      jwt (>= 1.4, < 3.0)
       logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
@@ -74,10 +73,10 @@ GEM
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
     hurley (0.2)
-    i18n (1.1.1)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
-    jwt (1.5.6)
+    jwt (2.1.0)
     kubeclient (1.1.4)
       activesupport
       http (= 0.9.8)
@@ -89,9 +88,9 @@ GEM
       multi_json (~> 1.10)
     lru_redux (1.1.0)
     memoist (0.16.0)
-    mime-types (3.2.2)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2016.0521)
     minitest (5.11.3)
     msgpack (1.2.4)
     multi_json (1.13.1)
@@ -100,7 +99,7 @@ GEM
     oj (3.5.1)
     os (0.9.6)
     proxifier (1.0.3)
-    public_suffix (3.0.3)
+    public_suffix (3.0.2)
     recursive-open-struct (1.0.0)
     representable (2.3.0)
       uber (~> 0.0.7)
@@ -111,7 +110,7 @@ GEM
       netrc (~> 0.8)
     retriable (2.1.0)
     sigdump (0.2.4)
-    signet (0.11.0)
+    signet (0.8.1)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
@@ -120,13 +119,13 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2018.6)
+    tzinfo-data (1.2018.5)
       tzinfo (>= 1.0.0)
     uber (0.0.15)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    yajl-ruby (1.4.1)
+    yajl-ruby (1.4.0)
 
 PLATFORMS
   ruby
@@ -141,4 +140,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.6
+   1.16.1
diff --git a/docker-image/v0.12/alpine-graylog/Gemfile.lock b/docker-image/v0.12/alpine-graylog/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -15,7 +15,7 @@ GEM
     fluent-plugin-gelf-hs (1.0.7)
       fluentd
       gelf (>= 2.0.0)
-    fluent-plugin-kubernetes_metadata_filter (1.2.1)
+    fluent-plugin-kubernetes_metadata_filter (1.1.0)
       fluentd (>= 0.12.0)
       kubeclient (~> 1.1.4)
       lru_redux
@@ -37,7 +37,7 @@ GEM
       tzinfo (>= 1.0.0)
       tzinfo-data (>= 1.0.0)
       yajl-ruby (~> 1.0)
-    gelf (3.1.0)
+    gelf (3.0.0)
       json
     http (0.9.8)
       addressable (~> 2.3)
@@ -48,7 +48,7 @@ GEM
       domain_name (~> 0.5)
     http-form_data (1.0.3)
     http_parser.rb (0.6.0)
-    i18n (1.1.1)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     kubeclient (1.1.4)
@@ -57,15 +57,15 @@ GEM
       recursive-open-struct (= 1.0.0)
       rest-client
     lru_redux (1.1.0)
-    mime-types (3.2.2)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2016.0521)
     minitest (5.11.3)
     msgpack (1.2.4)
     netrc (0.11.0)
     oj (3.5.1)
     proxifier (1.0.3)
-    public_suffix (3.0.3)
+    public_suffix (3.0.2)
     recursive-open-struct (1.0.0)
     resolve-hostname (0.1.0)
     rest-client (2.0.2)
@@ -77,12 +77,12 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2018.6)
+    tzinfo-data (1.2018.5)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    yajl-ruby (1.4.1)
+    yajl-ruby (1.4.0)
 
 PLATFORMS
   ruby
@@ -98,4 +98,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.6
+   1.16.1