fluent-plugin-kubernetes_metadata_filter 0.25.3 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c5b658648ff5e0a6159c0c0a43a27f301348d7e
-  data.tar.gz: 565623ba233360be5200675b1a4dd693bc764307
+  metadata.gz: f1ae65aac8285479f1ba55639b4c9440809fcb56
+  data.tar.gz: aed7b25905c55ba8d06c478cb3793012d40ff148
 SHA512:
-  metadata.gz: 24ffbf410894611d7826bed477768552ea6e439e2534fcfbaa253d0453530a7bb8f04744896ecf1c5240711038c9ea7719796f005e613bb4412afa64172d1a10
-  data.tar.gz: 53f0da93d8f7341eca79ec4a5c2f7b00e895af756d7377c8bdd3217aaa1a769b7d05d5c257c6f0b3f5020dfc989d13405bafa702a60e0dfcb64c55131947c7ba
+  metadata.gz: abcb46a6d6fc693c0dc315e53dfe353a20f562b80ce353462d7f944180349051c1216be9ef038037411f8744c0ee421aed00e508b5a5ebff388038966f465b6c
+  data.tar.gz: f6b5ecfeb93078c26d18f1d0f3ba01333546f8533b05e1bcb18062a1ce142ef5e4431b9741f3c5afdcd1f1b088683182c1f97f24a54e3e30e4a6630e538b9be7

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.25.3"
+  gem.version       = "0.26.0"
   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

@@ -71,7 +71,7 @@ module Fluent
       newhsh
     end
 
-    def get_metadata(namespace_name, pod_name, container_name)
+    def get_metadata(namespace_name, pod_name)
       begin
         metadata = @client.get_pod(pod_name, namespace_name)
         return if !metadata
@@ -79,12 +79,12 @@ module Fluent
         annotations = match_annotations(syms_to_strs(metadata['metadata']['annotations'].to_h))
         if @de_dot
           self.de_dot!(labels)
+          self.de_dot!(annotations)
         end
         kubernetes_metadata = {
             'namespace_name' => namespace_name,
             'pod_id'         => metadata['metadata']['uid'],
             'pod_name'       => pod_name,
-            'container_name' => container_name,
             'labels'         => labels,
             'host'           => metadata['spec']['nodeName']
         }
@@ -214,20 +214,18 @@ module Fluent
           'kubernetes' => {
             'namespace_name' => match_data['namespace'],
             'pod_name'       => match_data['pod_name'],
-            'container_name' => match_data['container_name']
           }
         }
 
         if @kubernetes_url.present?
-          cache_key = "#{metadata['kubernetes']['namespace_name']}_#{metadata['kubernetes']['pod_name']}_#{metadata['kubernetes']['container_name']}"
+          cache_key = "#{metadata['kubernetes']['namespace_name']}_#{metadata['kubernetes']['pod_name']}"
 
           this     = self
           metadata = @cache.getset(cache_key) {
             if metadata
               kubernetes_metadata = this.get_metadata(
                 metadata['kubernetes']['namespace_name'],
-                metadata['kubernetes']['pod_name'],
-                metadata['kubernetes']['container_name']
+                metadata['kubernetes']['pod_name']
               )
               metadata['kubernetes'] = kubernetes_metadata if kubernetes_metadata
               metadata
@@ -244,6 +242,8 @@ module Fluent
         end
       end
 
+      metadata['kubernetes']['container_name'] = match_data['container_name'] if match_data
+
       es.each { |time, record|
         record = merge_json_log(record) if @merge_json_log
 
@@ -270,20 +270,18 @@ module Fluent
               },
               'kubernetes' => {
                 'namespace_name' => match_data['namespace'],
-                'pod_name'       => match_data['pod_name'],
-                'container_name' => match_data['container_name']
+                'pod_name'       => match_data['pod_name']
               }
             }
             if @kubernetes_url.present?
-              cache_key = "#{metadata['kubernetes']['namespace_name']}_#{metadata['kubernetes']['pod_name']}_#{metadata['kubernetes']['container_name']}"
+              cache_key = "#{metadata['kubernetes']['namespace_name']}_#{metadata['kubernetes']['pod_name']}"
 
               this     = self
               metadata = @cache.getset(cache_key) {
                 if metadata
                   kubernetes_metadata = this.get_metadata(
                     metadata['kubernetes']['namespace_name'],
-                    metadata['kubernetes']['pod_name'],
-                    metadata['kubernetes']['container_name']
+                    metadata['kubernetes']['pod_name']
                   )
                   metadata['kubernetes'] = kubernetes_metadata if kubernetes_metadata
                   metadata
@@ -298,6 +296,7 @@ module Fluent
                 metadata['kubernetes']['namespace_id'] = namespace_id if namespace_id
               end
             end
+            metadata['kubernetes']['container_name'] = match_data['container_name']
             metadata
           end
           unless metadata
@@ -366,32 +365,27 @@ module Fluent
       watcher.each do |notice|
         case notice.type
           when 'MODIFIED'
-            if notice.object.status.containerStatuses
-              pod_cache_key = "#{notice.object['metadata']['namespace']}_#{notice.object['metadata']['name']}"
-              notice.object.status.containerStatuses.each { |container_status|
-                cache_key = "#{pod_cache_key}_#{container_status['name']}"
-                cached    = @cache[cache_key]
-                if cached
-                  # Only thing that can be modified is labels and (possibly) annotations
-                  labels = syms_to_strs(notice.object.metadata.labels.to_h)
-                  annotations = match_annotations(syms_to_strs(notice.object.metadata.annotations.to_h))
-                  if @de_dot
-                    self.de_dot!(labels)
-                  end
-                  cached['kubernetes']['labels'] = labels
-                  cached['kubernetes']['annotations'] = annotations unless annotations.empty?
-                  @cache[cache_key] = cached
-                end
-              }
+            cache_key = "#{notice.object['metadata']['namespace']}_#{notice.object['metadata']['name']}"
+            cached    = @cache[cache_key]
+            if cached
+              # Only thing that can be modified is labels and (possibly) annotations
+              labels = syms_to_strs(notice.object.metadata.labels.to_h)
+              annotations = match_annotations(syms_to_strs(notice.object.metadata.annotations.to_h))
+              if @de_dot
+                self.de_dot!(labels)
+                self.de_dot!(annotations)
+              end
+              cached['kubernetes']['labels'] = labels
+              if annotations.empty?
+                delete(cached['kubernetes']['annotations'])
+              else
+                cached['kubernetes']['annotations'] = annotations
+              end
+              @cache[cache_key] = cached
             end
           when 'DELETED'
-            if notice.object.status.containerStatuses
-              pod_cache_key = "#{notice.object['metadata']['namespace']}_#{notice.object['metadata']['name']}"
-              notice.object.status.containerStatuses.each { |container_status|
-                cache_key = "#{pod_cache_key}_#{container_status['name']}"
-                @cache.delete(cache_key)
-              }
-            end
+            cache_key = "#{notice.object['metadata']['namespace']}_#{notice.object['metadata']['name']}"
+            @cache.delete(cache_key)
           else
             # Don't pay attention to creations, since the created pod may not
             # end up on this node.

data/test/plugin/test_filter_kubernetes_metadata.rb

@@ -524,8 +524,8 @@ use_journal true
                     'component' => 'fabric8Console'
                 },
                 'annotations'    => {
-                    'custom.field1' => 'hello_kitty',
-                    'field.two' => 'value'
+                    'custom_field1' => 'hello_kitty',
+                    'field_two' => 'value'
                 }
             }
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 0.25.3
+  version: 0.26.0
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd