fluent-plugin-k8s-metrics-agg 1.1.5 → 1.1.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +16 -14
- data/Makefile +1 -2
- data/VERSION +1 -1
- data/docker/Dockerfile +1 -4
- data/docker/Gemfile +2 -2
- data/docker/Gemfile.lock +21 -23
- data/docker/build.sh +1 -2
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6641f99359ffab772e865190bfa9a79ef2b4a0595bddbf1049f0383f2747faf6
|
4
|
+
data.tar.gz: 8e8c5930de05b249fcd0b08e77400bc6a46c7647e174e6c6aa578b511b8b6505
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 474bf51f0ee79492089d59825dc7953b38291e6c756cbfdb06bf97f6e315089c3b729bf65d390c08f5c820eaeab25e9b59a21ffd5bb9ee1dab143a8e883016ab
|
7
|
+
data.tar.gz: aba203377d10978f7ba0e982d592f37218846822e60f17755defd91796f2d77fe15193a2fbd0b7f693e491425d6aaa1e9e97f9dc254a7ad3d864b72d972cb50c
|
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.6)
|
5
5
|
fluentd (>= 1.9.1)
|
6
6
|
kubeclient (~> 4.6.0)
|
7
7
|
multi_json (~> 1.14.1)
|
@@ -10,29 +10,30 @@ PATH
|
|
10
10
|
GEM
|
11
11
|
remote: https://rubygems.org/
|
12
12
|
specs:
|
13
|
-
addressable (2.
|
13
|
+
addressable (2.8.0)
|
14
14
|
public_suffix (>= 2.0.2, < 5.0)
|
15
|
-
concurrent-ruby (1.1.
|
15
|
+
concurrent-ruby (1.1.9)
|
16
16
|
cool.io (1.7.1)
|
17
17
|
crack (0.4.5)
|
18
18
|
rexml
|
19
|
-
docile (1.
|
19
|
+
docile (1.4.0)
|
20
20
|
domain_name (0.5.20190701)
|
21
21
|
unf (>= 0.0.5, < 1.0.0)
|
22
|
-
ffi (1.
|
22
|
+
ffi (1.15.3)
|
23
23
|
ffi-compiler (1.0.1)
|
24
24
|
ffi (>= 1.0.0)
|
25
25
|
rake
|
26
|
-
fluentd (1.
|
26
|
+
fluentd (1.13.2)
|
27
27
|
bundler
|
28
28
|
cool.io (>= 1.4.5, < 2.0.0)
|
29
|
-
http_parser.rb (>= 0.5.1, < 0.
|
29
|
+
http_parser.rb (>= 0.5.1, < 0.8.0)
|
30
30
|
msgpack (>= 1.3.1, < 2.0.0)
|
31
31
|
serverengine (>= 2.2.2, < 3.0.0)
|
32
32
|
sigdump (~> 0.2.2)
|
33
33
|
strptime (>= 0.2.2, < 1.0.0)
|
34
34
|
tzinfo (>= 1.0, < 3.0)
|
35
35
|
tzinfo-data (~> 1.0)
|
36
|
+
webrick (>= 1.4.2, < 1.8.0)
|
36
37
|
yajl-ruby (~> 1.0)
|
37
38
|
hashdiff (1.0.1)
|
38
39
|
http (4.4.1)
|
@@ -41,12 +42,12 @@ GEM
|
|
41
42
|
http-form_data (~> 2.2)
|
42
43
|
http-parser (~> 1.2.0)
|
43
44
|
http-accept (1.7.0)
|
44
|
-
http-cookie (1.0.
|
45
|
+
http-cookie (1.0.4)
|
45
46
|
domain_name (~> 0.5)
|
46
47
|
http-form_data (2.3.0)
|
47
48
|
http-parser (1.2.3)
|
48
49
|
ffi-compiler (>= 1.0, < 2.0)
|
49
|
-
http_parser.rb (0.
|
50
|
+
http_parser.rb (0.7.0)
|
50
51
|
json (2.5.1)
|
51
52
|
kubeclient (4.6.0)
|
52
53
|
http (>= 3.0, < 5.0)
|
@@ -54,22 +55,22 @@ GEM
|
|
54
55
|
rest-client (~> 2.0)
|
55
56
|
mime-types (3.3.1)
|
56
57
|
mime-types-data (~> 3.2015)
|
57
|
-
mime-types-data (3.2021.
|
58
|
+
mime-types-data (3.2021.0704)
|
58
59
|
msgpack (1.4.2)
|
59
60
|
multi_json (1.14.1)
|
60
61
|
netrc (0.11.0)
|
61
62
|
oj (3.10.18)
|
62
63
|
power_assert (2.0.0)
|
63
64
|
public_suffix (4.0.6)
|
64
|
-
rake (13.0.
|
65
|
+
rake (13.0.6)
|
65
66
|
recursive-open-struct (1.1.3)
|
66
67
|
rest-client (2.1.0)
|
67
68
|
http-accept (>= 1.7.0, < 2.0)
|
68
69
|
http-cookie (>= 1.0.2, < 2.0)
|
69
70
|
mime-types (>= 1.16, < 4.0)
|
70
71
|
netrc (~> 0.8)
|
71
|
-
rexml (3.2.
|
72
|
-
serverengine (2.2.
|
72
|
+
rexml (3.2.5)
|
73
|
+
serverengine (2.2.4)
|
73
74
|
sigdump (~> 0.2.2)
|
74
75
|
sigdump (0.2.4)
|
75
76
|
simplecov (0.16.1)
|
@@ -91,6 +92,7 @@ GEM
|
|
91
92
|
addressable (>= 2.3.6)
|
92
93
|
crack (>= 0.3.2)
|
93
94
|
hashdiff
|
95
|
+
webrick (1.7.0)
|
94
96
|
yajl-ruby (1.4.1)
|
95
97
|
|
96
98
|
PLATFORMS
|
@@ -105,4 +107,4 @@ DEPENDENCIES
|
|
105
107
|
webmock (~> 3.5.1)
|
106
108
|
|
107
109
|
BUNDLED WITH
|
108
|
-
2.2.
|
110
|
+
2.2.23
|
data/Makefile
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
VERSION := $(shell sh -c 'cat VERSION')
|
2
|
-
NODEJS_VERSION := 14.15.1
|
3
2
|
|
4
3
|
clean_pkg:
|
5
4
|
@rm -rf pkg/* docker/*.gem
|
@@ -17,7 +16,7 @@ docker: build install-deps
|
|
17
16
|
@cp pkg/fluent-plugin-*.gem docker
|
18
17
|
@mkdir -p docker/licenses
|
19
18
|
@cp -rp LICENSE docker/licenses/
|
20
|
-
@docker build --no-cache --pull --build-arg VERSION=$(VERSION)
|
19
|
+
@docker build --no-cache --pull --build-arg VERSION=$(VERSION) -t splunk/k8s-metrics-aggr:$(VERSION) ./docker
|
21
20
|
|
22
21
|
unit-test:
|
23
22
|
@bundle exec rake test
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.1.
|
1
|
+
1.1.6
|
data/docker/Dockerfile
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
FROM registry.access.redhat.com/ubi8/ruby-27
|
2
2
|
|
3
3
|
ARG VERSION
|
4
|
-
ARG NODEJS_VERSION
|
5
4
|
|
6
5
|
LABEL name="Splunk Connect for Kubernetes Metrics Aggregator container" \
|
7
6
|
maintainer="DataEdge@splunk.com" \
|
@@ -21,9 +20,7 @@ COPY *.gem /tmp/
|
|
21
20
|
|
22
21
|
COPY Gemfile* ./
|
23
22
|
RUN yum update -y \
|
24
|
-
&&
|
25
|
-
&& yum remove -y nodejs \
|
26
|
-
&& n ${NODEJS_VERSION} \
|
23
|
+
&& yum remove -y nodejs npm \
|
27
24
|
&& gem install bundler \
|
28
25
|
&& gem unpack /tmp/*.gem --target gem \
|
29
26
|
&& bundle install
|
data/docker/Gemfile
CHANGED
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
|
|
4
4
|
# for kubernetes log collection agent
|
5
5
|
# List all required gems here and install via bundler to resolve dependencies
|
6
6
|
gem "fluentd", "=1.11.5"
|
7
|
-
gem "fluent-plugin-prometheus", "
|
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.5.3"
|
10
10
|
gem "kubeclient", "=4.6.0"
|
@@ -13,6 +13,6 @@ gem 'multi_json', '=1.14.1'
|
|
13
13
|
gem 'http_parser.rb', '=0.5.3'
|
14
14
|
gem 'bigdecimal', '=3.0.0'
|
15
15
|
|
16
|
-
gem "fluent-plugin-splunk-hec", ">= 1.2.
|
16
|
+
gem "fluent-plugin-splunk-hec", ">= 1.2.7"
|
17
17
|
|
18
18
|
gem 'fluent-plugin-k8s-metrics-agg', path: 'gem/'
|
data/docker/Gemfile.lock
CHANGED
@@ -10,26 +10,26 @@ PATH
|
|
10
10
|
GEM
|
11
11
|
remote: https://rubygems.org/
|
12
12
|
specs:
|
13
|
-
activemodel (6.1.
|
14
|
-
activesupport (= 6.1.
|
15
|
-
activesupport (6.1.
|
13
|
+
activemodel (6.1.4)
|
14
|
+
activesupport (= 6.1.4)
|
15
|
+
activesupport (6.1.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
20
|
zeitwerk (~> 2.3)
|
21
|
-
addressable (2.
|
21
|
+
addressable (2.8.0)
|
22
22
|
public_suffix (>= 2.0.2, < 5.0)
|
23
23
|
aes_key_wrap (1.1.0)
|
24
24
|
attr_required (1.0.1)
|
25
25
|
bigdecimal (3.0.0)
|
26
|
-
bindata (2.4.
|
27
|
-
concurrent-ruby (1.1.
|
28
|
-
connection_pool (2.2.
|
26
|
+
bindata (2.4.10)
|
27
|
+
concurrent-ruby (1.1.9)
|
28
|
+
connection_pool (2.2.5)
|
29
29
|
cool.io (1.7.1)
|
30
30
|
domain_name (0.5.20190701)
|
31
31
|
unf (>= 0.0.5, < 1.0.0)
|
32
|
-
ffi (1.15.
|
32
|
+
ffi (1.15.3)
|
33
33
|
ffi-compiler (1.0.1)
|
34
34
|
ffi (>= 1.0.0)
|
35
35
|
rake
|
@@ -37,17 +37,17 @@ GEM
|
|
37
37
|
fluentd (>= 0.14.0, < 1.12)
|
38
38
|
kubeclient (< 5)
|
39
39
|
lru_redux
|
40
|
-
fluent-plugin-prometheus (
|
40
|
+
fluent-plugin-prometheus (2.0.1)
|
41
41
|
fluentd (>= 1.9.1, < 2)
|
42
|
-
prometheus-client (
|
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.7)
|
46
46
|
fluentd (>= 1.4)
|
47
47
|
multi_json (~> 1.13)
|
48
48
|
net-http-persistent (~> 3.1)
|
49
49
|
openid_connect (~> 1.1.8)
|
50
|
-
prometheus-client (
|
50
|
+
prometheus-client (>= 2.1.0)
|
51
51
|
fluentd (1.11.5)
|
52
52
|
cool.io (>= 1.4.5, < 2.0.0)
|
53
53
|
http_parser.rb (>= 0.5.1, < 0.7.0)
|
@@ -64,14 +64,14 @@ GEM
|
|
64
64
|
http-form_data (~> 2.2)
|
65
65
|
http-parser (~> 1.2.0)
|
66
66
|
http-accept (1.7.0)
|
67
|
-
http-cookie (1.0.
|
67
|
+
http-cookie (1.0.4)
|
68
68
|
domain_name (~> 0.5)
|
69
69
|
http-form_data (2.3.0)
|
70
70
|
http-parser (1.2.3)
|
71
71
|
ffi-compiler (>= 1.0, < 2.0)
|
72
72
|
http_parser.rb (0.5.3)
|
73
73
|
httpclient (2.8.3)
|
74
|
-
i18n (1.8.
|
74
|
+
i18n (1.8.10)
|
75
75
|
concurrent-ruby (~> 1.0)
|
76
76
|
json-jwt (1.13.0)
|
77
77
|
activesupport (>= 4.2)
|
@@ -86,8 +86,8 @@ GEM
|
|
86
86
|
mini_mime (>= 0.1.1)
|
87
87
|
mime-types (3.3.1)
|
88
88
|
mime-types-data (~> 3.2015)
|
89
|
-
mime-types-data (3.2021.
|
90
|
-
mini_mime (1.0
|
89
|
+
mime-types-data (3.2021.0704)
|
90
|
+
mini_mime (1.1.0)
|
91
91
|
minitest (5.14.4)
|
92
92
|
msgpack (1.4.2)
|
93
93
|
multi_json (1.14.1)
|
@@ -105,25 +105,23 @@ GEM
|
|
105
105
|
validate_email
|
106
106
|
validate_url
|
107
107
|
webfinger (>= 1.0.1)
|
108
|
-
prometheus-client (
|
109
|
-
quantile (~> 0.2.1)
|
108
|
+
prometheus-client (2.1.0)
|
110
109
|
public_suffix (4.0.6)
|
111
|
-
quantile (0.2.1)
|
112
110
|
rack (2.2.3)
|
113
|
-
rack-oauth2 (1.
|
111
|
+
rack-oauth2 (1.17.0)
|
114
112
|
activesupport
|
115
113
|
attr_required
|
116
114
|
httpclient
|
117
115
|
json-jwt (>= 1.11.0)
|
118
116
|
rack (>= 2.1.0)
|
119
|
-
rake (13.0.
|
117
|
+
rake (13.0.6)
|
120
118
|
recursive-open-struct (1.1.3)
|
121
119
|
rest-client (2.1.0)
|
122
120
|
http-accept (>= 1.7.0, < 2.0)
|
123
121
|
http-cookie (>= 1.0.2, < 2.0)
|
124
122
|
mime-types (>= 1.16, < 4.0)
|
125
123
|
netrc (~> 0.8)
|
126
|
-
serverengine (2.2.
|
124
|
+
serverengine (2.2.4)
|
127
125
|
sigdump (~> 0.2.2)
|
128
126
|
sigdump (0.2.4)
|
129
127
|
strptime (0.2.5)
|
@@ -157,7 +155,7 @@ DEPENDENCIES
|
|
157
155
|
bigdecimal (= 3.0.0)
|
158
156
|
fluent-plugin-k8s-metrics-agg!
|
159
157
|
fluent-plugin-kubernetes_metadata_filter (= 2.5.3)
|
160
|
-
fluent-plugin-prometheus (
|
158
|
+
fluent-plugin-prometheus (>= 2.0)
|
161
159
|
fluent-plugin-record-modifier (= 2.1.0)
|
162
160
|
fluent-plugin-splunk-hec (>= 1.2.5)
|
163
161
|
fluentd (= 1.11.5)
|
data/docker/build.sh
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
#!/usr/bin/env bash
|
2
2
|
set -e
|
3
3
|
TAG=$1
|
4
|
-
NODEJS_VERSION=14.15.1
|
5
4
|
|
6
5
|
# Install dependecies
|
7
6
|
gem install bundler
|
@@ -17,4 +16,4 @@ VERSION=`cat VERSION`
|
|
17
16
|
echo "Copying licenses to be included in the docker image..."
|
18
17
|
mkdir -p docker/licenses
|
19
18
|
cp -rp LICENSE docker/licenses/
|
20
|
-
docker build --no-cache --pull --build-arg VERSION=$VERSION --
|
19
|
+
docker build --no-cache --pull --build-arg VERSION=$VERSION --no-cache -t splunk/k8s-metrics-aggr:$TAG ./docker
|
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.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Splunk Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-07-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
200
200
|
- !ruby/object:Gem::Version
|
201
201
|
version: '0'
|
202
202
|
requirements: []
|
203
|
-
rubygems_version: 3.1.
|
203
|
+
rubygems_version: 3.1.4
|
204
204
|
signing_key:
|
205
205
|
specification_version: 4
|
206
206
|
summary: A fluentd input plugin that collects kubernetes cluster metrics.
|