fluent-plugin-k8s-metrics-agg 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +5 -5
  3. data/VERSION +1 -1
  4. data/docker/Dockerfile +2 -1
  5. data/docker/Gemfile +2 -2
  6. data/docker/Gemfile.lock +31 -20
  7. data/lib/fluent/plugin/in_kubernetes_metrics_aggregator.rb +2 -0
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d80783bf51707cd2587e12afab8b264a772a15f2ac8e28357a7cfbf7db756735
4
- data.tar.gz: de12ab83988f0d07a7c50f875896915fd87f824222cd8c2ae4ce05c81e1dfa1c
3
+ metadata.gz: 565444ab4272096fd6512f642d8316a757e0b4e4db092495dc238315f75090a0
4
+ data.tar.gz: a7c63569ce9fae8178319caa8e89c8c4927f153d5a36ae2a98bf1cee7eec2836
5
5
  SHA512:
6
- metadata.gz: 04010cd42dc57248e834edfdcc694f6b6b85297d2f94d3a9d7f5230c4d135f3865105dd98ead308fb061e8b450bd6a350e8b2e65e060d32536c0a43f7404adf7
7
- data.tar.gz: 80c89f87b2bcb000b595361d65e8f1b1dfb539c0314251aded423ed81b10c3b5ec492d7f8eb600ec18d8e3554833ecf4531cfc8a8542352701de24c5be2742c7
6
+ metadata.gz: 9d0e86b6d56f3ddbcbe94141a3263568b4640c189ebd6ed759dd738b619ae47800d91714e70d683eaa1b909b4cbc553d6aaa60263ed803c327b6cfb759fc6003
7
+ data.tar.gz: 7be1e3c1c52566ae81f6c5a7deaa7d79a999f27e44b43e1a83d3f2962556776aba87468dd3fdab818076c16c7fbcb389581a2fdf5dc2016ec1ddda986fff2d52
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- fluent-plugin-k8s-metrics-agg (1.2.0)
4
+ fluent-plugin-k8s-metrics-agg (1.2.1)
5
5
  fluentd (>= 1.9.1)
6
6
  kubeclient (~> 4.9.3)
7
7
  multi_json (~> 1.14.1)
@@ -23,7 +23,7 @@ GEM
23
23
  ffi-compiler (1.0.1)
24
24
  ffi (>= 1.0.0)
25
25
  rake
26
- fluentd (1.15.1)
26
+ fluentd (1.15.3)
27
27
  bundler
28
28
  cool.io (>= 1.4.5, < 2.0.0)
29
29
  http_parser.rb (>= 0.5.1, < 0.9.0)
@@ -59,7 +59,7 @@ GEM
59
59
  mime-types (3.4.1)
60
60
  mime-types-data (~> 3.2015)
61
61
  mime-types-data (3.2022.0105)
62
- msgpack (1.5.4)
62
+ msgpack (1.6.0)
63
63
  multi_json (1.14.1)
64
64
  netrc (0.11.0)
65
65
  oj (3.10.18)
@@ -86,7 +86,7 @@ GEM
86
86
  power_assert
87
87
  tzinfo (2.0.5)
88
88
  concurrent-ruby (~> 1.0)
89
- tzinfo-data (1.2022.2)
89
+ tzinfo-data (1.2022.6)
90
90
  tzinfo (>= 1.0.0)
91
91
  unf (0.1.4)
92
92
  unf_ext
@@ -110,4 +110,4 @@ DEPENDENCIES
110
110
  webmock (~> 3.5.1)
111
111
 
112
112
  BUNDLED WITH
113
- 2.3.20
113
+ 2.3.26
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.2.0
1
+ 1.2.1
data/docker/Dockerfile CHANGED
@@ -46,7 +46,8 @@ RUN yum update -y \
46
46
  RUN groupadd -r $FLUENT_USER && \
47
47
  useradd -r -g $FLUENT_USER $FLUENT_USER && \
48
48
  mkdir -p /fluentd/log /fluentd/etc /fluentd/plugins &&\
49
- chown -R $FLUENT_USER /fluentd && chgrp -R $FLUENT_USER /fluentd
49
+ chown -R $FLUENT_USER /fluentd && chgrp -R $FLUENT_USER /fluentd && \
50
+ chmod +t /tmp
50
51
 
