fluent-plugin-kubernetes_metadata_filter 3.4.0 → 3.5.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +3 -8
  3. data/Gemfile.lock +34 -26
  4. data/README.md +2 -2
  5. data/fluent-plugin-kubernetes_metadata_filter.gemspec +3 -3
  6. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0754e97a3a06ac6c24eee7004490eb0e06bfb51f63a2c973e07d9edfc593a239
4
- data.tar.gz: 340c6bdc268bc2ff009fd63e58ec460e043f65636d1a03f9a3726467e84821f5
3
+ metadata.gz: 6824096b43c51cdf763d7659dd681f2439f56c2f895353a4175c4ec905aa785c
4
+ data.tar.gz: d5a3da105e3d5d97c37bebcc50d0654446ac8fffea39ec1bf1723075192a24d9
5
5
  SHA512:
6
- metadata.gz: de4fa7d241b0b7efacd1cde9e2c18c0bb3c8553d13e13528e9ccc16aa3ab974c12b1a88ce43a7bd186c9060d29ba649f8aa0365c3a9ecc4eed2c2354e1092dc9
7
- data.tar.gz: 02ca1c7a7703e85962e206571b25a8416be206ef18d706958dfc894c598a068727e53abb3bd3beb059f1245211f957072b0b4c38a21a9d4c1ed114286306ffc9
6
+ metadata.gz: c5c0be55b4f5dd202719bf59b4343ece99b79567cf953daebf42fdb1d1170eb23a172b4ddcf0d9254c53970330c857b2b576ea3651810c7742d897defc10d94c
7
+ data.tar.gz: 0ac96d3540ac35fc1a7193f152829650688405ea80cc160a820c23e6fa04088cd7d4545ad2f5becf4016f733535ccee7d91389330cd7c541c6189589a3ec6a3a
data/.circleci/config.yml CHANGED
@@ -3,7 +3,7 @@ version: 2.1
3
3
  install: &install
4
4
  name: Install bundle
5
5
  command: |
6
- gem install bundler
6
+ gem install bundler -v 2.4.22
7
7
  bundle config set --local path vendor/bundle
8
8
  bundle install
9
9
 
@@ -11,7 +11,7 @@ missingdeps: &missingdeps
11
11
  name: Install missing dependecies
12
12
  command: |
13
13
  cat /etc/os-release
14
- printf "deb http://deb.debian.org/debian buster main\ndeb http://security.debian.org buster/updates main\ndeb-src http://security.debian.org buster/updates main" > /tmp/sources.list
14
+ sed -e 's/^# deb-src/deb-src/g' /etc/apt/sources.list > /tmp/sources.list
15
15
  sudo cp /tmp/sources.list /etc/apt/sources.list
16
16
  sudo apt-get --allow-releaseinfo-change update
17
17
  sudo apt-get install cmake libicu-dev libssl-dev
@@ -21,12 +21,9 @@ test: &test
21
21
  command: bundle exec rake test --trace
22
22
 
23
23
  executors:
24
- ruby-2-6:
25
- docker:
26
- - image: circleci/ruby:2.6.3
27
24
  ruby-2-7:
28
25
  docker:
29
- - image: circleci/ruby:2.7.1
26
+ - image: cimg/ruby:2.7.8
30
27
  jobs:
31
28
  "ruby-test":
32
29
  parameters:
@@ -47,7 +44,5 @@ jobs:
47
44
  workflows:
48
45
  "test_multiple_ruby_versions":
49
46
  jobs:
50
- - ruby-test:
51
- ruby-version: ruby-2-6
52
47
  - ruby-test:
53
48
  ruby-version: ruby-2-7
data/Gemfile.lock CHANGED
@@ -1,8 +1,8 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- fluent-plugin-kubernetes_metadata_filter (3.4.0)
5
- fluentd (>= 0.14.0, < 1.17)
4
+ fluent-plugin-kubernetes_metadata_filter (3.5.1)
5
+ fluentd (>= 0.14.0, < 1.18)
6
6
  kubeclient (>= 4.0.0, < 5.0.0)
7
7
  lru_redux
8
8
 
@@ -12,28 +12,34 @@ GEM
12
12
  addressable (2.8.0)
13
13
  public_suffix (>= 2.0.2, < 5.0)
14
14
  ast (2.4.2)
15
+ base64 (0.2.0)
15
16
  bump (0.10.0)
16
17
  charlock_holmes (0.7.7)
17
18
  codeclimate-test-reporter (0.6.0)
18
19
  simplecov (>= 0.7.1, < 1.0.0)
19
- concurrent-ruby (1.2.2)
20
- cool.io (1.8.0)
20
+ concurrent-ruby (1.3.4)
21
+ cool.io (1.9.0)
21
22
  copyright-header (1.0.22)
22
23
  github-linguist
23
24
  crack (0.4.5)
24
25
  rexml
26
+ csv (3.3.0)
25
27
  docile (1.4.0)
