diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..a4f52a5 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +3.2.0 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 74d66da..544d695 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update \ gcc \ libc-dev \ libsnappy-dev \ + libffi-dev \ make \ ruby-dev \ sudo \ @@ -17,16 +18,19 @@ RUN apt-get update \ # 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 - -# Use unreleased Kubeclient version with persistent HTTP connections. -RUN gem specific_install https://github.com/ManageIQ/kubeclient --ref 220b8d7af52180f9a0f69cb73f0723d2618cf3ef + kubeclient:4.11.0 # FluentD plugins to allow customers to forward data if needed to various cloud providers RUN gem install \ @@ -99,7 +103,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 index a1fe1ad..c3ebb03 100644 --- a/alpine.Dockerfile +++ b/alpine.Dockerfile @@ -13,23 +13,21 @@ 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 - -# Use unreleased Kubeclient version with persistent HTTP connections. -RUN gem specific_install https://github.com/ManageIQ/kubeclient --ref 220b8d7af52180f9a0f69cb73f0723d2618cf3ef + kubeclient:4.11.0 # FluentD plugins to allow customers to forward data if needed to various cloud providers RUN gem install \ diff --git a/fluent-plugin-datapoint/Gemfile.lock b/fluent-plugin-datapoint/Gemfile.lock index 32dd27a..f0afdfe 100644 --- 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 index fc718b2..d0a3635 100644 --- 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 b/fluent-plugin-enhance-k8s-metadata/Gemfile index 51d815b..b4e2a20 100644 --- a/fluent-plugin-enhance-k8s-metadata/Gemfile +++ b/fluent-plugin-enhance-k8s-metadata/Gemfile @@ -1,5 +1,3 @@ source "https://rubygems.org" -gem 'kubeclient', git: 'https://github.com/ManageIQ/kubeclient', ref: '220b8d7af52180f9a0f69cb73f0723d2618cf3ef' - gemspec diff --git a/fluent-plugin-enhance-k8s-metadata/Gemfile.lock b/fluent-plugin-enhance-k8s-metadata/Gemfile.lock index 1a146d0..d9dfac8 100644 --- a/fluent-plugin-enhance-k8s-metadata/Gemfile.lock +++ b/fluent-plugin-enhance-k8s-metadata/Gemfile.lock @@ -1,20 +1,10 @@ -GIT - remote: https://github.com/ManageIQ/kubeclient - revision: 220b8d7af52180f9a0f69cb73f0723d2618cf3ef - ref: 220b8d7af52180f9a0f69cb73f0723d2618cf3ef - specs: - kubeclient (4.9.3) - faraday (~> 1.1) - faraday_middleware (~> 1.0) - http (>= 3.0, < 5.0) - recursive-open-struct (~> 1.1, >= 1.1.1) - PATH remote: . specs: fluent-plugin-enhance-k8s-metadata (2.0.0) concurrent-ruby (~> 1.1) - fluentd (= 1.16.2) + fluentd (= 1.16.5) + kubeclient (= 4.11.0) lru_redux (~> 1.1.0) net-http-persistent (~> 4.0) @@ -32,36 +22,11 @@ GEM rexml domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - faraday (1.10.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.0) - faraday (~> 1.0) - ffi (1.15.5) + ffi (1.16.3) 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) @@ -79,23 +44,39 @@ GEM http-cookie (~> 1.0) http-form_data (~> 2.2) http-parser (~> 1.2.0) + http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) http-parser (1.2.3) ffi-compiler (>= 1.0, < 2.0) http_parser.rb (0.8.0) + jsonpath (1.1.5) + multi_json + kubeclient (4.11.0) + http (>= 3.0, < 6.0) + jsonpath (~> 1.0) + recursive-open-struct (~> 1.1, >= 1.1.1) + rest-client (~> 2.0) lru_redux (1.1.0) + mime-types (3.5.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2024.0507) msgpack (1.5.1) - multipart-post (2.2.3) + multi_json (1.15.0) net-http-persistent (4.0.2) connection_pool (~> 2.2) + netrc (0.11.0) power_assert (2.0.3) public_suffix (5.0.4) rake (13.2.1) recursive-open-struct (1.1.3) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) rexml (3.2.6) - ruby2_keywords (0.0.5) serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) @@ -122,10 +103,9 @@ PLATFORMS DEPENDENCIES bundler (~> 2.0) fluent-plugin-enhance-k8s-metadata! - kubeclient! rake (~> 13.0) test-unit (~> 3.0) 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 index 87ad99e..3d34c81 100644 --- 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,8 +16,8 @@ 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 'kubeclient', '4.9.1' # Git version of Kubeclient specified in Gemfile + spec.add_runtime_dependency "fluentd", "= 1.16.5" + spec.add_runtime_dependency 'kubeclient', '= 4.11.0' 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 index 658b0dd..cb25163 100644 --- a/fluent-plugin-events/Gemfile +++ b/fluent-plugin-events/Gemfile @@ -1,5 +1,3 @@ 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 index 0c37e7f..a2f6270 100644 --- a/fluent-plugin-events/Gemfile.lock +++ b/fluent-plugin-events/Gemfile.lock @@ -1,19 +1,9 @@ -GIT - remote: https://github.com/ManageIQ/kubeclient - revision: 220b8d7af52180f9a0f69cb73f0723d2618cf3ef - ref: 220b8d7af52180f9a0f69cb73f0723d2618cf3ef - specs: - kubeclient (4.9.3) - faraday (~> 1.1) - faraday_middleware (~> 1.0) - http (>= 3.0, < 5.0) - recursive-open-struct (~> 1.1, >= 1.1.1) - PATH remote: . specs: fluent-plugin-events (2.0.0) - fluentd (= 1.16.2) + fluentd (= 1.16.5) + kubeclient (= 4.11.0) net-http-persistent (~> 4.0) GEM @@ -30,36 +20,11 @@ GEM rexml domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - faraday (1.10.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - 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) 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) @@ -77,22 +42,39 @@ GEM http-cookie (~> 1.0) http-form_data (~> 2.2) http-parser (~> 1.2.0) + http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) http-parser (1.2.3) ffi-compiler (>= 1.0, < 2.0) http_parser.rb (0.8.0) + jsonpath (1.1.5) + multi_json + kubeclient (4.11.0) + http (>= 3.0, < 6.0) + jsonpath (~> 1.0) + recursive-open-struct (~> 1.1, >= 1.1.1) + rest-client (~> 2.0) + mime-types (3.5.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2024.0507) mocha (2.2.0) ruby2_keywords (>= 0.0.5) msgpack (1.5.1) - multipart-post (2.2.3) + multi_json (1.15.0) net-http-persistent (4.0.2) connection_pool (~> 2.2) + netrc (0.11.0) power_assert (2.0.3) public_suffix (5.0.4) rake (13.2.1) recursive-open-struct (1.1.3) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) rexml (3.2.6) ruby2_keywords (0.0.5) serverengine (2.3.2) @@ -121,11 +103,10 @@ PLATFORMS DEPENDENCIES bundler (~> 2.0) fluent-plugin-events! - kubeclient! mocha rake (~> 13.0) test-unit (~> 3.0) 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 index 470268e..6ce928c 100644 --- a/fluent-plugin-events/fluent-plugin-events.gemspec +++ b/fluent-plugin-events/fluent-plugin-events.gemspec @@ -18,8 +18,8 @@ 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 'kubeclient', '4.9.1' # Git version of Kubeclient specified in Gemfile + spec.add_runtime_dependency "fluentd", "= 1.16.5" + spec.add_runtime_dependency 'kubeclient', '= 4.11.0' spec.add_runtime_dependency 'net-http-persistent', '~> 4.0' spec.add_development_dependency 'webmock', '~> 3.0' spec.add_development_dependency 'mocha' diff --git a/fluent-plugin-kubernetes-metadata-filter/Gemfile.lock b/fluent-plugin-kubernetes-metadata-filter/Gemfile.lock index 1218e1a..133cfb4 100644 --- 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 index 3d84e22..9a11f3e 100644 --- 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 index c84dd67..87c7c4a 100644 --- 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 index baca2e8..461addc 100644 --- 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 index a7a8071..4346004 100644 --- 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 index ba2c089..e150171 100644 --- 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 index 560c690..9502b12 100644 --- 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 index 2ad5c22..daf0aea 100644 --- 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