51
52
  USER $FLUENT_USER
52
53
  CMD bundle exec fluentd -c /fluentd/etc/fluent.conf
data/docker/Gemfile CHANGED
@@ -11,8 +11,8 @@ gem "oj", "~>3.10"
11
11
  gem 'multi_json', '~>1.14'
12
12
  gem 'http_parser.rb', '=0.8.0'
13
13
  gem 'bigdecimal', '=3.0.0'
14
- gem 'rack', '>= 2.2.3.1'
14
+ gem 'rack', '>= 3.0.0'
15
15
 
16
- gem "fluent-plugin-splunk-hec", "= 1.3.0"
16
+ gem "fluent-plugin-splunk-hec", "= 1.3.1"
17
17
 
18
18
  gem 'fluent-plugin-k8s-metrics-agg', path: 'gem/'
data/docker/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: gem
3
3
  specs:
4
- fluent-plugin-k8s-metrics-agg (1.2.0)
4
+ fluent-plugin-k8s-metrics-agg (1.2.1)
5
5
  fluentd (>= 1.9.1)
6
6
  kubeclient (~> 4.9.3)
7
7
  multi_json (~> 1.14.1)
@@ -10,9 +10,9 @@ PATH
10
10
  GEM
11
11
  remote: https://rubygems.org/
12
12
  specs:
13
- activemodel (7.0.3.1)
14
- activesupport (= 7.0.3.1)
15
- activesupport (7.0.3.1)
13
+ activemodel (7.0.4)
14
+ activesupport (= 7.0.4)
15
+ activesupport (7.0.4)
16
16
  concurrent-ruby (~> 1.0, >= 1.0.2)
17
17
  i18n (>= 1.6, < 2)
18
18
  minitest (>= 5.1)
@@ -22,12 +22,18 @@ GEM
22
22
  aes_key_wrap (1.1.0)
23
23
  attr_required (1.0.1)
24
24
  bigdecimal (3.0.0)
25
- bindata (2.4.10)
25
+ bindata (2.4.14)
26
26
  concurrent-ruby (1.1.10)
27
- connection_pool (2.2.5)
27
+ connection_pool (2.3.0)
28
28
  cool.io (1.7.1)
29
29
  domain_name (0.5.20190701)
30
30
  unf (>= 0.0.5, < 1.0.0)
31
+ faraday (2.7.1)
32
+ faraday-net_http (>= 2.0, < 3.1)
33
+ ruby2_keywords (>= 0.0.4)
34
+ faraday-follow_redirects (0.3.0)
35
+ faraday (>= 1, < 3)
36
+ faraday-net_http (3.0.2)
31
37
  ffi (1.15.5)
32
38
  ffi-compiler (1.0.1)
33
39
  ffi (>= 1.0.0)
@@ -37,13 +43,15 @@ GEM
37
43
  prometheus-client (>= 2.1.0)
38
44
  fluent-plugin-record-modifier (2.1.0)
39
45
  fluentd (>= 1.0, < 2)
40
- fluent-plugin-splunk-hec (1.3.0)
46
+ fluent-plugin-splunk-hec (1.3.1)
41
47
  fluentd (>= 1.5)
48
+ json-jwt (~> 1.15.0)
42
49
  multi_json (~> 1.13)
43
50
  net-http-persistent (~> 4.0)
44
51
  openid_connect (~> 1.1.8)
45
52
  prometheus-client (>= 2.1.0)
46
- fluentd (1.15.1)
53
+ rack-oauth2 (~> 1.19)
54
+ fluentd (1.15.3)
47
55
  bundler
48
56
  cool.io (>= 1.4.5, < 2.0.0)
49
57
  http_parser.rb (>= 0.5.1, < 0.9.0)
@@ -70,7 +78,7 @@ GEM
70
78
  httpclient (2.8.3)
71
79
  i18n (1.12.0)
72
80
  concurrent-ruby (~> 1.0)
73
- json-jwt (1.15.2)
81
+ json-jwt (1.15.3)
74
82
  activesupport (>= 4.2)
75
83
  aes_key_wrap
76
84
  bindata
@@ -88,8 +96,8 @@ GEM
88
96
  mime-types-data (~> 3.2015)
89
97
  mime-types-data (3.2022.0105)