26
- domain_name (0.5.20190701)
27
- unf (>= 0.0.5, < 1.0.0)
28
+ domain_name (0.6.20240107)
29
+ drb (2.2.1)
28
30
  escape_utils (1.2.2)
29
- ffi (1.16.2)
30
- ffi-compiler (1.0.1)
31
- ffi (>= 1.0.0)
31
+ ffi (1.17.0)
32
+ ffi-compiler (1.3.2)
33
+ ffi (>= 1.15.5)
32
34
  rake
33
- fluentd (1.16.2)
35
+ fluentd (1.17.1)
36
+ base64 (~> 0.2)
34
37
  bundler
35
38
  cool.io (>= 1.4.5, < 2.0.0)
39
+ csv (~> 3.2)
40
+ drb (~> 2.2)
36
41
  http_parser.rb (>= 0.5.1, < 0.9.0)
42
+ logger (~> 1.6)
37
43
  msgpack (>= 1.3.1, < 2.0.0)
38
44
  serverengine (>= 2.3.2, < 3.0.0)
39
45
  sigdump (~> 0.2.5)
@@ -48,35 +54,39 @@ GEM
48
54
  mini_mime (~> 1.0)
49
55
  rugged (~> 1.0)
50
56
  hashdiff (1.0.1)
51
- http (5.1.1)
57
+ http (5.2.0)
52
58
  addressable (~> 2.8)
59
+ base64 (~> 0.1)
53
60
  http-cookie (~> 1.0)
54
61
  http-form_data (~> 2.2)
55
- llhttp-ffi (~> 0.4.0)
62
+ llhttp-ffi (~> 0.5.0)
56
63
  http-accept (1.7.0)
57
- http-cookie (1.0.5)
64
+ http-cookie (1.0.7)
58
65
  domain_name (~> 0.5)
59
66
  http-form_data (2.3.0)
60
67
  http_parser.rb (0.8.0)
61
- jsonpath (1.1.4)
68
+ jsonpath (1.1.5)
62
69
  multi_json
63
- kubeclient (4.11.0)
70
+ kubeclient (4.12.0)
64
71
  http (>= 3.0, < 6.0)
65
72
  jsonpath (~> 1.0)
66
73
  recursive-open-struct (~> 1.1, >= 1.1.1)
67
74
  rest-client (~> 2.0)
68
- llhttp-ffi (0.4.0)
75
+ llhttp-ffi (0.5.0)
69
76
  ffi-compiler (~> 1.0)
70
77
  rake (~> 13.0)
78
+ logger (1.6.1)
71
79
  lru_redux (1.1.0)
72
- mime-types (3.5.1)
80
+ mime-types (3.6.0)
81
+ logger
73
82
  mime-types-data (~> 3.2015)
74
- mime-types-data (3.2023.0808)
83
+ mime-types-data (3.2024.1001)
75
84
  mini_mime (1.1.2)
76
85
  minitest (4.7.5)
77
- msgpack (1.7.2)
86
+ msgpack (1.7.3)
78
87
  multi_json (1.15.0)
79
88
  netrc (0.11.0)
89
+ ostruct (0.6.0)
80
90
  parallel (1.22.1)
81
91
  parser (3.1.2.0)
82
92
  ast (~> 2.4.1)
@@ -84,14 +94,15 @@ GEM
84
94
  public_suffix (4.0.7)
85
95
  rainbow (3.1.1)
86
96
  rake (13.0.6)
87
- recursive-open-struct (1.1.3)
97
+ recursive-open-struct (1.3.1)
98
+ ostruct
88
99
  regexp_parser (2.5.0)
89
100
  rest-client (2.1.0)
90
101
  http-accept (>= 1.7.0, < 2.0)
91
102
  http-cookie (>= 1.0.2, < 2.0)
92
103
  mime-types (>= 1.16, < 4.0)
93
104
  netrc (~> 0.8)
94
- rexml (3.2.5)
105
+ rexml (3.3.8)
95
106
  rr (3.0.9)
96
107
  rubocop (1.28.2)
97
108
  parallel (~> 1.10)
@@ -123,18 +134,15 @@ GEM
123
134
  test-unit (>= 2.5.2)
124
135
  tzinfo (2.0.6)
125
136
  concurrent-ruby (~> 1.0)
126
- tzinfo-data (1.2023.3)
137
+ tzinfo-data (1.2024.2)
127
138
  tzinfo (>= 1.0.0)
128
- unf (0.1.4)
129
- unf_ext
130
- unf_ext (0.0.8.2)
131
139
  unicode-display_width (2.2.0)
132
140
  vcr (6.0.0)
133
141
  webmock (3.14.0)
134
142
  addressable (>= 2.8.0)
135
143
  crack (>= 0.3.2)
136
144
  hashdiff (>= 0.4.0, < 2.0.0)
137
- webrick (1.8.1)
145
+ webrick (1.8.2)
138
146
  yajl-ruby (1.4.3)
