deps: update dependencies

SumoLogic · May 9, 2024 · 844500d · 844500d
1 parent 4584e09
commit 844500d
Show file tree

Hide file tree

Showing 18 changed files with 57 additions and 56 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+3.2.0
diff --git a/Dockerfile b/Dockerfile
@@ -13,15 +13,22 @@ RUN apt-get update \
         make \
         ruby-dev \
         sudo \
-        unzip
+        unzip \
+        git
 
 # Fluentd plugin dependencies
 RUN gem install \
-        fluentd:1.16.2 \
+        async:1.31.0 \
+        async-http:0.60.2 \
+        bigdecimal:1.4.4 \
         concurrent-ruby:1.1.10 \
+        fluentd:1.16.5 \
         google-protobuf:3.21.12 \
+        json:2.6.3 \
         lru_redux:1.1.0 \
         net-http-persistent:4.0.2 \
+        oj:3.16.1 \
+        rexml:3.2.6 \
         snappy:0.3.0 \
         specific_install:0.3.8
 
@@ -99,7 +106,7 @@ RUN gem install \
 RUN rm -rf /usr/local/bundle/cache/* \
  && find /usr/local/bundle/ -name "*.o" | xargs rm
 
-FROM fluent/fluentd:v1.16.2-debian${FLUENTD_ARCH}-1.0
+FROM fluent/fluentd:v1.16.5-debian${FLUENTD_ARCH}-1.0
 
 USER root
 

diff --git a/alpine.Dockerfile b/alpine.Dockerfile
@@ -13,18 +13,19 @@ RUN apk update \
 RUN echo 'gem: --no-document' >> /etc/gemrc
 
 # Fluentd plugin dependencies
-# Copied from https://github.com/fluent/fluentd-docker-image/blob/6a497560b45add04b9033955ae2e97c2616aa356/v1.16/alpine/Dockerfile
+# Copied from https://github.com/fluent/fluentd-docker-image/blob/6f347061a521a097cf8732044da110ab990416dc/v1.16/alpine/Dockerfile
 RUN gem install \
-        async:1.30.3 \
+        async:1.31.0 \
         async-http:0.60.2 \
         bigdecimal:1.4.4 \
         concurrent-ruby:1.1.10 \
-        fluentd:1.16.2 \
+        fluentd:1.16.5 \
         google-protobuf:3.21.12 \
         json:2.6.3 \
         lru_redux:1.1.0 \
         net-http-persistent:4.0.2 \
-        oj:3.15.0 \
+        oj:3.16.1 \
+        rexml:3.2.6 \
         snappy:0.3.0 \
         specific_install:0.3.8
 

diff --git a/fluent-plugin-datapoint/Gemfile.lock b/fluent-plugin-datapoint/Gemfile.lock
@@ -2,14 +2,14 @@ PATH
   remote: .
   specs:
     fluent-plugin-datapoint (2.0.0)
-      fluentd (= 1.16.2)
+      fluentd (= 1.16.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
     concurrent-ruby (1.1.10)
     cool.io (1.7.1)
-    fluentd (1.16.2)
+    fluentd (1.16.5)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
@@ -48,4 +48,4 @@ DEPENDENCIES
   test-unit (~> 3.0)
 
 BUNDLED WITH
-   2.4.1
+   2.5.10
diff --git a/fluent-plugin-datapoint/fluent-plugin-datapoint.gemspec b/fluent-plugin-datapoint/fluent-plugin-datapoint.gemspec
@@ -18,5 +18,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "test-unit", "~> 3.0"
-  spec.add_runtime_dependency "fluentd", "= 1.16.2"
+  spec.add_runtime_dependency "fluentd", "= 1.16.5"
 end
diff --git a/fluent-plugin-enhance-k8s-metadata/Gemfile.lock b/fluent-plugin-enhance-k8s-metadata/Gemfile.lock
@@ -14,7 +14,7 @@ PATH
   specs:
     fluent-plugin-enhance-k8s-metadata (2.0.0)
       concurrent-ruby (~> 1.1)
-      fluentd (= 1.16.2)
+      fluentd (= 1.16.5)
       lru_redux (~> 1.1.0)
       net-http-persistent (~> 4.0)
 
@@ -30,9 +30,8 @@ GEM
     crack (1.0.0)
       bigdecimal
       rexml
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    faraday (1.10.0)
+    domain_name (0.6.20240107)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -57,11 +56,11 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    ffi (1.15.5)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
+    ffi (1.16.3)
+    ffi-compiler (1.3.2)
+      ffi (>= 1.15.5)
       rake
-    fluentd (1.16.2)
+    fluentd (1.16.5)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
@@ -87,7 +86,7 @@ GEM
     http_parser.rb (0.8.0)
     lru_redux (1.1.0)
     msgpack (1.5.1)
-    multipart-post (2.2.3)
+    multipart-post (2.4.1)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
     power_assert (2.0.3)
@@ -106,9 +105,6 @@ GEM
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2022.1)
       tzinfo (>= 1.0.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -128,4 +124,4 @@ DEPENDENCIES
   webmock (~> 3.0)
 
 BUNDLED WITH
-   2.4.1
+   2.5.10
diff --git a/fluent-plugin-enhance-k8s-metadata/fluent-plugin-enhance-k8s-metadata.gemspec b/fluent-plugin-enhance-k8s-metadata/fluent-plugin-enhance-k8s-metadata.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.1'
-  spec.add_runtime_dependency "fluentd", "= 1.16.2"
+  spec.add_runtime_dependency "fluentd", "= 1.16.5"
   # spec.add_runtime_dependency 'kubeclient', '4.9.1' # Git version of Kubeclient specified in Gemfile
   spec.add_runtime_dependency 'lru_redux', '~> 1.1.0'
   spec.add_runtime_dependency 'net-http-persistent', '~> 4.0'

diff --git a/fluent-plugin-events/Gemfile b/fluent-plugin-events/Gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
 gem 'kubeclient', git: 'https://github.com/ManageIQ/kubeclient', ref: '220b8d7af52180f9a0f69cb73f0723d2618cf3ef' 
- 
+
 gemspec
diff --git a/fluent-plugin-events/Gemfile.lock b/fluent-plugin-events/Gemfile.lock
@@ -13,7 +13,7 @@ PATH
   remote: .
   specs:
     fluent-plugin-events (2.0.0)
-      fluentd (= 1.16.2)
+      fluentd (= 1.16.5)
       net-http-persistent (~> 4.0)
 
 GEM
@@ -28,9 +28,8 @@ GEM
     crack (1.0.0)
       bigdecimal
       rexml
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    faraday (1.10.0)
+    domain_name (0.6.20240107)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -55,11 +54,11 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    ffi (1.15.5)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
+    ffi (1.16.3)
+    ffi-compiler (1.3.2)
+      ffi (>= 1.15.5)
       rake
-    fluentd (1.16.2)
+    fluentd (1.16.5)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
@@ -86,7 +85,7 @@ GEM
     mocha (2.2.0)
       ruby2_keywords (>= 0.0.5)
     msgpack (1.5.1)
-    multipart-post (2.2.3)
+    multipart-post (2.4.1)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
     power_assert (2.0.3)
@@ -105,9 +104,6 @@ GEM
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2022.1)
       tzinfo (>= 1.0.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -128,4 +124,4 @@ DEPENDENCIES
   webmock (~> 3.0)
 
 BUNDLED WITH
-   2.4.1
+   2.5.10
diff --git a/fluent-plugin-events/fluent-plugin-events.gemspec b/fluent-plugin-events/fluent-plugin-events.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "test-unit", "~> 3.0"
-  spec.add_runtime_dependency "fluentd", "= 1.16.2"
+  spec.add_runtime_dependency "fluentd", "= 1.16.5"
   # spec.add_runtime_dependency 'kubeclient', '4.9.1' # Git version of Kubeclient specified in Gemfile
   spec.add_runtime_dependency 'net-http-persistent', '~> 4.0'
   spec.add_development_dependency 'webmock', '~> 3.0'

diff --git a/fluent-plugin-kubernetes-metadata-filter/Gemfile.lock b/fluent-plugin-kubernetes-metadata-filter/Gemfile.lock
@@ -13,7 +13,7 @@ PATH
   remote: .
   specs:
     fluent-plugin-kubernetes-metadata-filter (2.5.3)
-      fluentd (= 1.16.2)
+      fluentd (= 1.16.5)
       lru_redux
       net-http-persistent (~> 4.0)
 
@@ -67,7 +67,7 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluentd (1.16.2)
+    fluentd (1.16.5)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
@@ -179,4 +179,4 @@ DEPENDENCIES
   yajl-ruby
 
 BUNDLED WITH
-   2.4.1
+   2.5.10
diff --git a/fluent-plugin-kubernetes-metadata-filter/fluent-plugin-kubernetes-metadata-filter.gemspec b/fluent-plugin-kubernetes-metadata-filter/fluent-plugin-kubernetes-metadata-filter.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.5.0'
 
-  gem.add_runtime_dependency "fluentd", "= 1.16.2"
+  gem.add_runtime_dependency "fluentd", "= 1.16.5"
   gem.add_runtime_dependency "lru_redux"
   # gem.add_runtime_dependency 'kubeclient', '< 5' # Git version of Kubeclient specified in Gemfile
   gem.add_runtime_dependency 'net-http-persistent', '~> 4.0'

diff --git a/fluent-plugin-kubernetes-sumologic/Gemfile.lock b/fluent-plugin-kubernetes-sumologic/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     fluent-plugin-kubernetes-sumologic (2.0.0)
-      fluentd (= 1.16.2)
+      fluentd (= 1.16.5)
       httpclient (~> 2.8.0)
 
 GEM
@@ -14,7 +14,7 @@ GEM
     cool.io (1.7.1)
     crack (0.4.5)
       rexml
-    fluentd (1.16.2)
+    fluentd (1.16.5)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
@@ -62,4 +62,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.4.19
+   2.5.10
diff --git a/fluent-plugin-kubernetes-sumologic/fluent-plugin-kubernetes-sumologic.gemspec b/fluent-plugin-kubernetes-sumologic/fluent-plugin-kubernetes-sumologic.gemspec
@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'test-unit', '~> 3.6.0'
-  spec.add_runtime_dependency "fluentd", "= 1.16.2"
+  spec.add_runtime_dependency "fluentd", "= 1.16.5"
   spec.add_runtime_dependency 'httpclient', '~> 2.8.0'
 end
diff --git a/fluent-plugin-prometheus-format/Gemfile.lock b/fluent-plugin-prometheus-format/Gemfile.lock
@@ -2,14 +2,14 @@ PATH
   remote: .
   specs:
     fluent-plugin-prometheus-format (2.0.0)
-      fluentd (= 1.16.2)
+      fluentd (= 1.16.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
     concurrent-ruby (1.1.10)
     cool.io (1.7.1)
-    fluentd (1.16.2)
+    fluentd (1.16.5)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
@@ -48,4 +48,4 @@ DEPENDENCIES
   test-unit (~> 3.0)
 
 BUNDLED WITH
-   2.4.1
+   2.5.10
diff --git a/fluent-plugin-prometheus-format/fluent-plugin-prometheus-format.gemspec b/fluent-plugin-prometheus-format/fluent-plugin-prometheus-format.gemspec
@@ -18,5 +18,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "test-unit", "~> 3.0"
-  spec.add_runtime_dependency "fluentd", "= 1.16.2"
+  spec.add_runtime_dependency "fluentd", "= 1.16.5"
 end
diff --git a/fluent-plugin-protobuf/Gemfile.lock b/fluent-plugin-protobuf/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     fluent-plugin-protobuf (2.0.0)
-      fluentd (= 1.16.2)
+      fluentd (= 1.16.5)
       google-protobuf (~> 3.17)
       snappy (> 0)
 
@@ -11,7 +11,7 @@ GEM
   specs:
     concurrent-ruby (1.1.10)
     cool.io (1.7.1)
-    fluentd (1.16.2)
+    fluentd (1.16.5)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
@@ -52,4 +52,4 @@ DEPENDENCIES
   test-unit (~> 3.0)
 
 BUNDLED WITH
-   2.4.1
+   2.5.10
diff --git a/fluent-plugin-protobuf/fluent-plugin-protobuf.gemspec b/fluent-plugin-protobuf/fluent-plugin-protobuf.gemspec
@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "test-unit", "~> 3.0"
   spec.add_runtime_dependency "google-protobuf", "~> 3.17"
   spec.add_runtime_dependency "snappy", "> 0"
-  spec.add_runtime_dependency "fluentd", "= 1.16.2"
+  spec.add_runtime_dependency "fluentd", "= 1.16.5"
 end