90
98
  mini_mime (1.1.2)
91
- minitest (5.16.2)
92
- msgpack (1.5.4)
99
+ minitest (5.16.3)
100
+ msgpack (1.6.0)
93
101
  multi_json (1.14.1)
94
102
  net-http-persistent (4.0.1)
95
103
  connection_pool (~> 2.2)
@@ -107,8 +115,8 @@ GEM
107
115
  webfinger (>= 1.0.1)
108
116
  prometheus-client (4.0.0)
109
117
  public_suffix (4.0.7)
110
- rack (2.2.3.1)
111
- rack-oauth2 (1.21.2)
118
+ rack (3.0.1)
119
+ rack-oauth2 (1.21.3)
112
120
  activesupport
113
121
  attr_required
114
122
  httpclient
@@ -121,17 +129,19 @@ GEM
121
129
  http-cookie (>= 1.0.2, < 2.0)
122
130
  mime-types (>= 1.16, < 4.0)
123
131
  netrc (~> 0.8)
132
+ ruby2_keywords (0.0.5)
124
133
  serverengine (2.3.0)
125
134
  sigdump (~> 0.2.2)
126
135
  sigdump (0.2.4)
127
136
  strptime (0.2.5)
128
- swd (1.3.0)
137
+ swd (2.0.2)
129
138
  activesupport (>= 3)
130
139
  attr_required (>= 0.0.5)
131
- httpclient (>= 2.4)
140
+ faraday (~> 2.0)
141
+ faraday-follow_redirects
132
142
  tzinfo (2.0.5)
133
143
  concurrent-ruby (~> 1.0)
134
- tzinfo-data (1.2022.2)
144
+ tzinfo-data (1.2022.6)
135
145
  tzinfo (>= 1.0.0)
136
146
  unf (0.1.4)
137
147
  unf_ext
@@ -142,9 +152,10 @@ GEM
142
152
  validate_url (1.0.15)
143
153
  activemodel (>= 3.0.0)
144
154
  public_suffix
145
- webfinger (1.2.0)
155
+ webfinger (2.1.2)
146
156
  activesupport
147
- httpclient (>= 2.4)
157
+ faraday (~> 2.0)
158
+ faraday-follow_redirects
148
159
  webrick (1.7.0)
149
160
  yajl-ruby (1.4.3)
150
161
 
@@ -156,13 +167,13 @@ DEPENDENCIES
156
167
  fluent-plugin-k8s-metrics-agg!
157
168
  fluent-plugin-prometheus (>= 2.0)
158
169
  fluent-plugin-record-modifier (= 2.1.0)
159
- fluent-plugin-splunk-hec (= 1.3.0)
170
+ fluent-plugin-splunk-hec (= 1.3.1)
160
171
  fluentd (>= 1.15)
161
172
  http_parser.rb (= 0.8.0)
162
173
  kubeclient (= 4.9.3)
163
174
  multi_json (~> 1.14)
164
175
  oj (~> 3.10)
165
- rack (>= 2.2.3.1)
176
+ rack (>= 3.0.0)
166
177
 
167
178
  BUNDLED WITH
168
179
  2.1.4
data/lib/fluent/plugin/in_kubernetes_metrics_aggregator.rb CHANGED
@@ -15,6 +15,7 @@ require 'time'
15
15
  require 'fluent/plugin/input'
16
16
  require 'kubeclient'
17
17
  require 'multi_json'
18
+ require 'resolv'
18
19
  module Fluent
19
20
  module Plugin
20
21
  class KubernetesMetricsAggregatorInput < Fluent::Plugin::Input
@@ -211,6 +212,7 @@ module Fluent
211
212
  if @kubernetes_url.nil?
212
213
  # Use Kubernetes default service account if we're in a pod.
213
214
  env_host = ENV['KUBERNETES_SERVICE_HOST']
215
+ env_host = "[#{env_host}]" if env_host =~ Resolv::IPv6::Regex
214
216
  env_port = ENV['KUBERNETES_SERVICE_PORT']
215
217
  if env_host && env_port
216
218
  kubernetes_url_final = "https://#{env_host}:#{env_port}/api/"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-k8s-metrics-agg
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Splunk Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-08-16 00:00:00.000000000 Z
11
+ date: 2022-11-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler