diff --git a/Gemfile.lock b/Gemfile.lock index 026efae..baeeeb0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ PATH remote: . specs: - fluent-plugin-kubernetes-metrics (1.1.10) + fluent-plugin-kubernetes-metrics (1.1.11) fluentd (>= 1.9.1) - kubeclient (~> 4.6.0) + kubeclient (~> 4.9.3) multi_json (~> 1.14.1) oj (~> 3.10.2) @@ -12,7 +12,7 @@ GEM specs: addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) cool.io (1.7.1) crack (0.4.5) rexml @@ -23,12 +23,12 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - fluentd (1.14.4) + fluentd (1.14.5) bundler cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.9.0) msgpack (>= 1.3.1, < 2.0.0) - serverengine (>= 2.2.2, < 3.0.0) + serverengine (>= 2.2.5, < 3.0.0) sigdump (~> 0.2.2) strptime (>= 0.2.4, < 1.0.0) tzinfo (>= 1.0, < 3.0) @@ -49,14 +49,17 @@ GEM ffi-compiler (>= 1.0, < 2.0) http_parser.rb (0.8.0) json (2.6.1) - kubeclient (4.6.0) + jsonpath (1.1.0) + multi_json + kubeclient (4.9.3) http (>= 3.0, < 5.0) - recursive-open-struct (~> 1.0, >= 1.0.4) + jsonpath (~> 1.0) + recursive-open-struct (~> 1.1, >= 1.1.1) rest-client (~> 2.0) mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) - msgpack (1.4.4) + msgpack (1.4.5) multi_json (1.14.1) netrc (0.11.0) oj (3.10.18) @@ -83,11 +86,11 @@ GEM power_assert tzinfo (2.0.4) concurrent-ruby (~> 1.0) - tzinfo-data (1.2021.5) + tzinfo-data (1.2022.1) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.1) webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) diff --git a/VERSION b/VERSION index 9695327..5165303 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.10 \ No newline at end of file +1.1.11 \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 9803553..0e651d2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -41,7 +41,7 @@ RUN yum update -y \ && bundle install \ && bundle update i18n \ && gem uninstall -i /usr/share/gems i18n --version 1.8.11 \ - && rpm -e --nodeps python3-pip-wheel python3-urllib3-* python3-requests-* python3-libxml2-* python3-dmidecode-* subscription-manager-* libwebp-* libwebp-devel-* glib2-* libjpeg-turbo-devel-* libjpeg-turbo-* mariadb-connector-c-config-* mariadb-connector-c-* mariadb-connector-c-devel-* rsync-* sqlite-libs-* sqlite-devel-* sqlite-* libxml2-* libxml2-devel-* libX11-* libX11-common-* libX11-devel-* libX11-xcb-* nettle-* libsolv-* file-libs-* dbus-daemon-* tar-* qt5-srpm-macros-* perl-parent-* git-* bsdtar-* openssh-clients-* json-c-* binutils-* libtiff-devel-* libtiff-* || true + && rpm -e --nodeps python3-pip-wheel python3-urllib3-* python3-requests-* python3-libxml2-* python3-dmidecode-* libwebp-* libwebp-devel-* libjpeg-turbo-devel-* libjpeg-turbo-* mariadb-connector-c-config-* mariadb-connector-c-* mariadb-connector-c-devel-* rsync-* libX11-* libX11-common-* libX11-devel-* libX11-xcb-* dbus-daemon-* tar-* qt5-srpm-macros-* perl-parent-* git-* bsdtar-* openssh-clients-* json-c-* binutils-* libtiff-devel-* libtiff-* || true RUN groupadd -r $FLUENT_USER && \ useradd -r -g $FLUENT_USER $FLUENT_USER && \ diff --git a/docker/Gemfile b/docker/Gemfile index 84c7fb4..4858154 100644 --- a/docker/Gemfile +++ b/docker/Gemfile @@ -11,7 +11,7 @@ gem "fluent-plugin-jq", "=0.5.1" gem "oj", "=3.10.18" gem 'multi_json', '=1.14.1' gem 'bigdecimal', '=3.0.0' -gem 'kubeclient', '=4.6.0' +gem 'kubeclient', '=4.9.3' gem 'http_parser.rb', '=0.5.3' gem "fluent-plugin-splunk-hec", ">= 1.2.5" diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock index ecbea1b..ec00ad2 100644 --- a/docker/Gemfile.lock +++ b/docker/Gemfile.lock @@ -1,9 +1,9 @@ PATH remote: gem specs: - fluent-plugin-kubernetes-metrics (1.1.10) + fluent-plugin-kubernetes-metrics (1.1.11) fluentd (>= 1.9.1) - kubeclient (~> 4.6.0) + kubeclient (~> 4.9.3) multi_json (~> 1.14.1) oj (~> 3.10.2) @@ -28,7 +28,7 @@ GEM cool.io (1.7.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - ffi (1.15.4) + ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -44,7 +44,7 @@ GEM prometheus-client (>= 2.1.0) fluent-plugin-record-modifier (2.1.0) fluentd (>= 1.0, < 2) - fluent-plugin-splunk-hec (1.2.11) + fluent-plugin-splunk-hec (1.2.12) fluentd (>= 1.4) multi_json (~> 1.13) net-http-persistent (~> 3.1) @@ -81,16 +81,19 @@ GEM activesupport (>= 4.2) aes_key_wrap bindata - kubeclient (4.6.0) + jsonpath (1.1.0) + multi_json + kubeclient (4.9.3) http (>= 3.0, < 5.0) - recursive-open-struct (~> 1.0, >= 1.0.4) + jsonpath (~> 1.0) + recursive-open-struct (~> 1.1, >= 1.1.1) rest-client (~> 2.0) lru_redux (1.1.0) mail (2.7.1) mini_mime (>= 0.1.1) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.1115) + mime-types-data (3.2022.0105) mini_mime (1.1.2) minitest (5.15.0) msgpack (1.4.2) @@ -139,7 +142,7 @@ GEM tzinfo (>= 1.0.0) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.1) validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) @@ -165,7 +168,7 @@ DEPENDENCIES fluent-plugin-splunk-hec (>= 1.2.5) fluentd (>= 1.14.2) http_parser.rb (= 0.5.3) - kubeclient (= 4.6.0) + kubeclient (= 4.9.3) multi_json (= 1.14.1) oj (= 3.10.18) diff --git a/fluent-plugin-kubernetes-metrics.gemspec b/fluent-plugin-kubernetes-metrics.gemspec index 4ae3b8d..8ea51e6 100644 --- a/fluent-plugin-kubernetes-metrics.gemspec +++ b/fluent-plugin-kubernetes-metrics.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'test-unit', '~> 3.3.0' spec.add_development_dependency 'webmock', '~> 3.5.1' spec.add_runtime_dependency 'fluentd', '>= 1.9.1' - spec.add_runtime_dependency 'kubeclient', '~> 4.6.0' + spec.add_runtime_dependency 'kubeclient', '~> 4.9.3' spec.add_runtime_dependency 'multi_json', '~> 1.14.1' spec.add_runtime_dependency 'oj', '~> 3.10.2' end