Skip to content
This repository was archived by the owner on Sep 26, 2025. It is now read-only.

Commit b96307a

Browse files
authored
Merge pull request #119 from splunk/develop
1.1.11
2 parents 65620e9 + 8671796 commit b96307a

File tree

6 files changed

+29
-23
lines changed

6 files changed

+29
-23
lines changed

Gemfile.lock

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PATH
22
remote: .
33
specs:
4-
fluent-plugin-kubernetes-metrics (1.1.10)
4+
fluent-plugin-kubernetes-metrics (1.1.11)
55
fluentd (>= 1.9.1)
6-
kubeclient (~> 4.6.0)
6+
kubeclient (~> 4.9.3)
77
multi_json (~> 1.14.1)
88
oj (~> 3.10.2)
99

@@ -12,7 +12,7 @@ GEM
1212
specs:
1313
addressable (2.8.0)
1414
public_suffix (>= 2.0.2, < 5.0)
15-
concurrent-ruby (1.1.9)
15+
concurrent-ruby (1.1.10)
1616
cool.io (1.7.1)
1717
crack (0.4.5)
1818
rexml
@@ -23,12 +23,12 @@ GEM
2323
ffi-compiler (1.0.1)
2424
ffi (>= 1.0.0)
2525
rake
26-
fluentd (1.14.4)
26+
fluentd (1.14.5)
2727
bundler
2828
cool.io (>= 1.4.5, < 2.0.0)
2929
http_parser.rb (>= 0.5.1, < 0.9.0)
3030
msgpack (>= 1.3.1, < 2.0.0)
31-
serverengine (>= 2.2.2, < 3.0.0)
31+
serverengine (>= 2.2.5, < 3.0.0)
3232
sigdump (~> 0.2.2)
3333
strptime (>= 0.2.4, < 1.0.0)
3434
tzinfo (>= 1.0, < 3.0)
@@ -49,14 +49,17 @@ GEM
4949
ffi-compiler (>= 1.0, < 2.0)
5050
http_parser.rb (0.8.0)
5151
json (2.6.1)
52-
kubeclient (4.6.0)
52+
jsonpath (1.1.0)
53+
multi_json
54+
kubeclient (4.9.3)
5355
http (>= 3.0, < 5.0)
54-
recursive-open-struct (~> 1.0, >= 1.0.4)
56+
jsonpath (~> 1.0)
57+
recursive-open-struct (~> 1.1, >= 1.1.1)
5558
rest-client (~> 2.0)
5659
mime-types (3.4.1)
5760
mime-types-data (~> 3.2015)
5861
mime-types-data (3.2022.0105)
59-
msgpack (1.4.4)
62+
msgpack (1.4.5)
6063
multi_json (1.14.1)
6164
netrc (0.11.0)
6265
oj (3.10.18)
@@ -83,11 +86,11 @@ GEM
8386
power_assert
8487
tzinfo (2.0.4)
8588
concurrent-ruby (~> 1.0)
86-
tzinfo-data (1.2021.5)
89+
tzinfo-data (1.2022.1)
8790
tzinfo (>= 1.0.0)
8891
unf (0.1.4)
8992
unf_ext
90-
unf_ext (0.0.8)
93+
unf_ext (0.0.8.1)
9194
webmock (3.5.1)
9295
addressable (>= 2.3.6)
9396
crack (>= 0.3.2)

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.10
1+
1.1.11

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ RUN yum update -y \
4141
&& bundle install \
4242
&& bundle update i18n \
4343
&& gem uninstall -i /usr/share/gems i18n --version 1.8.11 \
44-
&& 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
44+
&& 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
4545

4646
RUN groupadd -r $FLUENT_USER && \
4747
useradd -r -g $FLUENT_USER $FLUENT_USER && \

docker/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gem "fluent-plugin-jq", "=0.5.1"
1111
gem "oj", "=3.10.18"
1212
gem 'multi_json', '=1.14.1'
1313
gem 'bigdecimal', '=3.0.0'
14-
gem 'kubeclient', '=4.6.0'
14+
gem 'kubeclient', '=4.9.3'
1515
gem 'http_parser.rb', '=0.5.3'
1616

