fluent-plugin-kubernetes_metadata_filter 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 300f1d004ac647a2b8ecbbd255b25ccc37865794
-  data.tar.gz: 871d3ccd62bc3d9129fd3b9b78858022aa576d40
+  metadata.gz: ad94cfeef2063842b127dcd7717b96951b35c6e4
+  data.tar.gz: 9ba28aa2447189ed598de36c64f6776c381f090c
 SHA512:
-  metadata.gz: a64f8fc1a0511df3df1afe86c33150b99f3636e95d91e2f385d49fdea82ec7e2d446cc2fe4f1e7cd2d26eb7d47466214c79d3ad6b6f874f0b5ca85d875972e1e
-  data.tar.gz: d6a913cd9c1a0ee7def06ef7ef67b008a3a5c3086e92a65d89b5f3fe9e36e26d4507b17484cc3cf421b7d26d56324fd34a7ee6a9d1aaef1b7ca4d0074d5d82d7
+  metadata.gz: 2930f99ff2db361b6492504da2a032d0148213fe11e33c44fd29e78f7d73a96a867259d618522ef1002b7adfa5a9c323349e34cc25ae2e085f27667d4fab3f50
+  data.tar.gz: 150b250919002593405ee18de5024b146c4438ce4bf5a631912b85031847d6b8e97567df9c75df2a9278bfd96cd98916440ad8c7c9f9df59bd26b67f2a001895

data/fluent-plugin-kubernetes_metadata_filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-kubernetes_metadata_filter"
-  gem.version       = "0.22.0"
+  gem.version       = "0.23.0"
   gem.authors       = ["Jimmi Dyson"]
   gem.email         = ["jimmidyson@gmail.com"]
   gem.description   = %q{Filter plugin to add Kubernetes metadata}
@@ -20,9 +20,9 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0.0'
 
-  gem.add_runtime_dependency "fluentd", "~> 0.12.0"
+  gem.add_runtime_dependency "fluentd", ">= 0.12.0"
   gem.add_runtime_dependency "lru_redux"
-  gem.add_runtime_dependency "kubeclient", "~> 1.1.1"
+  gem.add_runtime_dependency "kubeclient", "~> 1.1.4"
   gem.add_runtime_dependency "fluent-plugin-docker_metadata_filter"
 
   gem.add_development_dependency "bundler", "~> 1.3"

data/lib/fluent/plugin/filter_kubernetes_metadata.rb

@@ -47,9 +47,12 @@ module Fluent
     # CONTAINER_NAME=k8s_$containername.$containerhash_$podname_$namespacename_$poduuid_$rand32bitashex
     # CONTAINER_FULL_ID=dockeridassha256hexvalue
     config_param :use_journal, :bool, default: false
+    # Field 2 is the container_hash, field 5 is the pod_id, and field 6 is the pod_randhex
+    # I would have included them as named groups, but you can't have named groups that are
+    # non-capturing :P
     config_param :container_name_to_kubernetes_regexp,
                  :string,
-                 :default => '^k8s_(?<container_name>[^\.]+)\.(?<container_hash>[a-z0-9]{8})_(?<pod_name>[^_]+)_(?<namespace>[^_]+)_(?<pod_id>[^_]+)_(?<pod_randhex>[a-z0-9]{8})$'
+                 :default => '^k8s_(?<container_name>[^\.]+)\.[^_]+_(?<pod_name>[^_]+)_(?<namespace>[^_]+)_[^_]+_[a-f0-9]{8}$'
 
     def syms_to_strs(hsh)
       newhsh = {}
@@ -267,9 +270,6 @@ module Fluent
                   metadata
                 end
               }
-              if match_data['pod_id'] && (match_data['pod_id'] != metadata['kubernetes']['pod_id'])
-                log.debug("pod_id #{match_data['pod_id']} from log not equal to pod_id #{metadata['kubernetes']['pod_id']} from kubernetes for #{cache_key}")
-              end
               if @include_namespace_id
                 namespace_name = metadata['kubernetes']['namespace_name']
                 namespace_id = @namespace_cache.getset(namespace_name) {

data/test/helper.rb

@@ -61,5 +61,3 @@ def ipv6_enabled?
     false
   end
 end
-
-$log = Fluent::Log.new(Fluent::Test::DummyLogDevice.new, Fluent::Log::LEVEL_WARN)

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
 - !ruby/object:Gem::Dependency
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: fluent-plugin-docker_metadata_filter
   requirement: !ruby/object:Gem::Requirement