fluent-plugin-k8s-metrics-agg 1.1.12 → 1.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.fossa.yml +5 -0
- data/.github/workflows/ci_build_test.yaml +33 -0
- data/Gemfile.lock +12 -12
- data/VERSION +1 -1
- data/docker/Gemfile +5 -5
- data/docker/Gemfile.lock +25 -29
- data/lib/fluent/plugin/in_kubernetes_metrics_aggregator.rb +7 -0
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d80783bf51707cd2587e12afab8b264a772a15f2ac8e28357a7cfbf7db756735
|
4
|
+
data.tar.gz: de12ab83988f0d07a7c50f875896915fd87f824222cd8c2ae4ce05c81e1dfa1c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 04010cd42dc57248e834edfdcc694f6b6b85297d2f94d3a9d7f5230c4d135f3865105dd98ead308fb061e8b450bd6a350e8b2e65e060d32536c0a43f7404adf7
|
7
|
+
data.tar.gz: 80c89f87b2bcb000b595361d65e8f1b1dfb539c0314251aded423ed81b10c3b5ec492d7f8eb600ec18d8e3554833ecf4531cfc8a8542352701de24c5be2742c7
|
data/.fossa.yml
ADDED
@@ -194,3 +194,36 @@ jobs:
|
|
194
194
|
--splunk-password $CI_SPLUNK_PASSWORD \
|
195
195
|
--nodes-count $MINIKUBE_NODE_COUNTS\
|
196
196
|
-p no:warnings -s -n auto
|
197
|
+
fossa-scan:
|
198
|
+
continue-on-error: true
|
199
|
+
runs-on: ubuntu-latest
|
200
|
+
steps:
|
201
|
+
- uses: actions/checkout@v3
|
202
|
+
- name: run fossa anlyze and create report
|
203
|
+
run: |
|
204
|
+
curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install-latest.sh | bash
|
205
|
+
fossa analyze --include-unused-deps --debug
|
206
|
+
fossa report attribution --format text > /tmp/THIRDPARTY
|
207
|
+
env:
|
208
|
+
FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
|
209
|
+
- name: upload THIRDPARTY file
|
210
|
+
uses: actions/upload-artifact@v2
|
211
|
+
with:
|
212
|
+
name: THIRDPARTY
|
213
|
+
path: /tmp/THIRDPARTY
|
214
|
+
- name: run fossa test
|
215
|
+
run: |
|
216
|
+
fossa test --debug
|
217
|
+
env:
|
218
|
+
FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
|
219
|
+
semgrep:
|
220
|
+
runs-on: ubuntu-latest
|
221
|
+
name: security-sast-semgrep
|
222
|
+
if: github.actor != 'dependabot[bot]'
|
223
|
+
steps:
|
224
|
+
- uses: actions/checkout@v3
|
225
|
+
- name: Semgrep
|
226
|
+
id: semgrep
|
227
|
+
uses: returntocorp/semgrep-action@v1
|
228
|
+
with:
|
229
|
+
publishToken: ${{ secrets.SEMGREP_PUBLISH_TOKEN }}
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
fluent-plugin-k8s-metrics-agg (1.
|
4
|
+
fluent-plugin-k8s-metrics-agg (1.2.0)
|
5
5
|
fluentd (>= 1.9.1)
|
6
6
|
kubeclient (~> 4.9.3)
|
7
7
|
multi_json (~> 1.14.1)
|
@@ -23,12 +23,12 @@ GEM
|
|
23
23
|
ffi-compiler (1.0.1)
|
24
24
|
ffi (>= 1.0.0)
|
25
25
|
rake
|
26
|
-
fluentd (1.
|
26
|
+
fluentd (1.15.1)
|
27
27
|
bundler
|
28
28
|
cool.io (>= 1.4.5, < 2.0.0)
|
29
29
|
http_parser.rb (>= 0.5.1, < 0.9.0)
|
30
30
|
msgpack (>= 1.3.1, < 2.0.0)
|
31
|
-
serverengine (>= 2.
|
31
|
+
serverengine (>= 2.3.0, < 3.0.0)
|
32
32
|
sigdump (~> 0.2.2)
|
33
33
|
strptime (>= 0.2.4, < 1.0.0)
|
34
34
|
tzinfo (>= 1.0, < 3.0)
|
@@ -42,14 +42,14 @@ GEM
|
|
42
42
|
http-form_data (~> 2.2)
|
43
43
|
http-parser (~> 1.2.0)
|
44
44
|
http-accept (1.7.0)
|
45
|
-
http-cookie (1.0.
|
45
|
+
http-cookie (1.0.5)
|
46
46
|
domain_name (~> 0.5)
|
47
47
|
http-form_data (2.3.0)
|
48
48
|
http-parser (1.2.3)
|
49
49
|
ffi-compiler (>= 1.0, < 2.0)
|
50
50
|
http_parser.rb (0.8.0)
|
51
51
|
json (2.6.1)
|
52
|
-
jsonpath (1.1.
|
52
|
+
jsonpath (1.1.2)
|
53
53
|
multi_json
|
54
54
|
kubeclient (4.9.3)
|
55
55
|
http (>= 3.0, < 5.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.
|
62
|
+
msgpack (1.5.4)
|
63
63
|
multi_json (1.14.1)
|
64
64
|
netrc (0.11.0)
|
65
65
|
oj (3.10.18)
|
@@ -73,7 +73,7 @@ GEM
|
|
73
73
|
mime-types (>= 1.16, < 4.0)
|
74
74
|
netrc (~> 0.8)
|
75
75
|
rexml (3.2.5)
|
76
|
-
serverengine (2.
|
76
|
+
serverengine (2.3.0)
|
77
77
|
sigdump (~> 0.2.2)
|
78
78
|
sigdump (0.2.4)
|
79
79
|
simplecov (0.16.1)
|
@@ -84,19 +84,19 @@ GEM
|
|
84
84
|
strptime (0.2.5)
|
85
85
|
test-unit (3.3.9)
|
86
86
|
power_assert
|
87
|
-
tzinfo (2.0.
|
87
|
+
tzinfo (2.0.5)
|
88
88
|
concurrent-ruby (~> 1.0)
|
89
|
-
tzinfo-data (1.2022.
|
89
|
+
tzinfo-data (1.2022.2)
|
90
90
|
tzinfo (>= 1.0.0)
|
91
91
|
unf (0.1.4)
|
92
92
|
unf_ext
|
93
|
-
unf_ext (0.0.8.
|
93
|
+
unf_ext (0.0.8.2)
|
94
94
|
webmock (3.5.1)
|
95
95
|
addressable (>= 2.3.6)
|
96
96
|
crack (>= 0.3.2)
|
97
97
|
hashdiff
|
98
98
|
webrick (1.7.0)
|
99
|
-
yajl-ruby (1.4.
|
99
|
+
yajl-ruby (1.4.3)
|
100
100
|
|
101
101
|
PLATFORMS
|
102
102
|
ruby
|
@@ -110,4 +110,4 @@ DEPENDENCIES
|
|
110
110
|
webmock (~> 3.5.1)
|
111
111
|
|
112
112
|
BUNDLED WITH
|
113
|
-
2.3.
|
113
|
+
2.3.20
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.
|
1
|
+
1.2.0
|
data/docker/Gemfile
CHANGED
@@ -3,16 +3,16 @@ source 'https://rubygems.org'
|
|
3
3
|
# This is separate gemfile for building docker image that has all plugins
|
4
4
|
# for kubernetes log collection agent
|
5
5
|
# List all required gems here and install via bundler to resolve dependencies
|
6
|
-
gem "fluentd", ">=1.
|
6
|
+
gem "fluentd", ">=1.15"
|
7
7
|
gem "fluent-plugin-prometheus", ">=2.0"
|
8
8
|
gem "fluent-plugin-record-modifier", "=2.1.0"
|
9
|
-
gem "fluent-plugin-kubernetes_metadata_filter", ">=2.9.2"
|
10
9
|
gem "kubeclient", "=4.9.3"
|
11
|
-
gem "oj", "
|
12
|
-
gem 'multi_json', '
|
10
|
+
gem "oj", "~>3.10"
|
11
|
+
gem 'multi_json', '~>1.14'
|
13
12
|
gem 'http_parser.rb', '=0.8.0'
|
14
13
|
gem 'bigdecimal', '=3.0.0'
|
14
|
+
gem 'rack', '>= 2.2.3.1'
|
15
15
|
|
16
|
-
gem "fluent-plugin-splunk-hec", "
|
16
|
+
gem "fluent-plugin-splunk-hec", "= 1.3.0"
|
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.
|
4
|
+
fluent-plugin-k8s-metrics-agg (1.2.0)
|
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.
|
14
|
-
activesupport (= 7.0.
|
15
|
-
activesupport (7.0.
|
13
|
+
activemodel (7.0.3.1)
|
14
|
+
activesupport (= 7.0.3.1)
|
15
|
+
activesupport (7.0.3.1)
|
16
16
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
17
17
|
i18n (>= 1.6, < 2)
|
18
18
|
minitest (>= 5.1)
|
@@ -32,27 +32,23 @@ GEM
|
|
32
32
|
ffi-compiler (1.0.1)
|
33
33
|
ffi (>= 1.0.0)
|
34
34
|
rake
|
35
|
-
fluent-plugin-kubernetes_metadata_filter (2.9.5)
|
36
|
-
fluentd (>= 0.14.0, < 1.15)
|
37
|
-
kubeclient (>= 4.0.0, < 5.0.0)
|
38
|
-
lru_redux
|
39
35
|
fluent-plugin-prometheus (2.0.2)
|
40
36
|
fluentd (>= 1.9.1, < 2)
|
41
37
|
prometheus-client (>= 2.1.0)
|
42
38
|
fluent-plugin-record-modifier (2.1.0)
|
43
39
|
fluentd (>= 1.0, < 2)
|
44
|
-
fluent-plugin-splunk-hec (1.
|
45
|
-
fluentd (>= 1.
|
40
|
+
fluent-plugin-splunk-hec (1.3.0)
|
41
|
+
fluentd (>= 1.5)
|
46
42
|
multi_json (~> 1.13)
|
47
43
|
net-http-persistent (~> 4.0)
|
48
44
|
openid_connect (~> 1.1.8)
|
49
45
|
prometheus-client (>= 2.1.0)
|
50
|
-
fluentd (1.
|
46
|
+
fluentd (1.15.1)
|
51
47
|
bundler
|
52
48
|
cool.io (>= 1.4.5, < 2.0.0)
|
53
49
|
http_parser.rb (>= 0.5.1, < 0.9.0)
|
54
50
|
msgpack (>= 1.3.1, < 2.0.0)
|
55
|
-
serverengine (>= 2.
|
51
|
+
serverengine (>= 2.3.0, < 3.0.0)
|
56
52
|
sigdump (~> 0.2.2)
|
57
53
|
strptime (>= 0.2.4, < 1.0.0)
|
58
54
|
tzinfo (>= 1.0, < 3.0)
|
@@ -72,12 +68,13 @@ GEM
|
|
72
68
|
ffi-compiler (>= 1.0, < 2.0)
|
73
69
|
http_parser.rb (0.8.0)
|
74
70
|
httpclient (2.8.3)
|
75
|
-
i18n (1.
|
71
|
+
i18n (1.12.0)
|
76
72
|
concurrent-ruby (~> 1.0)
|
77
|
-
json-jwt (1.
|
73
|
+
json-jwt (1.15.2)
|
78
74
|
activesupport (>= 4.2)
|
79
75
|
aes_key_wrap
|
80
76
|
bindata
|
77
|
+
httpclient
|
81
78
|
jsonpath (1.1.0)
|
82
79
|
multi_json
|
83
80
|
kubeclient (4.9.3)
|
@@ -85,15 +82,14 @@ GEM
|
|
85
82
|
jsonpath (~> 1.0)
|
86
83
|
recursive-open-struct (~> 1.1, >= 1.1.1)
|
87
84
|
rest-client (~> 2.0)
|
88
|
-
lru_redux (1.1.0)
|
89
85
|
mail (2.7.1)
|
90
86
|
mini_mime (>= 0.1.1)
|
91
87
|
mime-types (3.4.1)
|
92
88
|
mime-types-data (~> 3.2015)
|
93
89
|
mime-types-data (3.2022.0105)
|
94
90
|
mini_mime (1.1.2)
|
95
|
-
minitest (5.
|
96
|
-
msgpack (1.5.
|
91
|
+
minitest (5.16.2)
|
92
|
+
msgpack (1.5.4)
|
97
93
|
multi_json (1.14.1)
|
98
94
|
net-http-persistent (4.0.1)
|
99
95
|
connection_pool (~> 2.2)
|
@@ -111,8 +107,8 @@ GEM
|
|
111
107
|
webfinger (>= 1.0.1)
|
112
108
|
prometheus-client (4.0.0)
|
113
109
|
public_suffix (4.0.7)
|
114
|
-
rack (2.2.3)
|
115
|
-
rack-oauth2 (1.
|
110
|
+
rack (2.2.3.1)
|
111
|
+
rack-oauth2 (1.21.2)
|
116
112
|
activesupport
|
117
113
|
attr_required
|
118
114
|
httpclient
|
@@ -125,7 +121,7 @@ GEM
|
|
125
121
|
http-cookie (>= 1.0.2, < 2.0)
|
126
122
|
mime-types (>= 1.16, < 4.0)
|
127
123
|
netrc (~> 0.8)
|
128
|
-
serverengine (2.
|
124
|
+
serverengine (2.3.0)
|
129
125
|
sigdump (~> 0.2.2)
|
130
126
|
sigdump (0.2.4)
|
131
127
|
strptime (0.2.5)
|
@@ -133,9 +129,9 @@ GEM
|
|
133
129
|
activesupport (>= 3)
|
134
130
|
attr_required (>= 0.0.5)
|
135
131
|
httpclient (>= 2.4)
|
136
|
-
tzinfo (2.0.
|
132
|
+
tzinfo (2.0.5)
|
137
133
|
concurrent-ruby (~> 1.0)
|
138
|
-
tzinfo-data (1.2022.
|
134
|
+
tzinfo-data (1.2022.2)
|
139
135
|
tzinfo (>= 1.0.0)
|
140
136
|
unf (0.1.4)
|
141
137
|
unf_ext
|
@@ -143,14 +139,14 @@ GEM
|
|
143
139
|
validate_email (0.1.6)
|
144
140
|
activemodel (>= 3.0)
|
145
141
|
mail (>= 2.2.5)
|
146
|
-
validate_url (1.0.
|
142
|
+
validate_url (1.0.15)
|
147
143
|
activemodel (>= 3.0.0)
|
148
144
|
public_suffix
|
149
145
|
webfinger (1.2.0)
|
150
146
|
activesupport
|
151
147
|
httpclient (>= 2.4)
|
152
148
|
webrick (1.7.0)
|
153
|
-
yajl-ruby (1.4.
|
149
|
+
yajl-ruby (1.4.3)
|
154
150
|
|
155
151
|
PLATFORMS
|
156
152
|
ruby
|
@@ -158,15 +154,15 @@ PLATFORMS
|
|
158
154
|
DEPENDENCIES
|
159
155
|
bigdecimal (= 3.0.0)
|
160
156
|
fluent-plugin-k8s-metrics-agg!
|
161
|
-
fluent-plugin-kubernetes_metadata_filter (>= 2.9.2)
|
162
157
|
fluent-plugin-prometheus (>= 2.0)
|
163
158
|
fluent-plugin-record-modifier (= 2.1.0)
|
164
|
-
fluent-plugin-splunk-hec (
|
165
|
-
fluentd (>= 1.
|
159
|
+
fluent-plugin-splunk-hec (= 1.3.0)
|
160
|
+
fluentd (>= 1.15)
|
166
161
|
http_parser.rb (= 0.8.0)
|
167
162
|
kubeclient (= 4.9.3)
|
168
|
-
multi_json (
|
169
|
-
oj (
|
163
|
+
multi_json (~> 1.14)
|
164
|
+
oj (~> 3.10)
|
165
|
+
rack (>= 2.2.3.1)
|
170
166
|
|
171
167
|
BUNDLED WITH
|
172
168
|
2.1.4
|
@@ -177,6 +177,10 @@ module Fluent
|
|
177
177
|
|
178
178
|
private
|
179
179
|
|
180
|
+
def update_kubeclient_header
|
181
|
+
@client.headers[:Authorization] = 'Bearer ' + File.read(@bearer_token_file) if @bearer_token_file
|
182
|
+
end
|
183
|
+
|
180
184
|
def parse_tag
|
181
185
|
@tag_prefix, @tag_suffix = @tag.split('*') if @tag.include?('*')
|
182
186
|
end
|
@@ -371,6 +375,7 @@ module Fluent
|
|
371
375
|
end
|
372
376
|
|
373
377
|
def scrape_limits_requests_metrics
|
378
|
+
update_kubeclient_header
|
374
379
|
response = limits_requests_api.get(@client.headers)
|
375
380
|
handle_limits_requests_res(response)
|
376
381
|
rescue StandardError => e
|
@@ -473,6 +478,7 @@ module Fluent
|
|
473
478
|
end
|
474
479
|
|
475
480
|
def scrape_node_metrics
|
481
|
+
update_kubeclient_header
|
476
482
|
response = node_api.get(@client.headers)
|
477
483
|
handle_node_response(response)
|
478
484
|
rescue StandardError => e
|
@@ -556,6 +562,7 @@ module Fluent
|
|
556
562
|
end
|
557
563
|
|
558
564
|
def scrape_resource_usage_metrics
|
565
|
+
update_kubeclient_header
|
559
566
|
response = resource_usage_api.get(@client.headers)
|
560
567
|
handle_resource_usage_response(response)
|
561
568
|
rescue StandardError => e
|
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.
|
4
|
+
version: 1.2.0
|
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-
|
11
|
+
date: 2022-08-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -144,6 +144,7 @@ executables: []
|
|
144
144
|
extensions: []
|
145
145
|
extra_rdoc_files: []
|
146
146
|
files:
|
147
|
+
- ".fossa.yml"
|
147
148
|
- ".github/ISSUE_TEMPLATE/bug_report.md"
|
148
149
|
- ".github/ISSUE_TEMPLATE/enhancement_request.md"
|
149
150
|
- ".github/ISSUE_TEMPLATE/failing_test.md"
|