139
147
 
140
148
  PLATFORMS
data/README.md CHANGED
@@ -50,7 +50,7 @@ This must use named capture groups for `container_name`, `pod_name`, `namespace`
50
50
  when true (default: `true`)
51
51
  * `orphaned_namespace_name` - The namespace to associate with records where the namespace can not be determined (default: `.orphaned`)
52
52
  * `orphaned_namespace_id` - The namespace id to associate with records where the namespace can not be determined (default: `orphaned`)
53
- * `lookup_from_k8s_field` - If the field `kubernetes` is present, lookup the metadata from the given subfields such as `kubernetes.namespace_name`, `kubernetes.pod_name`, etc. This allows you to avoid having to pass in metadata to lookup in an explicitly formatted tag name or in an explicitly formatted `CONTAINER_NAME` value. For example, set `kubernetes.namespace_name`, `kubernetes.pod_name`, `kubernetes.container_name`, and `docker.id` in the record, and the filter will fill in the rest. (default: `true`)
53
+ * `lookup_from_k8s_field` - If the field `kubernetes` is present, lookup the metadata from the given subfields such as `kubernetes.namespace_name`, `kubernetes.pod_name`, etc. This allows you to avoid having to pass in metadata to lookup in an explicitly formatted tag name or in an explicitly formatted `CONTAINER_NAME` value. For example, set `kubernetes.namespace_name`, `kubernetes.pod_name`, `kubernetes.container_name`, and `docker.container_id` in the record, and the filter will fill in the rest. (default: `true`)
54
54
  * `ssl_partial_chain` - if `ca_file` is for an intermediate CA, or otherwise we do not have the root CA and want
55
55
  to trust the intermediate CA certs we do have, set this to `true` - this corresponds to
56
56
  the `openssl s_client -partial_chain` flag and `X509_V_FLAG_PARTIAL_CHAIN` (default: `false`)
@@ -144,7 +144,7 @@ Then output becomes as belows
144
144
  "log": "2015/05/05 19:54:41 \n",
145
145
  "stream": "stderr",
146
146
  "docker": {
147
- "id": "df14e0d5ae4c07284fa636d739c8fc2e6b52bc344658de7d3f08c36a2e804115",
147
+ "container_id": "df14e0d5ae4c07284fa636d739c8fc2e6b52bc344658de7d3f08c36a2e804115",
148
148
  }
149
149
  "kubernetes": {
150
150
  "host": "jimmi-redhat.localnet",
data/fluent-plugin-kubernetes_metadata_filter.gemspec CHANGED
@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
5
5
 
6
6
  Gem::Specification.new do |gem|
7
7
  gem.name = 'fluent-plugin-kubernetes_metadata_filter'
8
- gem.version = '3.4.0'
8
+ gem.version = '3.5.1'
9
9
  gem.authors = ['OpenShift Cluster Logging','Jimmi Dyson']
10
10
  gem.email = ['team-logging@redhat.com','jimmidyson@gmail.com']
11
11
  gem.description = 'Filter plugin to add Kubernetes metadata'
@@ -15,9 +15,9 @@ Gem::Specification.new do |gem|
15
15
 
16
16
  gem.files = `git ls-files`.split($/)
17
17
 
18
- gem.required_ruby_version = '>= 2.6.0'
18
+ gem.required_ruby_version = '>= 2.7.0'
19
19
 
20
- gem.add_runtime_dependency 'fluentd', ['>= 0.14.0', '< 1.17']
20
+ gem.add_runtime_dependency 'fluentd', ['>= 0.14.0', '< 1.18']
21
21
  gem.add_runtime_dependency 'kubeclient', ['>= 4.0.0', '< 5.0.0']
22
22
  gem.add_runtime_dependency 'lru_redux'
23
23
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-kubernetes_metadata_filter
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.4.0
4
+ version: 3.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - OpenShift Cluster Logging
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2023-10-02 00:00:00.000000000 Z
12
+ date: 2024-10-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: fluentd
@@ -20,7 +20,7 @@ dependencies:
20
20
  version: 0.14.0
21
21
  - - "<"
22
22
  - !ruby/object:Gem::Version
23
- version: '1.17'
23
+ version: '1.18'
24
24
  type: :runtime
25
25
  prerelease: false
26
26
  version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
30
30
  version: 0.14.0
31
31
  - - "<"
32
32
  - !ruby/object:Gem::Version
33
- version: '1.17'
33
+ version: '1.18'
34
34
  - !ruby/object:Gem::Dependency
35
35
  name: kubeclient
36
36
  requirement: !ruby/object:Gem::Requirement
@@ -284,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
284
284
  requirements:
285
285
  - - ">="
286
286
  - !ruby/object:Gem::Version
287
- version: 2.6.0
287
+ version: 2.7.0
288
288
  required_rubygems_version: !ruby/object:Gem::Requirement
289
289
  requirements:
290
290
  - - ">="