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

Commit 2f3b759

Browse files
hvaghani221hvaghani221
authored
1.2.0 (#98)
1 parent a7f3148 commit 2f3b759

File tree

7 files changed

+105
-57
lines changed

7 files changed

+105
-57
lines changed

‎.fossa.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
version: 3
2+
server: https://app.fossa.com
3+
project:
4+
id: "fluent-plugin-kubernetes-objects"
5+
team: "TA-Automation"

‎.github/workflows/ci_build_test.yaml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,3 +194,36 @@ jobs:
194194
--splunk-password $CI_SPLUNK_PASSWORD \
195195
--nodes-count $MINIKUBE_NODE_COUNTS\
196196
-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 }}

‎Gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
88

99
# Specify your gem's dependencies in fluent-plugin-kubernetes_objects_input.gemspec
1010
gemspec
11+
gem 'kubeclient', git: 'https://github.com/splunk/kubeclient.git', ref: '955ec5b'

‎Gemfile.lock‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1+
GIT
2+
remote: https://github.com/splunk/kubeclient.git
3+
revision: 955ec5b62f64b6065b25a7c0c76467e8b6badf17
4+
ref: 955ec5b
5+
specs:
6+
kubeclient (4.9.3)
7+
http (>= 3.0, < 5.0)
8+
jsonpath (~> 1.0)
9+
recursive-open-struct (~> 1.1, >= 1.1.1)
10+
rest-client (~> 2.0)
11+
112
PATH
213
remote: .
314
specs:
4-
fluent-plugin-kubernetes-objects (1.1.12)
15+
fluent-plugin-kubernetes-objects (1.2.0)
516
fluentd (>= 1.9.1)
617
http_parser.rb (= 0.8.0)
718
kubeclient (~> 4.9.3)
@@ -22,12 +33,12 @@ GEM
2233
ffi-compiler (1.0.1)
2334
ffi (>= 1.0.0)
2435
rake
25-
fluentd (1.14.6)
36+
fluentd (1.15.1)
2637
bundler
2738
cool.io (>= 1.4.5, < 2.0.0)
2839
http_parser.rb (>= 0.5.1, < 0.9.0)
2940
msgpack (>= 1.3.1, < 2.0.0)
30-
serverengine (>= 2.2.5, < 3.0.0)
41+
serverengine (>= 2.3.0, < 3.0.0)
3142
sigdump (~> 0.2.2)
3243
strptime (>= 0.2.4, < 1.0.0)
3344
tzinfo (>= 1.0, < 3.0)
@@ -49,16 +60,11 @@ GEM
4960
http_parser.rb (0.8.0)
5061
jsonpath (1.1.2)
5162
multi_json
52-
kubeclient (4.9.3)
53-
http (>= 3.0, < 5.0)
54-
jsonpath (~> 1.0)
55-
recursive-open-struct (~> 1.1, >= 1.1.1)
56-
rest-client (~> 2.0)
5763
mime-types (3.4.1)
5864
mime-types-data (~> 3.2015)
5965
mime-types-data (3.2022.0105)
6066
minitest (5.15.0)
61-
msgpack (1.5.1)
67+
msgpack (1.5.4)
6268
multi_json (1.15.0)
6369
netrc (0.11.0)
6470
power_assert (2.0.1)
@@ -71,7 +77,7 @@ GEM
7177
mime-types (>= 1.16, < 4.0)
7278
netrc (~> 0.8)
7379
rexml (3.2.5)
74-
serverengine (2.2.5)
80+
serverengine (2.3.0)
7581
sigdump (~> 0.2.2)
7682
sigdump (0.2.4)
7783
simplecov (0.21.2)
@@ -83,9 +89,9 @@ GEM
8389
strptime (0.2.5)
8490
test-unit (3.5.3)
8591
power_assert
86-
tzinfo (2.0.4)
92+
tzinfo (2.0.5)
8793
concurrent-ruby (~> 1.0)
88-
tzinfo-data (1.2022.1)
94+
tzinfo-data (1.2022.2)
8995
tzinfo (>= 1.0.0)
9096
unf (0.1.4)
9197
unf_ext
@@ -95,19 +101,20 @@ GEM
95101
crack (>= 0.3.2)
96102
hashdiff (>= 0.4.0, < 2.0.0)
97103
webrick (1.7.0)
98-
yajl-ruby (1.4.2)
104+
yajl-ruby (1.4.3)
99105

100106
PLATFORMS
101107
ruby
102108

103109
DEPENDENCIES
104110
bundler (~> 2.0)
105111
fluent-plugin-kubernetes-objects!
112+
kubeclient!
106113
minitest (~> 5.11)
107114
rake (>= 12.0)
108115
simplecov
109116
test-unit (~> 3.3)
110117
webmock (~> 3.5)
111118

