Merge pull request #272 from Cryptophobia/master

chore(fluentd): upgrade fluentd v1.14.1 and gems
vmware · Oct 18, 2021 · 5033e82 · 5033e82
2 parents 93dd687 + 5032ae7
commit 5033e82
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 65 deletions.
diff --git a/README.md b/README.md
@@ -652,24 +652,25 @@ This projects tries to keep up with major releases for [Fluentd docker image](ht
 
 `kube-fluentd-operator` aims to be easy to use and flexible. It also favors sending logs to multiple destinations using `<copy>` and as such comes with many plugins pre-installed:
 
+* fluentd (1.14.1)
 * fluent-config-regexp-type (1.0.0)
 * fluent-mixin-config-placeholders (0.4.0)
 * fluent-plugin-amqp (0.14.0)
 * fluent-plugin-azure-loganalytics (0.7.0)
-* fluent-plugin-cloudwatch-logs (0.14.0)
+* fluent-plugin-cloudwatch-logs (0.14.2)
 * fluent-plugin-concat (2.5.0)
-* fluent-plugin-datadog (0.13.0)
+* fluent-plugin-datadog (0.14.0)
 * fluent-plugin-detect-exceptions (0.0.14)
 * fluent-plugin-elasticsearch (5.1.0)
 * fluent-plugin-gelf-hs (1.0.8)
 * fluent-plugin-google-cloud (0.13.0) - forked to allow fluentd v1.14.x
 * fluent-plugin-grafana-loki (1.2.16)
 * fluent-plugin-grok-parser (2.6.2)
 * fluent-plugin-json-in-json-2 (1.0.2)
-* fluent-plugin-kafka (0.17.0)
-* fluent-plugin-kinesis (3.4.0)
+* fluent-plugin-kafka (0.17.2)
+* fluent-plugin-kinesis (3.4.1)
 * fluent-plugin-kubernetes (0.3.1)
-* fluent-plugin-kubernetes_metadata_filter (2.9.0)
+* fluent-plugin-kubernetes_metadata_filter (2.9.1)
 * fluent-plugin-kubernetes_sumologic (2.4.2)
 * fluent-plugin-logentries (0.2.10)
 * fluent-plugin-loggly (1.0.0)
@@ -697,7 +698,6 @@ This projects tries to keep up with major releases for [Fluentd docker image](ht
 * fluent-plugin-verticajson (0.0.6)
 * fluent-plugin-vmware-log-intelligence (2.0.6)
 * fluent-plugin-vmware-loginsight (1.0.0)
-* fluentd (1.14.0)
 
 When customizing the image be careful not to uninstall plugins that are used internally to implement the macros.
 

diff --git a/base-image/Dockerfile b/base-image/Dockerfile
@@ -46,16 +46,16 @@ RUN git clone git://github.com/rbenv/ruby-build.git $RUBY_PATH/plugins/ruby-buil
     && $RUBY_PATH/plugins/ruby-build/install.sh \
     && ruby-build $RUBY_VERSION $RUBY_PATH/ \
     && gem update --system --no-document \
-    && gem install bundler -v '>= 2.2.27' --default --no-document \
+    && gem install bundler -v '>= 2.2.29' --default --no-document \
     && gem install rexml -v '>= 3.2.5' --default --no-document \
     && gem install rdoc -v '>= 6.3.2' --default --no-document \
-    && gem install json -v '>= 2.5.1' --default --no-document \
+    && gem install json -v '>= 2.6.0' --default --no-document \
     && gem install webrick -v '>= 1.7.0' --default --no-document \
     && bundler install \
     && gem uninstall rake -v 13.0.6 \
     && gem uninstall bigdecimal \
     && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/rexml-3.2.3.1.gemspec \
-    && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/rdoc-6.2.1.gemspec \
+    && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/rdoc-6.2.1.1.gemspec \
     && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/json-2.3.0.gemspec \
     && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/webrick-1.6.1.gemspec
 

diff --git a/base-image/Gemfile b/base-image/Gemfile
@@ -1,25 +1,25 @@
 source "https://rubygems.org"
 
 # pin fluentd, probably a good idea to pin all gems
-gem "fluentd", "~> 1.14.0"
+gem "fluentd", "~> 1.14.1"
 
-gem 'oj', '3.11.0'
+gem 'oj', '3.11.8'
 gem 'ffi'
 gem 'fluent-plugin-amqp', "0.14.0"
 gem 'fluent-plugin-azure-loganalytics', "0.7.0"
-gem 'fluent-plugin-cloudwatch-logs', "0.14.0"
+gem 'fluent-plugin-cloudwatch-logs', "0.14.2"
 gem 'fluent-plugin-concat', "2.5.0"
-gem 'fluent-plugin-datadog', "0.13.0"
+gem 'fluent-plugin-datadog', "0.14.0"
 gem 'fluent-plugin-detect-exceptions', "0.0.14"
 gem 'fluent-plugin-elasticsearch', "5.1.0"
 gem 'fluent-plugin-gelf-hs', "1.0.8"
 #gem 'fluent-plugin-google-cloud', :git => "https://github.com/Cryptophobia/fluent-plugin-google-cloud.git"
 gem 'fluent-plugin-grafana-loki', "1.2.16"
 gem 'fluent-plugin-grok-parser', "2.6.2"
 gem 'fluent-plugin-json-in-json-2', "1.0.2"
-gem 'fluent-plugin-kafka', "0.17.0"
-gem 'fluent-plugin-kinesis', "3.4.0"
-gem 'fluent-plugin-kubernetes_metadata_filter', "2.9.0"
+gem 'fluent-plugin-kafka', "0.17.2"
+gem 'fluent-plugin-kinesis', "3.4.1"
+gem 'fluent-plugin-kubernetes_metadata_filter', "2.9.1"
 gem 'fluent-plugin-kubernetes_sumologic', "2.4.2"
 gem 'fluent-plugin-kubernetes', "0.3.1"
 gem 'fluent-plugin-logentries', "0.2.10"

diff --git a/base-image/Gemfile.lock b/base-image/Gemfile.lock
@@ -15,30 +15,30 @@ GEM
     amq-protocol (2.3.2)
     attr_required (1.0.1)
     aws-eventstream (1.2.0)
-    aws-partitions (1.503.0)
+    aws-partitions (1.516.0)
     aws-sdk-cloudwatchlogs (1.45.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.121.0)
+    aws-sdk-core (3.121.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-firehose (1.41.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-firehose (1.43.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
     aws-sdk-kinesis (1.35.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.48.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-kms (1.50.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.103.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-s3 (1.104.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-sqs (1.44.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-sqs (1.45.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -59,16 +59,16 @@ GEM
       multi_json
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    elasticsearch (7.14.1)
-      elasticsearch-api (= 7.14.1)
-      elasticsearch-transport (= 7.14.1)
-    elasticsearch-api (7.14.1)
+    elasticsearch (7.15.0)
+      elasticsearch-api (= 7.15.0)
+      elasticsearch-transport (= 7.15.0)
+    elasticsearch-api (7.15.0)
       multi_json
-    elasticsearch-transport (7.14.1)
+    elasticsearch-transport (7.15.0)
       faraday (~> 1)
       multi_json
-    excon (0.85.0)
-    faraday (1.7.2)
+    excon (0.87.0)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -104,12 +104,12 @@ GEM
       fluentd (>= 0.14.15, < 2)
       rest-client
       yajl-ruby
-    fluent-plugin-cloudwatch-logs (0.14.0)
+    fluent-plugin-cloudwatch-logs (0.14.2)
       aws-sdk-cloudwatchlogs (~> 1.0)
       fluentd (>= 1.8.0)
     fluent-plugin-concat (2.5.0)
       fluentd (>= 0.14.0, < 2)
-    fluent-plugin-datadog (0.13.0)
+    fluent-plugin-datadog (0.14.0)
       fluentd (>= 1, < 2)
       net-http-persistent (~> 3.1)
     fluent-plugin-detect-exceptions (0.0.14)
@@ -128,19 +128,19 @@ GEM
     fluent-plugin-json-in-json-2 (1.0.2)
       fluentd (>= 0.14.0, < 2)
       yajl-ruby (~> 1.0)
-    fluent-plugin-kafka (0.17.0)
+    fluent-plugin-kafka (0.17.2)
       fluentd (>= 0.10.58, < 2)
       ltsv
       ruby-kafka (>= 1.4.0, < 2)
-    fluent-plugin-kinesis (3.4.0)
+    fluent-plugin-kinesis (3.4.1)
       aws-sdk-firehose (~> 1, != 1.9, != 1.5, != 1.15)
       aws-sdk-kinesis (~> 1, != 1.5, != 1.4, != 1.14)
       fluentd (>= 0.14.22, < 2)
       google-protobuf (~> 3)
     fluent-plugin-kubernetes (0.3.1)
       docker-api
       fluentd
-    fluent-plugin-kubernetes_metadata_filter (2.9.0)
+    fluent-plugin-kubernetes_metadata_filter (2.9.1)
       fluentd (>= 0.14.0, < 1.15)
       kubeclient (>= 4.0.0, < 5.0.0)
       lru_redux
@@ -222,7 +222,7 @@ GEM
       myslog (~> 0.0)
     fluent-plugin-vmware-loginsight (1.0.0)
       fluentd (>= 0.14.10, < 2)
-    fluentd (1.14.0)
+    fluentd (1.14.1)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.8.0)
@@ -236,7 +236,7 @@ GEM
       yajl-ruby (~> 1.0)
     gelf (3.1.0)
       json
-    google-protobuf (3.18.0-universal-darwin)
+    google-protobuf (3.18.1-universal-darwin)
     http (4.4.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -253,7 +253,7 @@ GEM
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
-    json (2.5.1)
+    json (2.6.0)
     json-jwt (1.13.0)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -273,7 +273,7 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0901)
-    mini_mime (1.1.1)
+    mini_mime (1.1.2)
     minitest (5.14.4)
     mongo (2.6.4)
       bson (>= 4.3.0, < 5.0.0)
@@ -284,7 +284,7 @@ GEM
     net-http-persistent (3.1.0)
       connection_pool (~> 2.2)
     netrc (0.11.0)
-    oj (3.11.0)
+    oj (3.11.8)
     openid_connect (1.1.8)
       activemodel
       attr_required (>= 1.0.0)
@@ -299,7 +299,7 @@ GEM
     proxifier (1.0.3)
     public_suffix (4.0.6)
     rack (2.2.3)
-    rack-oauth2 (1.18.0)
+    rack-oauth2 (1.19.0)
       activesupport
       attr_required
       httpclient
@@ -328,7 +328,7 @@ GEM
       rbtree
       set (~> 1.0)
     strptime (0.2.5)
-    swd (1.2.0)
+    swd (1.3.0)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
@@ -337,7 +337,7 @@ GEM
       ffi (~> 1.9)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.1)
+    tzinfo-data (1.2021.4)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
@@ -350,7 +350,7 @@ GEM
       activemodel (>= 3.0.0)
       public_suffix
     vertica (1.0.3)
-    webfinger (1.1.0)
+    webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
     webrick (1.7.0)
@@ -364,19 +364,19 @@ DEPENDENCIES
   ffi
   fluent-plugin-amqp (= 0.14.0)
   fluent-plugin-azure-loganalytics (= 0.7.0)
-  fluent-plugin-cloudwatch-logs (= 0.14.0)
+  fluent-plugin-cloudwatch-logs (= 0.14.2)
   fluent-plugin-concat (= 2.5.0)
-  fluent-plugin-datadog (= 0.13.0)
+  fluent-plugin-datadog (= 0.14.0)
   fluent-plugin-detect-exceptions (= 0.0.14)
   fluent-plugin-elasticsearch (= 5.1.0)
   fluent-plugin-gelf-hs (= 1.0.8)
   fluent-plugin-grafana-loki (= 1.2.16)
   fluent-plugin-grok-parser (= 2.6.2)
   fluent-plugin-json-in-json-2 (= 1.0.2)
-  fluent-plugin-kafka (= 0.17.0)
-  fluent-plugin-kinesis (= 3.4.0)
+  fluent-plugin-kafka (= 0.17.2)
+  fluent-plugin-kinesis (= 3.4.1)
   fluent-plugin-kubernetes (= 0.3.1)
-  fluent-plugin-kubernetes_metadata_filter (= 2.9.0)
+  fluent-plugin-kubernetes_metadata_filter (= 2.9.1)
   fluent-plugin-kubernetes_sumologic (= 2.4.2)
   fluent-plugin-logentries (= 0.2.10)
   fluent-plugin-logzio (= 0.0.21)
@@ -403,11 +403,11 @@ DEPENDENCIES
   fluent-plugin-verticajson (= 0.0.6)
   fluent-plugin-vmware-log-intelligence (= 2.0.6)
   fluent-plugin-vmware-loginsight (= 1.0.0)
-  fluentd (~> 1.14.0)
+  fluentd (~> 1.14.1)
   gelf (= 3.1.0)
   kubeclient (~> 4.9.0, < 5.0.0)
   logfmt (= 0.0.9)
-  oj (= 3.11.0)
+  oj (= 3.11.8)
 
 BUNDLED WITH
-   2.2.27
+   2.2.29
diff --git a/base-image/basegems/Gemfile b/base-image/basegems/Gemfile
@@ -1,13 +1,13 @@
 source "https://rubygems.org"
 
-gem 'async', '1.25.1'
+gem 'async', '1.30.1'
 gem 'async-http', '0.54.0'
 gem 'async-io', '1.28.0'
 gem 'async-pool', '0.2.0'
 gem 'bigdecimal'
 gem 'did_you_mean', '1.3.0'
 gem 'ext_monitor', '0.1.2'
-gem 'json', '2.5.1'
+gem 'json', '2.6.0'
 gem 'logger', '1.3.0'
 gem 'matrix', '0.1.0'
 gem 'mutex_m', '0.1.0'
@@ -28,6 +28,6 @@ gem 'thwait'
 gem 'unf_ext'
 gem 'xmlrpc', '0.3.0'
 gem 'webrick'
-gem 'bundler', '>= 2.2.27'
+gem 'bundler', '>= 2.2.29'
 gem 'rake', '13.0.6'
 gem 'resolv', '0.2.1'
diff --git a/base-image/basegems/Gemfile.lock b/base-image/basegems/Gemfile.lock
@@ -1,8 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    async (1.25.1)
-      console (~> 1.0)
+    async (1.30.1)
+      console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
     async-http (0.54.0)
@@ -24,7 +24,7 @@ GEM
     ext_monitor (0.1.2)
     fiber-local (1.0.0)
     forwardable (1.3.2)
-    json (2.5.1)
+    json (2.6.0)
     logger (1.3.0)
     matrix (0.1.0)
     mutex_m (0.1.0)
@@ -60,15 +60,15 @@ PLATFORMS
   x86_64-darwin-20
 
 DEPENDENCIES
-  async (= 1.25.1)
+  async (= 1.30.1)
   async-http (= 0.54.0)
   async-io (= 1.28.0)
   async-pool (= 0.2.0)
   bigdecimal
-  bundler (>= 2.2.27)
+  bundler (>= 2.2.29)
   did_you_mean (= 1.3.0)
   ext_monitor (= 0.1.2)
-  json (= 2.5.1)
+  json (= 2.6.0)
   logger (= 1.3.0)
   matrix (= 0.1.0)
   mutex_m (= 0.1.0)
@@ -93,4 +93,4 @@ DEPENDENCIES
   xmlrpc (= 0.3.0)
 
 BUNDLED WITH
-   2.2.27
+   2.2.29