fluent-plugin-k8s-metrics-agg 1.1.9 → 1.1.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ci_build_test.yaml +9 -5
- data/Gemfile.lock +17 -14
- data/VERSION +1 -1
- data/ci_scripts/deploy_connector.sh +7 -3
- data/docker/Dockerfile +6 -2
- data/docker/Gemfile +2 -2
- data/docker/Gemfile.lock +30 -29
- data/fluent-plugin-k8s-metrics-agg.gemspec +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7c2f3bb6503bba97da9447d76d92c2d7c74e8c945b1e3ef47f14798ebbe9b739
|
4
|
+
data.tar.gz: d77545222c199151249bc6925ae0f74a085b564263004a898c8342bc1d4c88bc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5c2df1c502cf7770684340151f09771ea9651d042359f026708677792539af870ca185aee0ecc9e56a54ea2e19f4de9a51f4c6b9a2e06b1846dc3149a396f45c
|
7
|
+
data.tar.gz: f6865ac8416c44d4c221e49f8a26ae1e88776094414b0847d2c6cbc77499d76c120cf12631c18145e89388116c8c3d5aac12bdcb5baefe09676ef50b650f2db6
|
@@ -67,8 +67,9 @@ jobs:
|
|
67
67
|
CI_INDEX_EVENTS: ci_events
|
68
68
|
CI_INDEX_OBJECTS: ci_objects
|
69
69
|
CI_INDEX_METRICS: ci_metrics
|
70
|
-
KUBERNETES_VERSION: v1.
|
71
|
-
MINIKUBE_VERSION: v1.
|
70
|
+
KUBERNETES_VERSION: v1.23.2
|
71
|
+
MINIKUBE_VERSION: v1.24.0
|
72
|
+
MINIKUBE_NODE_COUNTS: 2
|
72
73
|
GITHUB_ACTIONS: true
|
73
74
|
|
74
75
|
steps:
|
@@ -121,7 +122,7 @@ jobs:
|
|
121
122
|
chmod +x minikube
|
122
123
|
sudo mv minikube /usr/local/bin/
|
123
124
|
# Start Minikube and Wait
|
124
|
-
minikube start --driver=docker --container-runtime=docker --cpus 2 --memory 4096 --kubernetes-version=${KUBERNETES_VERSION} --no-vtx-check
|
125
|
+
minikube start --driver=docker --container-runtime=docker --cpus 2 --memory 4096 --kubernetes-version=${KUBERNETES_VERSION} --no-vtx-check -n=${MINIKUBE_NODE_COUNTS}
|
125
126
|
export JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'
|
126
127
|
until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do
|
127
128
|
sleep 1;
|
@@ -130,13 +131,15 @@ jobs:
|
|
130
131
|
- name: Install Splunk
|
131
132
|
run: |
|
132
133
|
# Wait until minikube is ready
|
133
|
-
kubectl apply -f https://docs.projectcalico.org/v3.14/manifests/calico.yaml
|
134
134
|
export JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'
|
135
135
|
until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do
|
136
136
|
echo "wait for minikube ready ..."
|
137
137
|
sleep 1;
|
138
138
|
done
|
139
139
|
kubectl get nodes
|
140
|
+
until kubectl get sa | grep -q 'default'; do
|
141
|
+
sleep 1;
|
142
|
+
done
|
140
143
|
# Install Splunk on minikube
|
141
144
|
kubectl apply -f ci_scripts/k8s-splunk.yml
|
142
145
|
# Wait until splunk is ready
|
@@ -189,4 +192,5 @@ jobs:
|
|
189
192
|
--splunkd-url https://$CI_SPLUNK_HOST:8089 \
|
190
193
|
--splunk-user admin \
|
191
194
|
--splunk-password $CI_SPLUNK_PASSWORD \
|
192
|
-
|
195
|
+
--nodes-count $MINIKUBE_NODE_COUNTS\
|
196
|
+
-p no:warnings -s -n auto
|
data/Gemfile.lock
CHANGED
@@ -1,9 +1,9 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
fluent-plugin-k8s-metrics-agg (1.1.
|
4
|
+
fluent-plugin-k8s-metrics-agg (1.1.12)
|
5
5
|
fluentd (>= 1.9.1)
|
6
|
-
kubeclient (~> 4.
|
6
|
+
kubeclient (~> 4.9.3)
|
7
7
|
multi_json (~> 1.14.1)
|
8
8
|
oj (~> 3.10.2)
|
9
9
|
|
@@ -12,23 +12,23 @@ GEM
|
|
12
12
|
specs:
|
13
13
|
addressable (2.8.0)
|
14
14
|
public_suffix (>= 2.0.2, < 5.0)
|
15
|
-
concurrent-ruby (1.1.
|
15
|
+
concurrent-ruby (1.1.10)
|
16
16
|
cool.io (1.7.1)
|
17
17
|
crack (0.4.5)
|
18
18
|
rexml
|
19
19
|
docile (1.4.0)
|
20
20
|
domain_name (0.5.20190701)
|
21
21
|
unf (>= 0.0.5, < 1.0.0)
|
22
|
-
ffi (1.15.
|
22
|
+
ffi (1.15.5)
|
23
23
|
ffi-compiler (1.0.1)
|
24
24
|
ffi (>= 1.0.0)
|
25
25
|
rake
|
26
|
-
fluentd (1.14.
|
26
|
+
fluentd (1.14.6)
|
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.2.
|
31
|
+
serverengine (>= 2.2.5, < 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)
|
@@ -49,14 +49,17 @@ GEM
|
|
49
49
|
ffi-compiler (>= 1.0, < 2.0)
|
50
50
|
http_parser.rb (0.8.0)
|
51
51
|
json (2.6.1)
|
52
|
-
|
52
|
+
jsonpath (1.1.0)
|
53
|
+
multi_json
|
54
|
+
kubeclient (4.9.3)
|
53
55
|
http (>= 3.0, < 5.0)
|
54
|
-
|
56
|
+
jsonpath (~> 1.0)
|
57
|
+
recursive-open-struct (~> 1.1, >= 1.1.1)
|
55
58
|
rest-client (~> 2.0)
|
56
59
|
mime-types (3.4.1)
|
57
60
|
mime-types-data (~> 3.2015)
|
58
61
|
mime-types-data (3.2022.0105)
|
59
|
-
msgpack (1.
|
62
|
+
msgpack (1.5.1)
|
60
63
|
multi_json (1.14.1)
|
61
64
|
netrc (0.11.0)
|
62
65
|
oj (3.10.18)
|
@@ -70,7 +73,7 @@ GEM
|
|
70
73
|
mime-types (>= 1.16, < 4.0)
|
71
74
|
netrc (~> 0.8)
|
72
75
|
rexml (3.2.5)
|
73
|
-
serverengine (2.2.
|
76
|
+
serverengine (2.2.5)
|
74
77
|
sigdump (~> 0.2.2)
|
75
78
|
sigdump (0.2.4)
|
76
79
|
simplecov (0.16.1)
|
@@ -83,17 +86,17 @@ GEM
|
|
83
86
|
power_assert
|
84
87
|
tzinfo (2.0.4)
|
85
88
|
concurrent-ruby (~> 1.0)
|
86
|
-
tzinfo-data (1.
|
89
|
+
tzinfo-data (1.2022.1)
|
87
90
|
tzinfo (>= 1.0.0)
|
88
91
|
unf (0.1.4)
|
89
92
|
unf_ext
|
90
|
-
unf_ext (0.0.8)
|
93
|
+
unf_ext (0.0.8.1)
|
91
94
|
webmock (3.5.1)
|
92
95
|
addressable (>= 2.3.6)
|
93
96
|
crack (>= 0.3.2)
|
94
97
|
hashdiff
|
95
98
|
webrick (1.7.0)
|
96
|
-
yajl-ruby (1.4.
|
99
|
+
yajl-ruby (1.4.2)
|
97
100
|
|
98
101
|
PLATFORMS
|
99
102
|
ruby
|
@@ -107,4 +110,4 @@ DEPENDENCIES
|
|
107
110
|
webmock (~> 3.5.1)
|
108
111
|
|
109
112
|
BUNDLED WITH
|
110
|
-
2.3.
|
113
|
+
2.3.12
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.1.
|
1
|
+
1.1.12
|
@@ -23,7 +23,11 @@ helm install ci-sck --set global.splunk.hec.token=$CI_SPLUNK_HEC_TOKEN \
|
|
23
23
|
--set splunk-kubernetes-metrics.imageAgg.tag=recent \
|
24
24
|
--set splunk-kubernetes-metrics.imageAgg.pullPolicy=IfNotPresent \
|
25
25
|
-f ci_scripts/sck_values.yml helm-chart/splunk-connect-for-kubernetes
|
26
|
-
|
27
|
-
|
26
|
+
|
27
|
+
kubectl get pod
|
28
|
+
# wait for deployment to finish
|
29
|
+
# metric and logging deamon set for each node + aggr + object + splunk
|
30
|
+
PODS=$((MINIKUBE_NODE_COUNTS*2+2+1))
|
31
|
+
until kubectl get pod | grep Running | [[ $(wc -l) == $PODS ]]; do
|
28
32
|
sleep 1;
|
29
|
-
done
|
33
|
+
done
|
data/docker/Dockerfile
CHANGED
@@ -31,13 +31,17 @@ RUN mkdir /licenses
|
|
31
31
|
COPY --from=builder /app/LICENSE /licenses/LICENSE
|
32
32
|
|
33
33
|
COPY --from=builder /app/docker/Gemfile* ./
|
34
|
-
|
34
|
+
RUN gem update date cgi
|
35
|
+
RUN rm -f /usr/share/gems/specifications/default/cgi-0.1.0.gemspec /usr/share/gems/specifications/default/date-3.0.0.gemspec
|
35
36
|
RUN yum update -y \
|
36
37
|
&& yum remove -y nodejs npm \
|
37
38
|
&& gem install bundler \
|
39
|
+
&& gem uninstall -i /usr/share/gems bundler \
|
38
40
|
&& gem unpack /tmp/*.gem --target gem \
|
39
41
|
&& bundle install \
|
40
|
-
&&
|
42
|
+
&& bundle update i18n \
|
43
|
+
&& 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-* 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-* binutils-* libtiff-devel-* libtiff-* || true
|
41
45
|
|
42
46
|
RUN groupadd -r $FLUENT_USER && \
|
43
47
|
useradd -r -g $FLUENT_USER $FLUENT_USER && \
|
data/docker/Gemfile
CHANGED
@@ -7,10 +7,10 @@ gem "fluentd", ">=1.14.2"
|
|
7
7
|
gem "fluent-plugin-prometheus", ">=2.0"
|
8
8
|
gem "fluent-plugin-record-modifier", "=2.1.0"
|
9
9
|
gem "fluent-plugin-kubernetes_metadata_filter", ">=2.9.2"
|
10
|
-
gem "kubeclient", "=4.
|
10
|
+
gem "kubeclient", "=4.9.3"
|
11
11
|
gem "oj", "=3.10.2"
|
12
12
|
gem 'multi_json', '=1.14.1'
|
13
|
-
gem 'http_parser.rb', '=0.
|
13
|
+
gem 'http_parser.rb', '=0.8.0'
|
14
14
|
gem 'bigdecimal', '=3.0.0'
|
15
15
|
|
16
16
|
gem "fluent-plugin-splunk-hec", ">= 1.2.7"
|
data/docker/Gemfile.lock
CHANGED
@@ -1,39 +1,38 @@
|
|
1
1
|
PATH
|
2
2
|
remote: gem
|
3
3
|
specs:
|
4
|
-
fluent-plugin-k8s-metrics-agg (1.1.
|
4
|
+
fluent-plugin-k8s-metrics-agg (1.1.12)
|
5
5
|
fluentd (>= 1.9.1)
|
6
|
-
kubeclient (~> 4.
|
6
|
+
kubeclient (~> 4.9.3)
|
7
7
|
multi_json (~> 1.14.1)
|
8
8
|
oj (~> 3.10.2)
|
9
9
|
|
10
10
|
GEM
|
11
11
|
remote: https://rubygems.org/
|
12
12
|
specs:
|
13
|
-
activemodel (
|
14
|
-
activesupport (=
|
15
|
-
activesupport (
|
13
|
+
activemodel (7.0.2.4)
|
14
|
+
activesupport (= 7.0.2.4)
|
15
|
+
activesupport (7.0.2.4)
|
16
16
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
17
17
|
i18n (>= 1.6, < 2)
|
18
18
|
minitest (>= 5.1)
|
19
19
|
tzinfo (~> 2.0)
|
20
|
-
zeitwerk (~> 2.3)
|
21
20
|
addressable (2.8.0)
|
22
21
|
public_suffix (>= 2.0.2, < 5.0)
|
23
22
|
aes_key_wrap (1.1.0)
|
24
23
|
attr_required (1.0.1)
|
25
24
|
bigdecimal (3.0.0)
|
26
25
|
bindata (2.4.10)
|
27
|
-
concurrent-ruby (1.1.
|
26
|
+
concurrent-ruby (1.1.10)
|
28
27
|
connection_pool (2.2.5)
|
29
28
|
cool.io (1.7.1)
|
30
29
|
domain_name (0.5.20190701)
|
31
30
|
unf (>= 0.0.5, < 1.0.0)
|
32
|
-
ffi (1.15.
|
31
|
+
ffi (1.15.5)
|
33
32
|
ffi-compiler (1.0.1)
|
34
33
|
ffi (>= 1.0.0)
|
35
34
|
rake
|
36
|
-
fluent-plugin-kubernetes_metadata_filter (2.9.
|
35
|
+
fluent-plugin-kubernetes_metadata_filter (2.9.5)
|
37
36
|
fluentd (>= 0.14.0, < 1.15)
|
38
37
|
kubeclient (>= 4.0.0, < 5.0.0)
|
39
38
|
lru_redux
|
@@ -42,18 +41,18 @@ GEM
|
|
42
41
|
prometheus-client (>= 2.1.0)
|
43
42
|
fluent-plugin-record-modifier (2.1.0)
|
44
43
|
fluentd (>= 1.0, < 2)
|
45
|
-
fluent-plugin-splunk-hec (1.2.
|
44
|
+
fluent-plugin-splunk-hec (1.2.13)
|
46
45
|
fluentd (>= 1.4)
|
47
46
|
multi_json (~> 1.13)
|
48
|
-
net-http-persistent (~>
|
47
|
+
net-http-persistent (~> 4.0)
|
49
48
|
openid_connect (~> 1.1.8)
|
50
49
|
prometheus-client (>= 2.1.0)
|
51
|
-
fluentd (1.14.
|
50
|
+
fluentd (1.14.6)
|
52
51
|
bundler
|
53
52
|
cool.io (>= 1.4.5, < 2.0.0)
|
54
53
|
http_parser.rb (>= 0.5.1, < 0.9.0)
|
55
54
|
msgpack (>= 1.3.1, < 2.0.0)
|
56
|
-
serverengine (>= 2.2.
|
55
|
+
serverengine (>= 2.2.5, < 3.0.0)
|
57
56
|
sigdump (~> 0.2.2)
|
58
57
|
strptime (>= 0.2.4, < 1.0.0)
|
59
58
|
tzinfo (>= 1.0, < 3.0)
|
@@ -71,29 +70,32 @@ GEM
|
|
71
70
|
http-form_data (2.3.0)
|
72
71
|
http-parser (1.2.3)
|
73
72
|
ffi-compiler (>= 1.0, < 2.0)
|
74
|
-
http_parser.rb (0.
|
73
|
+
http_parser.rb (0.8.0)
|
75
74
|
httpclient (2.8.3)
|
76
|
-
i18n (1.
|
75
|
+
i18n (1.10.0)
|
77
76
|
concurrent-ruby (~> 1.0)
|
78
77
|
json-jwt (1.13.0)
|
79
78
|
activesupport (>= 4.2)
|
80
79
|
aes_key_wrap
|
81
80
|
bindata
|
82
|
-
|
81
|
+
jsonpath (1.1.0)
|
82
|
+
multi_json
|
83
|
+
kubeclient (4.9.3)
|
83
84
|
http (>= 3.0, < 5.0)
|
84
|
-
|
85
|
+
jsonpath (~> 1.0)
|
86
|
+
recursive-open-struct (~> 1.1, >= 1.1.1)
|
85
87
|
rest-client (~> 2.0)
|
86
88
|
lru_redux (1.1.0)
|
87
89
|
mail (2.7.1)
|
88
90
|
mini_mime (>= 0.1.1)
|
89
91
|
mime-types (3.4.1)
|
90
92
|
mime-types-data (~> 3.2015)
|
91
|
-
mime-types-data (3.
|
93
|
+
mime-types-data (3.2022.0105)
|
92
94
|
mini_mime (1.1.2)
|
93
95
|
minitest (5.15.0)
|
94
|
-
msgpack (1.
|
96
|
+
msgpack (1.5.1)
|
95
97
|
multi_json (1.14.1)
|
96
|
-
net-http-persistent (
|
98
|
+
net-http-persistent (4.0.1)
|
97
99
|
connection_pool (~> 2.2)
|
98
100
|
netrc (0.11.0)
|
99
101
|
oj (3.10.2)
|
@@ -107,8 +109,8 @@ GEM
|
|
107
109
|
validate_email
|
108
110
|
validate_url
|
109
111
|
webfinger (>= 1.0.1)
|
110
|
-
prometheus-client (
|
111
|
-
public_suffix (4.0.
|
112
|
+
prometheus-client (4.0.0)
|
113
|
+
public_suffix (4.0.7)
|
112
114
|
rack (2.2.3)
|
113
115
|
rack-oauth2 (1.19.0)
|
114
116
|
activesupport
|
@@ -123,7 +125,7 @@ GEM
|
|
123
125
|
http-cookie (>= 1.0.2, < 2.0)
|
124
126
|
mime-types (>= 1.16, < 4.0)
|
125
127
|
netrc (~> 0.8)
|
126
|
-
serverengine (2.2.
|
128
|
+
serverengine (2.2.5)
|
127
129
|
sigdump (~> 0.2.2)
|
128
130
|
sigdump (0.2.4)
|
129
131
|
strptime (0.2.5)
|
@@ -133,11 +135,11 @@ GEM
|
|
133
135
|
httpclient (>= 2.4)
|
134
136
|
tzinfo (2.0.4)
|
135
137
|
concurrent-ruby (~> 1.0)
|
136
|
-
tzinfo-data (1.
|
138
|
+
tzinfo-data (1.2022.1)
|
137
139
|
tzinfo (>= 1.0.0)
|
138
140
|
unf (0.1.4)
|
139
141
|
unf_ext
|
140
|
-
unf_ext (0.0.8)
|
142
|
+
unf_ext (0.0.8.1)
|
141
143
|
validate_email (0.1.6)
|
142
144
|
activemodel (>= 3.0)
|
143
145
|
mail (>= 2.2.5)
|
@@ -148,8 +150,7 @@ GEM
|
|
148
150
|
activesupport
|
149
151
|
httpclient (>= 2.4)
|
150
152
|
webrick (1.7.0)
|
151
|
-
yajl-ruby (1.4.
|
152
|
-
zeitwerk (2.5.1)
|
153
|
+
yajl-ruby (1.4.2)
|
153
154
|
|
154
155
|
PLATFORMS
|
155
156
|
ruby
|
@@ -162,8 +163,8 @@ DEPENDENCIES
|
|
162
163
|
fluent-plugin-record-modifier (= 2.1.0)
|
163
164
|
fluent-plugin-splunk-hec (>= 1.2.7)
|
164
165
|
fluentd (>= 1.14.2)
|
165
|
-
http_parser.rb (= 0.
|
166
|
-
kubeclient (= 4.
|
166
|
+
http_parser.rb (= 0.8.0)
|
167
|
+
kubeclient (= 4.9.3)
|
167
168
|
multi_json (= 1.14.1)
|
168
169
|
oj (= 3.10.2)
|
169
170
|
|
@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
|
|
26
26
|
spec.add_development_dependency "simplecov", '~> 0.16.1'
|
27
27
|
spec.add_development_dependency 'webmock', '~> 3.5.1'
|
28
28
|
spec.add_runtime_dependency 'fluentd', '>= 1.9.1'
|
29
|
-
spec.add_runtime_dependency 'kubeclient', '~> 4.
|
29
|
+
spec.add_runtime_dependency 'kubeclient', '~> 4.9.3'
|
30
30
|
spec.add_runtime_dependency 'multi_json', '~> 1.14.1'
|
31
31
|
spec.add_runtime_dependency 'oj', '~> 3.10.2'
|
32
32
|
|
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.1.
|
4
|
+
version: 1.1.12
|
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-04-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -100,14 +100,14 @@ dependencies:
|
|
100
100
|
requirements:
|
101
101
|
- - "~>"
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version: 4.
|
103
|
+
version: 4.9.3
|
104
104
|
type: :runtime
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
108
|
- - "~>"
|
109
109
|
- !ruby/object:Gem::Version
|
110
|
-
version: 4.
|
110
|
+
version: 4.9.3
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: multi_json
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|