112119
BUNDLED WITH
113-
2.2.32
120+
2.3.11

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.12
1+
1.2.0

‎docker/Gemfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ source 'https://rubygems.org'
33
# This is separate gemfile for building docker image that has all plugins
44
# for kubernetes log collection agent
55
# List all required gems here and install via bundler to resolve dependencies
6-
gem "fluentd", ">= 1.14.2"
6+
gem "fluentd", ">= 1.15"
77
gem "fluent-plugin-prometheus", ">= 2.0"
88
gem "fluent-plugin-record-modifier", "= 2.1.0"
9-
gem "fluent-plugin-kubernetes_metadata_filter", ">= 2.9"
109
gem "fluent-plugin-jq", "= 0.5.1"
1110
gem "oj", "= 3.10.18"
12-
gem 'multi_json', '>= 1.14.1'
11+
gem 'multi_json', '~> 1.14'
1312
gem 'bigdecimal', '>= 2.0.0'
14-
gem 'kubeclient', '>= 4.9.3'
13+
gem 'kubeclient', git: 'https://github.com/splunk/kubeclient.git', ref: '955ec5b'
1514
gem 'http_parser.rb', '>= 0.5.3'
15+
gem 'rack', '>= 2.2.3.1'
1616

17-
gem "fluent-plugin-splunk-hec", ">= 1.2.5"
17+
gem "fluent-plugin-splunk-hec", "= 1.3.0"
1818

1919
gem 'fluent-plugin-kubernetes-objects', path: 'gem/'

‎docker/Gemfile.lock‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
1+
GIT
2+
remote: https://github.com/splunk/kubeclient.git
3+
revision: 955ec5b62f64b6065b25a7c0c76467e8b6badf17
4+
ref: 955ec5b
5+
specs:
6+
kubeclient (4.9.3)
7+
http (>= 3.0, < 5.0)
8+
jsonpath (~> 1.0)
9+
recursive-open-struct (~> 1.1, >= 1.1.1)
10+
rest-client (~> 2.0)
11+
112
PATH
213
remote: gem
314
specs:
4-
fluent-plugin-kubernetes-objects (1.1.12)
15+
fluent-plugin-kubernetes-objects (1.2.0)
516
fluentd (>= 1.9.1)
617
http_parser.rb (= 0.8.0)
718
kubeclient (~> 4.9.3)
819