1717
gem "fluent-plugin-splunk-hec", ">= 1.2.5"

docker/Gemfile.lock

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PATH
22
remote: gem
33
specs:
4-
fluent-plugin-kubernetes-metrics (1.1.10)
4+
fluent-plugin-kubernetes-metrics (1.1.11)
55
fluentd (>= 1.9.1)
6-
kubeclient (~> 4.6.0)
6+
kubeclient (~> 4.9.3)
77
multi_json (~> 1.14.1)
88
oj (~> 3.10.2)
99

@@ -28,7 +28,7 @@ GEM
2828
cool.io (1.7.1)
2929
domain_name (0.5.20190701)
3030
unf (>= 0.0.5, < 1.0.0)
31-
ffi (1.15.4)
31+
ffi (1.15.5)
3232
ffi-compiler (1.0.1)
3333
ffi (>= 1.0.0)
3434
rake
@@ -44,7 +44,7 @@ GEM
4444
prometheus-client (>= 2.1.0)
4545
fluent-plugin-record-modifier (2.1.0)
4646
fluentd (>= 1.0, < 2)
47-
fluent-plugin-splunk-hec (1.2.11)
47+
fluent-plugin-splunk-hec (1.2.12)
4848
fluentd (>= 1.4)
4949
multi_json (~> 1.13)
5050
net-http-persistent (~> 3.1)
@@ -81,16 +81,19 @@ GEM
8181
activesupport (>= 4.2)
8282
aes_key_wrap
8383
bindata
84-
kubeclient (4.6.0)
84+
jsonpath (1.1.0)
85+
multi_json
86+
kubeclient (4.9.3)
8587
http (>= 3.0, < 5.0)
86-
recursive-open-struct (~> 1.0, >= 1.0.4)
88+
jsonpath (~> 1.0)
89+
recursive-open-struct (~> 1.1, >= 1.1.1)
8790
rest-client (~> 2.0)
8891
lru_redux (1.1.0)
8992
mail (2.7.1)
9093
mini_mime (>= 0.1.1)
9194
mime-types (3.4.1)
9295
mime-types-data (~> 3.2015)
93-
mime-types-data (3.2021.1115)
96+
mime-types-data (3.2022.0105)
9497
mini_mime (1.1.2)
9598
minitest (5.15.0)
9699
msgpack (1.4.2)
@@ -139,7 +142,7 @@ GEM
139142
tzinfo (>= 1.0.0)
140143
unf (0.1.4)
141144
unf_ext
142-
unf_ext (0.0.8)
145+
unf_ext (0.0.8.1)
143146
validate_email (0.1.6)
144147
activemodel (>= 3.0)
145148
mail (>= 2.2.5)
@@ -165,7 +168,7 @@ DEPENDENCIES
165168
fluent-plugin-splunk-hec (>= 1.2.5)
166169
fluentd (>= 1.14.2)
167170
http_parser.rb (= 0.5.3)
168-
kubeclient (= 4.6.0)
171+
kubeclient (= 4.9.3)
169172
multi_json (= 1.14.1)
170173
oj (= 3.10.18)
171174

fluent-plugin-kubernetes-metrics.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
2525
spec.add_development_dependency 'test-unit', '~> 3.3.0'
2626
spec.add_development_dependency 'webmock', '~> 3.5.1'
2727
spec.add_runtime_dependency 'fluentd', '>= 1.9.1'
28-
spec.add_runtime_dependency 'kubeclient', '~> 4.6.0'
28+
spec.add_runtime_dependency 'kubeclient', '~> 4.9.3'
2929
spec.add_runtime_dependency 'multi_json', '~> 1.14.1'
3030
spec.add_runtime_dependency 'oj', '~> 3.10.2'
3131
end

0 commit comments

Comments
 (0)