fluent-plugin-kubernetes_metadata_filter 0.22.0 → 0.23.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/fluent-plugin-kubernetes_metadata_filter.gemspec +3 -3
  3. data/lib/fluent/plugin/filter_kubernetes_metadata.rb +4 -4
  4. data/test/helper.rb +0 -2
  5. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 300f1d004ac647a2b8ecbbd255b25ccc37865794
4
- data.tar.gz: 871d3ccd62bc3d9129fd3b9b78858022aa576d40
3
+ metadata.gz: ad94cfeef2063842b127dcd7717b96951b35c6e4
4
+ data.tar.gz: 9ba28aa2447189ed598de36c64f6776c381f090c
5
5
  SHA512:
6
- metadata.gz: a64f8fc1a0511df3df1afe86c33150b99f3636e95d91e2f385d49fdea82ec7e2d446cc2fe4f1e7cd2d26eb7d47466214c79d3ad6b6f874f0b5ca85d875972e1e
7
- data.tar.gz: d6a913cd9c1a0ee7def06ef7ef67b008a3a5c3086e92a65d89b5f3fe9e36e26d4507b17484cc3cf421b7d26d56324fd34a7ee6a9d1aaef1b7ca4d0074d5d82d7
6
+ metadata.gz: 2930f99ff2db361b6492504da2a032d0148213fe11e33c44fd29e78f7d73a96a867259d618522ef1002b7adfa5a9c323349e34cc25ae2e085f27667d4fab3f50
7
+ data.tar.gz: 150b250919002593405ee18de5024b146c4438ce4bf5a631912b85031847d6b8e97567df9c75df2a9278bfd96cd98916440ad8c7c9f9df59bd26b67f2a001895
data/fluent-plugin-kubernetes_metadata_filter.gemspec CHANGED
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |gem|
6
6
  gem.name = "fluent-plugin-kubernetes_metadata_filter"
7
- gem.version = "0.22.0"
7
+ gem.version = "0.23.0"
8
8
  gem.authors = ["Jimmi Dyson"]
9
9
  gem.email = ["jimmidyson@gmail.com"]
10
10
  gem.description = %q{Filter plugin to add Kubernetes metadata}
@@ -20,9 +20,9 @@ Gem::Specification.new do |gem|
20
20
 
21
21
  gem.required_ruby_version = '>= 2.0.0'
22
22
 
23
- gem.add_runtime_dependency "fluentd", "~> 0.12.0"
23
+ gem.add_runtime_dependency "fluentd", ">= 0.12.0"
24
24
  gem.add_runtime_dependency "lru_redux"
25
- gem.add_runtime_dependency "kubeclient", "~> 1.1.1"
25
+ gem.add_runtime_dependency "kubeclient", "~> 1.1.4"
26
26
  gem.add_runtime_dependency "fluent-plugin-docker_metadata_filter"
27
27
 
28
28
  gem.add_development_dependency "bundler", "~> 1.3"
data/lib/fluent/plugin/filter_kubernetes_metadata.rb CHANGED
@@ -47,9 +47,12 @@ module Fluent
47
47
  # CONTAINER_NAME=k8s_$containername.$containerhash_$podname_$namespacename_$poduuid_$rand32bitashex
48
48
  # CONTAINER_FULL_ID=dockeridassha256hexvalue
49
49
  config_param :use_journal, :bool, default: false
50
+ # Field 2 is the container_hash, field 5 is the pod_id, and field 6 is the pod_randhex
51
+ # I would have included them as named groups, but you can't have named groups that are
52
+ # non-capturing :P
50
53
  config_param :container_name_to_kubernetes_regexp,
51
54
  :string,
52
- :default => '^k8s_(?<container_name>[^\.]+)\.(?<container_hash>[a-z0-9]{8})_(?<pod_name>[^_]+)_(?<namespace>[^_]+)_(?<pod_id>[^_]+)_(?<pod_randhex>[a-z0-9]{8})$'
55
+ :default => '^k8s_(?<container_name>[^\.]+)\.[^_]+_(?<pod_name>[^_]+)_(?<namespace>[^_]+)_[^_]+_[a-f0-9]{8}$'
53
56
 
54
57
  def syms_to_strs(hsh)
55
58
  newhsh = {}
@@ -267,9 +270,6 @@ module Fluent
267
270
  metadata
268
271
  end
269
272
  }
270
- if match_data['pod_id'] && (match_data['pod_id'] != metadata['kubernetes']['pod_id'])
271
- log.debug("pod_id #{match_data['pod_id']} from log not equal to pod_id #{metadata['kubernetes']['pod_id']} from kubernetes for #{cache_key}")
272
- end
273
273
  if @include_namespace_id
274
274
  namespace_name = metadata['kubernetes']['namespace_name']
275
275
  namespace_id = @namespace_cache.getset(namespace_name) {
data/test/helper.rb CHANGED
@@ -61,5 +61,3 @@ def ipv6_enabled?
61
61
  false
62
62
  end
63
63
  end
64
-
65
- $log = Fluent::Log.new(Fluent::Test::DummyLogDevice.new, Fluent::Log::LEVEL_WARN)
metadata CHANGED
@@ -1,27 +1,27 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-kubernetes_metadata_filter
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.22.0
4
+ version: 0.23.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jimmi Dyson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-06-01 00:00:00.000000000 Z
11
+ date: 2016-06-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fluentd
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: 0.12.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: 0.12.0
27
27
  - !ruby/object:Gem::Dependency
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.1.1
47
+ version: 1.1.4
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 1.1.1
54
+ version: 1.1.4
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: fluent-plugin-docker_metadata_filter
57
57
  requirement: !ruby/object:Gem::Requirement