920
GEM
1021
remote: https://rubygems.org/
1122
specs:
12-
activemodel (7.0.2.4)
13-
activesupport (= 7.0.2.4)
14-
activesupport (7.0.2.4)
23+
activemodel (7.0.3.1)
24+
activesupport (= 7.0.3.1)
25+
activesupport (7.0.3.1)
1526
concurrent-ruby (~> 1.0, >= 1.0.2)
1627
i18n (>= 1.6, < 2)
1728
minitest (>= 5.1)
@@ -34,27 +45,23 @@ GEM
3445
fluent-plugin-jq (0.5.1)
3546
fluentd (>= 0.14.10, < 2)
3647
multi_json (~> 1.13)
37-
fluent-plugin-kubernetes_metadata_filter (2.9.3)
38-
fluentd (>= 0.14.0, < 1.15)
39-
kubeclient (>= 4.0.0, < 5.0.0)
40-
lru_redux
4148
fluent-plugin-prometheus (2.0.2)
4249
fluentd (>= 1.9.1, < 2)
4350
prometheus-client (>= 2.1.0)
4451
fluent-plugin-record-modifier (2.1.0)
4552
fluentd (>= 1.0, < 2)
46-
fluent-plugin-splunk-hec (1.2.13)
47-
fluentd (>= 1.4)
53+
fluent-plugin-splunk-hec (1.3.0)
54+
fluentd (>= 1.5)
4855
multi_json (~> 1.13)
4956
net-http-persistent (~> 4.0)
5057
openid_connect (~> 1.1.8)
5158
prometheus-client (>= 2.1.0)
52-
fluentd (1.14.6)
59+
fluentd (1.15.1)
5360
bundler
5461
cool.io (>= 1.4.5, < 2.0.0)
5562
http_parser.rb (>= 0.5.1, < 0.9.0)
5663
msgpack (>= 1.3.1, < 2.0.0)
57-
serverengine (>= 2.2.5, < 3.0.0)
64+
serverengine (>= 2.3.0, < 3.0.0)
5865
sigdump (~> 0.2.2)
5966
strptime (>= 0.2.4, < 1.0.0)
6067
tzinfo (>= 1.0, < 3.0)
@@ -67,35 +74,30 @@ GEM
6774
http-form_data (~> 2.2)
6875
http-parser (~> 1.2.0)
6976
http-accept (1.7.0)
70-
http-cookie (1.0.4)
77+
http-cookie (1.0.5)
7178
domain_name (~> 0.5)
7279
http-form_data (2.3.0)
7380
http-parser (1.2.3)
7481
ffi-compiler (>= 1.0, < 2.0)
7582
http_parser.rb (0.8.0)
7683
httpclient (2.8.3)
77-
i18n (1.10.0)
84+
i18n (1.12.0)
7885
concurrent-ruby (~> 1.0)
79-
json-jwt (1.13.0)
86+
json-jwt (1.15.2)
8087
activesupport (>= 4.2)
8188
aes_key_wrap
8289
bindata
83-
jsonpath (1.1.0)
90+
httpclient
91+
jsonpath (1.1.2)
8492
multi_json
85-
kubeclient (4.9.3)
86-
http (>= 3.0, < 5.0)
87-
jsonpath (~> 1.0)
88-
recursive-open-struct (~> 1.1, >= 1.1.1)
89-
rest-client (~> 2.0)
90-
lru_redux (1.1.0)
9193
mail (2.7.1)
9294
mini_mime (>= 0.1.1)
9395
mime-types (3.4.1)
9496
mime-types-data (~> 3.2015)
9597
mime-types-data (3.2022.0105)
9698
mini_mime (1.1.2)
97-
minitest (5.15.0)
98-
msgpack (1.5.1)
99+
minitest (5.16.2)
100+
msgpack (1.5.4)
99101
multi_json (1.15.0)
100102
net-http-persistent (4.0.1)
101103
connection_pool (~> 2.2)
@@ -113,8 +115,8 @@ GEM
113115
webfinger (>= 1.0.1)
114116
prometheus-client (4.0.0)
115117
public_suffix (4.0.7)
116-
rack (2.2.3)
117-
rack-oauth2 (1.19.0)
118+
rack (2.2.4)
119+
rack-oauth2 (1.21.2)
118120
activesupport
119121
attr_required
120122
httpclient
@@ -127,32 +129,32 @@ GEM
127129
http-cookie (>= 1.0.2, < 2.0)
128130
mime-types (>= 1.16, < 4.0)
129131
netrc (~> 0.8)
130-
serverengine (2.2.5)
132+
serverengine (2.3.0)
131133
sigdump (~> 0.2.2)
132134
sigdump (0.2.4)
133135
strptime (0.2.5)
134136
swd (1.3.0)
135137
activesupport (>= 3)
136138
attr_required (>= 0.0.5)
137139
httpclient (>= 2.4)
138-
tzinfo (2.0.4)
140+
tzinfo (2.0.5)
139141
concurrent-ruby (~> 1.0)
140-
tzinfo-data (1.2022.1)
142+
tzinfo-data (1.2022.2)
141143
tzinfo (>= 1.0.0)
142144
unf (0.1.4)
143145
unf_ext
144-
unf_ext (0.0.8.1)
146+
unf_ext (0.0.8.2)
145147
validate_email (0.1.6)
146148
activemodel (>= 3.0)
147149
mail (>= 2.2.5)
148-
validate_url (1.0.13)
150+
validate_url (1.0.15)
149151
activemodel (>= 3.0.0)
150152
public_suffix
151153
webfinger (1.2.0)
152154
activesupport
153155
httpclient (>= 2.4)
154156
webrick (1.7.0)
155-
yajl-ruby (1.4.2)
157+
yajl-ruby (1.4.3)
156158

157159
PLATFORMS
158160
ruby
@@ -161,15 +163,15 @@ DEPENDENCIES
161163
bigdecimal (>= 2.0.0)
162164
fluent-plugin-jq (= 0.5.1)
163165
fluent-plugin-kubernetes-objects!
164-
fluent-plugin-kubernetes_metadata_filter (>= 2.9)
165166
fluent-plugin-prometheus (>= 2.0)
166167
fluent-plugin-record-modifier (= 2.1.0)
167-
fluent-plugin-splunk-hec (>= 1.2.5)
168-
fluentd (>= 1.14.2)
168+
fluent-plugin-splunk-hec (= 1.3.0)
169+
fluentd (>= 1.15)
169170
http_parser.rb (>= 0.5.3)
170-
kubeclient (>= 4.9.3)
171-
multi_json (>= 1.14.1)
171+
kubeclient!
172+
multi_json (~> 1.14)
172173
oj (= 3.10.18)
174+
rack (>= 2.2.3.1)
173175

174176
BUNDLED WITH
175177
2.1.4

0 commit comments

Comments
 (0)