fluent-plugin-k8s-metrics-agg 1.1.9 → 1.1.10
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 +5 -5
- data/VERSION +1 -1
- data/ci_scripts/deploy_connector.sh +7 -3
- data/docker/Dockerfile +5 -1
- data/docker/Gemfile.lock +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 70bc112ad78a8b436be2fc81cbb19333c529ace6fecfd914a6fd0322b6f1d416
|
4
|
+
data.tar.gz: dcdb1ecb991835130f35fea247e5f3da4a1a004f3be3d92bef6057e8e47096e2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 97dfe412aee7d7918ad44b3962bbf06afc34dad7fa1ab242c8c34cbe2ff282356e4270ba236f3fabfe1b58047cf63c12e23282c45734363265f599e3e15a1715
|
7
|
+
data.tar.gz: 88bd162e3dd54b0d5dcb2a3cf02ae1d596161dae5840c1b280f3a25054d2802cb25f068a2857490395f6d87d86332f89e7caaa82023dcfcf7b5bec336166620e
|
@@ -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,7 +1,7 @@
|
|
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.10)
|
5
5
|
fluentd (>= 1.9.1)
|
6
6
|
kubeclient (~> 4.6.0)
|
7
7
|
multi_json (~> 1.14.1)
|
@@ -19,7 +19,7 @@ GEM
|
|
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
|
@@ -56,7 +56,7 @@ GEM
|
|
56
56
|
mime-types (3.4.1)
|
57
57
|
mime-types-data (~> 3.2015)
|
58
58
|
mime-types-data (3.2022.0105)
|
59
|
-
msgpack (1.4.
|
59
|
+
msgpack (1.4.4)
|
60
60
|
multi_json (1.14.1)
|
61
61
|
netrc (0.11.0)
|
62
62
|
oj (3.10.18)
|
@@ -70,7 +70,7 @@ GEM
|
|
70
70
|
mime-types (>= 1.16, < 4.0)
|
71
71
|
netrc (~> 0.8)
|
72
72
|
rexml (3.2.5)
|
73
|
-
serverengine (2.2.
|
73
|
+
serverengine (2.2.5)
|
74
74
|
sigdump (~> 0.2.2)
|
75
75
|
sigdump (0.2.4)
|
76
76
|
simplecov (0.16.1)
|
@@ -107,4 +107,4 @@ DEPENDENCIES
|
|
107
107
|
webmock (~> 3.5.1)
|
108
108
|
|
109
109
|
BUNDLED WITH
|
110
|
-
2.3.
|
110
|
+
2.3.9
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.1.
|
1
|
+
1.1.10
|
@@ -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,12 +31,16 @@ 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 \
|
42
|
+
&& bundle update i18n \
|
43
|
+
&& gem uninstall -i /usr/share/gems i18n --version 1.8.11 \
|
40
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
|
41
45
|
|
42
46
|
RUN groupadd -r $FLUENT_USER && \
|
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.1.
|
4
|
+
fluent-plugin-k8s-metrics-agg (1.1.10)
|
5
5
|
fluentd (>= 1.9.1)
|
6
6
|
kubeclient (~> 4.6.0)
|
7
7
|
multi_json (~> 1.14.1)
|
@@ -42,7 +42,7 @@ GEM
|
|
42
42
|
prometheus-client (>= 2.1.0)
|
43
43
|
fluent-plugin-record-modifier (2.1.0)
|
44
44
|
fluentd (>= 1.0, < 2)
|
45
|
-
fluent-plugin-splunk-hec (1.2.
|
45
|
+
fluent-plugin-splunk-hec (1.2.11)
|
46
46
|
fluentd (>= 1.4)
|
47
47
|
multi_json (~> 1.13)
|
48
48
|
net-http-persistent (~> 3.1)
|
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.10
|
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-03-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|