fluent-plugin-kubernetes_metadata_filter 0.26.2 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7323d6bbee842dfbd27fa09eb626eb79bb59f89
-  data.tar.gz: d6eff4c96fceea0c75d854ea3a323c37e71f5991
+  metadata.gz: 955084706621e1158ce6950b1afad7702ade679e
+  data.tar.gz: d179ade18f18f3acfe691b85471a007c1a2f6aa2
 SHA512:
-  metadata.gz: 9a5a7a2808c0d1aceb6def57c9e2784e0e3ca6bb49585c10a27cf00a270bea2f56df593587236a3cb901d51009f61f547bb609a8ba1d5119a9b425d6f14bedf2
-  data.tar.gz: 5ca385a417e5ea46264aff75d2042a727a829ec04ce12b93918b9cb8188cabc57e306f8975a5815eed54e58bdd91a8c39e47044533fdefa73f8f7159cbe3b426
+  metadata.gz: e9571f194b02beb3374ae37e7321d0c9c7ad1a0cc36d7603e5b146bd4b747b5e41f7916d4f910ad4813697331b66556b07d921dab000253f57b1115d796acc05
+  data.tar.gz: 24c6addc93de722388f02f1b4a7e0f6031cc134cd421261429618c477e5b71967e26d117b99921db9fe4f906259e071db20762ef30ce3ad7148cbb46d2077cfd

data/README.md

@@ -43,7 +43,7 @@ Reading from the JSON formatted log files with `in_tail` and wildcard filenames:
   read_from_head true
 </source>
 
-<filter kubernetes.var.lib.docker.containers.*.*.log>
+<filter kubernetes.var.log.containers.*.log>
   type kubernetes_metadata
 </filter>
 

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.26.2"
+  gem.version       = "0.26.3"
   gem.authors       = ["Jimmi Dyson"]
   gem.email         = ["jimmidyson@gmail.com"]
   gem.description   = %q{Filter plugin to add Kubernetes metadata}

data/lib/fluent/plugin/filter_kubernetes_metadata.rb

@@ -221,16 +221,17 @@ module Fluent
           cache_key = "#{metadata['kubernetes']['namespace_name']}_#{metadata['kubernetes']['pod_name']}"
 
           this     = self
-          metadata = @cache.getset(cache_key) {
+          kubernetes_metadata = @cache.getset(cache_key) {
             if metadata
-              kubernetes_metadata = this.get_metadata(
+              md = this.get_metadata(
                 metadata['kubernetes']['namespace_name'],
                 metadata['kubernetes']['pod_name']
               )
-              metadata['kubernetes'] = kubernetes_metadata if kubernetes_metadata
-              metadata
+              md
             end
           }
+          metadata['kubernetes'].merge!(kubernetes_metadata) if kubernetes_metadata
+
           if @include_namespace_id
             namespace_name = metadata['kubernetes']['namespace_name']
             namespace_id = @namespace_cache.getset(namespace_name) {
@@ -277,16 +278,17 @@ module Fluent
               cache_key = "#{metadata['kubernetes']['namespace_name']}_#{metadata['kubernetes']['pod_name']}"
 
               this     = self
-              metadata = @cache.getset(cache_key) {
+              kubernetes_metadata = @cache.getset(cache_key) {
                 if metadata
-                  kubernetes_metadata = this.get_metadata(
+                  md = this.get_metadata(
                     metadata['kubernetes']['namespace_name'],
                     metadata['kubernetes']['pod_name']
                   )
-                  metadata['kubernetes'] = kubernetes_metadata if kubernetes_metadata
-                  metadata
+                  md
                 end
               }
+              metadata['kubernetes'].merge!(kubernetes_metadata) if kubernetes_metadata
+
               if @include_namespace_id
                 namespace_name = metadata['kubernetes']['namespace_name']
                 namespace_id = @namespace_cache.getset(namespace_name) {
@@ -375,8 +377,8 @@ module Fluent
                 self.de_dot!(labels)
                 self.de_dot!(annotations)
               end
-              cached['kubernetes']['labels'] = labels
-              cached['kubernetes']['annotations'] = annotations
+              cached['labels'] = labels
+              cached['annotations'] = annotations
               @cache[cache_key] = cached
             end
           when 'DELETED'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.3
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Filter plugin to add Kubernetes metadata