fluent-plugin-kubernetes_metadata_filter 0.33.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5a3f2f0bcabc1a6f56b3edf41aa6ca50475eac2
-  data.tar.gz: d20a1f8f5e75366fffab4cb256540c8241afc2d7
+  metadata.gz: b64ea97cd4df7be745b06c0f46e82f152e0503ea
+  data.tar.gz: b026a7a6039cd7f15aa938be5969fa7e5a818c7b
 SHA512:
-  metadata.gz: f9733a0745ac08b92ea4ec8b6af1c414bdab974608b66ffffe5478c2a7171a37cd91dcbf4bea309aa4000d1bb4516d7169e69d7906635a333342ea6ba622f582
-  data.tar.gz: 75e087d65d6a28039ae945d7fa11196aa93f337269dfa0c368fd07e8d35953f8abd1e1bbdb6d50b66c6a9669fa30818949471c766d06069ef1f7a59041efdeb1
+  metadata.gz: 53f23402783e6a0b7857698b99a3a7dfd0e343f4ccd5b7ea2c440d8c3fc624d61c4ef89846aa2c91b90995e8df7feb408df7cd5f933d577b3bcfe76e5ced5174
+  data.tar.gz: 912ffc8b2ba2e376bb0ffffe9bd9a881cf2ce6f535328e2c76a53941558d0c7e2209a2359ba319d3d8deb0278252673c15b84c169464bfd8dfc8aa5101adacf8

data/README.md

@@ -3,6 +3,14 @@
 [![Code Climate](https://codeclimate.com/github/fabric8io/fluent-plugin-kubernetes_metadata_filter/badges/gpa.svg)](https://codeclimate.com/github/fabric8io/fluent-plugin-kubernetes_metadata_filter)
 [![Test Coverage](https://codeclimate.com/github/fabric8io/fluent-plugin-kubernetes_metadata_filter/badges/coverage.svg)](https://codeclimate.com/github/fabric8io/fluent-plugin-kubernetes_metadata_filter)
 
+The Kubernetes metadata plugin filter enriches container log records with pod and namespace metadata.
+
+This plugin derives basic metadata about the container that emitted a given log record using the source of the log record. Records from journald provide metadata about the
+container environment as named fields. Records from JSON files encode metadata about the container in the file name.  The initial metadata derived from the source is used
+to lookup additional metadata about the container's associated pod and namespace (e.g. UUIDs, labels, annotations) when the kubernetes_url is configured.  If the plugin cannot
+authoritatively determine the namespace of the container emitting a log record, it will use an 'orphan' namespace ID in the metadata. This behaviors supports multi-tenant systems
+that rely on the authenticity of the namespace for proper log isolation.
+
 ## Installation
 
     gem install fluent-plugin-kubernetes_metadata_filter
@@ -33,6 +41,10 @@ This must used named capture groups for `container_name`, `pod_name` & `namespac
 * `include_namespace_metadata` - Collect metadata about namespace such as uid, labels and annotations (default: `false`).  
   Note that when this option is enabled, all label from namespace are collected, but annotations are collected according to `annotation_match` value. If `annotation_match` is not presented, no annotations will be collected from the namespace.
 * `annotation_match` - Array of regular expressions matching annotation field names. Matched annotations are added to a log record.
+* `allow_orphans` - Modify the namespace and namespace id to the values of `orphaned_namespace_name` and `orphaned_namespace_id`
+when true (default: `true`)
+* `orphaned_namespace_name` - The namespace to associate with records where the namespace can not be determined (default: `.orphaned`)
+* `orphaned_namespace_id` - The namespace id to associate with records where the namespace can not be determined (default: `orphaned`)
 
 Reading from the JSON formatted log files with `in_tail` and wildcard filenames:
 ```

data/Rakefile

@@ -23,11 +23,11 @@ task :headers do
   require 'copyright_header'
 
   args = {
-    :license => 'ASL2',
+    :license => 'Apache-2.0',
     :copyright_software => 'Fluentd Kubernetes Metadata Filter Plugin',
     :copyright_software_description => 'Enrich Fluentd events with Kubernetes metadata',
     :copyright_holders => ['Red Hat, Inc.'],
-    :copyright_years => ['2015'],
+    :copyright_years => ['2015-2017'],
     :add_path => 'lib:test',
     :output_dir => '.'
   }

data/fluent-plugin-kubernetes_metadata_filter.gemspec

@@ -4,13 +4,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-kubernetes_metadata_filter"
-  gem.version       = "0.33.0"
+  gem.version       = "1.0.0"
   gem.authors       = ["Jimmi Dyson"]
   gem.email         = ["jimmidyson@gmail.com"]
   gem.description   = %q{Filter plugin to add Kubernetes metadata}
-  gem.summary       = %q{Filter plugin to add Kubernetes metadata}
+  gem.summary       = %q{Fluentd filter plugin to add Kubernetes metadata}
   gem.homepage      = "https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter"
-  gem.license       = "ASL2"
+  gem.license       = "Apache-2.0"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/fluent/plugin/filter_kubernetes_metadata.rb

@@ -2,7 +2,7 @@
 # Fluentd Kubernetes Metadata Filter Plugin - Enrich Fluentd events with
 # Kubernetes metadata
 #
-# Copyright 2015 Red Hat, Inc.
+# Copyright 2017 Red Hat, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,12 +16,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 require_relative 'kubernetes_metadata_stats'
+require_relative 'kubernetes_metadata_watch_namespaces'
+require_relative 'kubernetes_metadata_watch_pods'
+
 module Fluent
   class KubernetesMetadataFilter < Fluent::Filter
     K8_POD_CA_CERT = 'ca.crt'
     K8_POD_TOKEN = 'token'
 
+    include KubernetesMetadata::Common
+    include KubernetesMetadata::WatchNamespaces
+    include KubernetesMetadata::WatchPods
+
     Fluent::Plugin.register_filter('kubernetes_metadata', self)
 
     config_param :kubernetes_url, :string, default: nil
@@ -39,8 +47,6 @@ module Fluent
     config_param :bearer_token_file, :string, default: nil
     config_param :merge_json_log, :bool, default: true
     config_param :preserve_json_log, :bool, default: true
-    config_param :include_namespace_id, :bool, default: false
-    config_param :include_namespace_metadata, :bool, default: false
     config_param :secret_dir, :string, default: '/var/run/secrets/kubernetes.io/serviceaccount'
     config_param :de_dot, :bool, default: true
     config_param :de_dot_separator, :string, default: '_'
@@ -59,77 +65,36 @@ module Fluent
 
     config_param :annotation_match, :array, default: []
     config_param :stats_interval, :integer, default: 30
+    config_param :allow_orphans, :bool, default: true
+    config_param :orphaned_namespace_name, :string, default: '.orphaned'
+    config_param :orphaned_namespace_id, :string, default: 'orphaned'
 
-    def syms_to_strs(hsh)
-      newhsh = {}
-      hsh.each_pair do |kk,vv|
-        if vv.is_a?(Hash)
-          vv = syms_to_strs(vv)
-        end
-        if kk.is_a?(Symbol)
-          newhsh[kk.to_s] = vv
-        else
-          newhsh[kk] = vv
-        end
-      end
-      newhsh
-    end
-
-    def parse_pod_metadata(pod_object)
-      labels = syms_to_strs(pod_object['metadata']['labels'].to_h)
-      annotations = match_annotations(syms_to_strs(pod_object['metadata']['annotations'].to_h))
-      if @de_dot
-        self.de_dot!(labels)
-        self.de_dot!(annotations)
-      end
-      kubernetes_metadata = {
-          'namespace_name' => pod_object['metadata']['namespace'],
-          'pod_id'         => pod_object['metadata']['uid'],
-          'pod_name'       => pod_object['metadata']['name'],
-          'labels'         => labels,
-          'host'           => pod_object['spec']['nodeName'],
-          'master_url'     => @kubernetes_url
-      }
-      kubernetes_metadata['annotations'] = annotations unless annotations.empty?
-      return kubernetes_metadata
-    end
-
-    def parse_namespace_metadata(namespace_object)
-      labels = syms_to_strs(namespace_object['metadata']['labels'].to_h)
-      annotations = match_annotations(syms_to_strs(namespace_object['metadata']['annotations'].to_h))
-      if @de_dot
-        self.de_dot!(labels)
-        self.de_dot!(annotations)
-      end
-      kubernetes_metadata = {
-        'namespace_id' => namespace_object['metadata']['uid']
-      }
-      kubernetes_metadata['namespace_labels'] = labels unless labels.empty?
-      kubernetes_metadata['namespace_annotations'] = annotations unless annotations.empty?
-      return kubernetes_metadata
-    end
-
-    def get_pod_metadata(namespace_name, pod_name)
+    def fetch_pod_metadata(namespace_name, pod_name)
+      log.trace("fetching pod metadata: #{namespace_name}/#{pod_name}") if log.trace?
       begin
         metadata = @client.get_pod(pod_name, namespace_name)
         unless metadata
+          log.trace("no metadata returned for: #{namespace_name}/#{pod_name}") if log.trace?
           @stats.bump(:pod_cache_api_nil_not_found)
         else
           begin
+            log.trace("raw metadata for #{namespace_name}/#{pod_name}: #{metadata}") if log.trace?
             metadata = parse_pod_metadata(metadata)
             @stats.bump(:pod_cache_api_updates)
+            log.trace("parsed metadata for #{namespace_name}/#{pod_name}: #{metadata}") if log.trace?
+            @cache[metadata['pod_id']] = metadata
             return metadata
           rescue Exception=>e
             log.debug(e)
             @stats.bump(:pod_cache_api_nil_bad_resp_payload)
-            nil
+            log.trace("returning empty metadata for #{namespace_name}/#{pod_name} due to error") if log.trace?
           end
         end
       rescue KubeException=>e
         @stats.bump(:pod_cache_api_nil_error)
         log.debug "Exception encountered fetching pod metadata from Kubernetes API #{@apiVersion} endpoint #{@kubernetes_url}: #{e.message}"
-        nil
       end
+      {}
     end
 
     def dump_stats
@@ -139,61 +104,76 @@ module Fluent
       @stats.set(:pod_cache_size, @cache.count)
       @stats.set(:namespace_cache_size, @namespace_cache.count) if @namespace_cache
       log.info(@stats)
+      if log.level == Fluent::Log::LEVEL_TRACE
+        log.trace("       id cache: #{@id_cache.to_a}")
+        log.trace("      pod cache: #{@cache.to_a}")
+        log.trace("namespace cache: #{@namespace_cache.to_a}")
+      end
     end
 
-    def get_namespace_metadata(namespace_name)
+    def fetch_namespace_metadata(namespace_name)
+      log.trace("fetching namespace metadata: #{namespace_name}") if log.trace?
       begin
         metadata = @client.get_namespace(namespace_name)
         unless metadata
+            log.trace("no metadata returned for: #{namespace_name}") if log.trace?
             @stats.bump(:namespace_cache_api_nil_not_found)
         else
           begin
+            log.trace("raw metadata for #{namespace_name}: #{metadata}") if log.trace?
             metadata = parse_namespace_metadata(metadata)
             @stats.bump(:namespace_cache_api_updates)
+            log.trace("parsed metadata for #{namespace_name}: #{metadata}") if log.trace?
+             @namespace_cache[metadata['namespace_id']] = metadata
             return metadata
           rescue Exception => e
             log.debug(e)
             @stats.bump(:namespace_cache_api_nil_bad_resp_payload)
-            nil
+            log.trace("returning empty metadata for #{namespace_name} due to error") if log.trace?
           end
         end
       rescue KubeException => kube_error
         @stats.bump(:namespace_cache_api_nil_error)
         log.debug "Exception encountered fetching namespace metadata from Kubernetes API #{@apiVersion} endpoint #{@kubernetes_url}: #{kube_error.message}"
-        nil
       end
+      {}
     end
 
     def initialize
       super
-      @stats = KubernetesMetadata::Stats.new
       @prev_time = Time.now
-
     end
 
     def configure(conf)
       super
 
+      def log.trace?
+        level == Fluent::Log::LEVEL_TRACE
+      end
+
       require 'kubeclient'
       require 'active_support/core_ext/object/blank'
       require 'lru_redux'
+      @stats = KubernetesMetadata::Stats.new
 
       if @de_dot && (@de_dot_separator =~ /\./).present?
         raise Fluent::ConfigError, "Invalid de_dot_separator: cannot be or contain '.'"
       end
 
-      if @include_namespace_id
-        # For compatibility, use include_namespace_metadata instead
-        @include_namespace_metadata = true
-      end
-
       if @cache_ttl < 0
+        log.info "Setting the cache TTL to :none because it was <= 0"
         @cache_ttl = :none
       end
+
+      # Caches pod/namespace UID tuples for a given container UID.
+      @id_cache = LruRedux::TTL::ThreadSafeCache.new(@cache_size, @cache_ttl)
+
+      # Use the container UID as the key to fetch a hash containing pod metadata
       @cache = LruRedux::TTL::ThreadSafeCache.new(@cache_size, @cache_ttl)
-      if @include_namespace_metadata
-        @namespace_cache = LruRedux::TTL::ThreadSafeCache.new(@cache_size, @cache_ttl)
-      end
+
+      # Use the namespace UID as the key to fetch a hash containing namespace metadata
+      @namespace_cache = LruRedux::TTL::ThreadSafeCache.new(@cache_size, @cache_ttl)
+
       @tag_to_kubernetes_name_regexp_compiled = Regexp.compile(@tag_to_kubernetes_name_regexp)
       @container_name_to_kubernetes_regexp_compiled = Regexp.compile(@container_name_to_kubernetes_regexp)
 
@@ -247,12 +227,10 @@ module Fluent
         end
 
         if @watch
-          thread = Thread.new(self) { |this| this.start_watch }
+          thread = Thread.new(self) { |this| this.start_pod_watch }
           thread.abort_on_exception = true
-          if @include_namespace_metadata
-            namespace_thread = Thread.new(self) { |this| this.start_namespace_watch }
-            namespace_thread.abort_on_exception = true
-          end
+          namespace_thread = Thread.new(self) { |this| this.start_namespace_watch }
+          namespace_thread.abort_on_exception = true
         end
       end
       if @use_journal
@@ -274,35 +252,74 @@ module Fluent
 
     end
 
-    def get_metadata_for_record(namespace_name, pod_name, container_name)
+    def get_metadata_for_record(match_data, cache_key, create_time)
+      namespace_name = match_data['namespace']
+      pod_name = match_data['pod_name']
       metadata = {
-        'container_name' => container_name,
+        'container_name' => match_data['container_name'],
         'namespace_name' => namespace_name,
-        'pod_name'       => pod_name,
+        'pod_name'       => pod_name
       }
       if @kubernetes_url.present?
-        cache_key = "#{namespace_name}_#{pod_name}"
-
-        this = self
-        pod_metadata = @cache.getset(cache_key) {
-          @stats.bump(:pod_cache_miss)
-          md = this.get_pod_metadata(
-            namespace_name,
-            pod_name,
-          )
-          md
-        }
+        pod_metadata = get_pod_metadata(cache_key, namespace_name, pod_name, create_time)
         metadata.merge!(pod_metadata) if pod_metadata
+      end
+      metadata
+    end
+
+    def get_pod_metadata(key, namespace_name, pod_name, record_create_time)
+        ids = @id_cache.fetch(key) do
+          #no metadata found
+          @stats.bump(:id_cache_miss)
+          pod_metadata = fetch_pod_metadata(namespace_name, pod_name)
+          namespace_metadata = fetch_namespace_metadata(namespace_name)
+          ids = {:pod_id=> pod_metadata['pod_id'], :namespace_id => namespace_metadata['namespace_id'] }
+          # pod not found or namespace not found
+          if ids[:pod_id].nil? || ids[:namespace_id].nil?
+             # pod notfound & namespace found
+             if ids[:pod_id].nil? && !ids[:namespace_id].nil?
+               ns_time = Time.parse(namespace_metadata['creation_timestamp'])
+               ids[:pod_id] = key if ns_time <= record_create_time #ns is older then record
+               ids
+             else
+               # nothing found
+               @stats.bump(:pod_cache_orphaned_record)
+               ids = :orphaned
+             end
+          end
+          ids
+        end
 
-        if @include_namespace_metadata
-          namespace_metadata = @namespace_cache.getset(namespace_name) {
-            @stats.bump(:namespace_cache_miss)
-            get_namespace_metadata(namespace_name)
+        if ids == :orphaned
+          return {} unless @allow_orphans
+          log.trace("orphaning message for: #{namespace_name}/#{pod_name} ") if log.trace?
+          return {
+            'orphaned_namespace' => namespace_name,
+            'namespace_name' => @orphaned_namespace_name,
+            'namespace_id' => @orphaned_namespace_id
           }
-          metadata.merge!(namespace_metadata) if namespace_metadata
         end
-      end
-      metadata
+        metadata =  @cache.fetch(ids[:pod_id]) do
+            @stats.bump(:pod_cache_miss)
+            m = fetch_pod_metadata(namespace_name, pod_name)
+            (m.nil? || m.empty?) ? {'pod_id'=>ids[:pod_id]} : m
+        end
+        metadata.merge!(@namespace_cache.fetch(ids[:namespace_id]) do
+           @stats.bump(:namespace_cache_miss)
+           m = fetch_namespace_metadata(namespace_name)
+           (m.nil? || m.empty?) ?  {'namespace_id'=>ids[:namespace_id]} : m
+        end)
+        metadata.delete('creation_timestamp') #remove namespace info thats only used for comparison
+        metadata
+    end
+
+    def create_time_from_record(record)
+        time = if @use_journal
+           record['_SOURCE_REALTIME_TIMESTAMP'].nil? ? record['_SOURCE_REALTIME_TIMESTAMP'] : record['__REALTIME_TIMESTAMP']
+        else
+          record['time']
+        end
+        (time.nil? || time.chop.empty?) ? Time.now : Time.parse(time)
     end
 
     def filter_stream(tag, es)
@@ -315,15 +332,12 @@ module Fluent
       match_data = tag.match(@tag_to_kubernetes_name_regexp_compiled)
 
       if match_data
+        container_id = match_data['docker_id']
         metadata = {
           'docker' => {
-            'container_id' => match_data['docker_id']
+            'container_id' => container_id
           },
-          'kubernetes' => get_metadata_for_record(
-            match_data['namespace'],
-            match_data['pod_name'],
-            match_data['container_name'],
-          ),
+          'kubernetes' => get_metadata_for_record(match_data, container_id, create_time_from_record(es.first[1]))
         }
       end
 
@@ -346,15 +360,12 @@ module Fluent
         metadata = nil
         if record.has_key?('CONTAINER_NAME') && record.has_key?('CONTAINER_ID_FULL')
           metadata = record['CONTAINER_NAME'].match(@container_name_to_kubernetes_regexp_compiled) do |match_data|
+           container_id = record['CONTAINER_ID_FULL']
             metadata = {
               'docker' => {
-                'container_id' => record['CONTAINER_ID_FULL']
+                'container_id' => container_id
               },
-              'kubernetes' => get_metadata_for_record(
-                match_data['namespace'],
-                match_data['pod_name'],
-                match_data['container_name'],
-              )
+              'kubernetes' => get_metadata_for_record(match_data, container_id, create_time_from_record(record))
             }
 
             metadata
@@ -381,10 +392,10 @@ module Fluent
 
     def merge_json_log(record)
       if record.has_key?(@merge_json_log_key)
-        log = record[@merge_json_log_key].strip
-        if log[0].eql?('{') && log[-1].eql?('}')
+        value = record[@merge_json_log_key].strip
+        if value[0].eql?('{') && value[-1].eql?('}')
           begin
-            record = JSON.parse(log).merge(record)
+            record = JSON.parse(value).merge(record)
             unless @preserve_json_log
               record.delete(@merge_json_log_key)
             end
@@ -407,82 +418,5 @@ module Fluent
       end
     end
 
-    def match_annotations(annotations)
-      result = {}
-      @annotations_regexps.each do |regexp|
-        annotations.each do |key, value|
-          if ::Fluent::StringUtil.match_regexp(regexp, key.to_s)
-            result[key] = value
-          end
-        end
-      end
-      result
-    end
-
-    def start_watch
-      begin
-        resource_version = @client.get_pods.resourceVersion
-        watcher          = @client.watch_pods(resource_version)
-      rescue Exception => e
-        message = "Exception encountered fetching metadata from Kubernetes API endpoint: #{e.message}"
-        message += " (#{e.response})" if e.respond_to?(:response)
-
-        raise Fluent::ConfigError, message
-      end
-
-      watcher.each do |notice|
-        case notice.type
-          when 'MODIFIED'
-            cache_key = "#{notice.object['metadata']['namespace']}_#{notice.object['metadata']['name']}"
-            cached    = @cache[cache_key]
-            if cached
-              @cache[cache_key] = parse_pod_metadata(notice.object)
-              @stats.bump(:pod_cache_watch_updates)
-            else
-              @stats.bump(:pod_cache_watch_misses)
-            end
-          when 'DELETED'
-            cache_key = "#{notice.object['metadata']['namespace']}_#{notice.object['metadata']['name']}"
-            @cache.delete(cache_key)
-            @stats.bump(:pod_cache_watch_deletes)
-          else
-            # Don't pay attention to creations, since the created pod may not
-            # end up on this node.
-            @stats.bump(:pod_cache_watch_ignored)
-        end
-      end
-    end
-
-    def start_namespace_watch
-      begin
-        resource_version = @client.get_namespaces.resourceVersion
-        watcher          = @client.watch_namespaces(resource_version)
-      rescue Exception=>e
-        message = "start_namespace_watch: Exception encountered setting up namespace watch from Kubernetes API #{@apiVersion} endpoint #{@kubernetes_url}: #{e.message}"
-        message += " (#{e.response})" if e.respond_to?(:response)
-        log.debug(message)
-        raise Fluent::ConfigError, message
-      end
-      watcher.each do |notice|
-        case notice.type
-          when 'MODIFIED'
-            cache_key = notice.object['metadata']['name']
-            cached    = @namespace_cache[cache_key]
-            if cached
-              @namespace_cache[cache_key] = parse_namespace_metadata(notice.object)
-              @stats.bump(:namespace_cache_watch_updates)
-            else
-              @stats.bump(:namespace_cache_watch_misses)
-            end
-          when 'DELETED'
-            @namespace_cache.delete(notice.object['metadata']['name'])
-            @stats.bump(:namespace_cache_watch_deletes)
-          else
-            # Don't pay attention to creations, since the created namespace may not
-            # be used by any pod on this node.
-            @stats.bump(:namespace_cache_watch_ignored)
-        end
-      end
-    end
   end
 end

data/lib/fluent/plugin/kubernetes_metadata_common.rb

@@ -0,0 +1,85 @@
+#
+# Fluentd Kubernetes Metadata Filter Plugin - Enrich Fluentd events with
+# Kubernetes metadata
+#
+# Copyright 2017 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module KubernetesMetadata
+  module Common
+
+    def match_annotations(annotations)
+      result = {}
+      @annotations_regexps.each do |regexp|
+        annotations.each do |key, value|
+          if ::Fluent::StringUtil.match_regexp(regexp, key.to_s)
+            result[key] = value
+          end
+        end
+      end
+      result
+    end
+
+    def parse_namespace_metadata(namespace_object)
+      labels = syms_to_strs(namespace_object['metadata']['labels'].to_h)
+      annotations = match_annotations(syms_to_strs(namespace_object['metadata']['annotations'].to_h))
+      if @de_dot
+        self.de_dot!(labels)
+        self.de_dot!(annotations)
+      end
+      kubernetes_metadata = {
+        'namespace_id' => namespace_object['metadata']['uid'],
+        'creation_timestamp' => namespace_object['metadata']['creationTimestamp']
+      }
+      kubernetes_metadata['namespace_labels'] = labels unless labels.empty?
+      kubernetes_metadata['namespace_annotations'] = annotations unless annotations.empty?
+      return kubernetes_metadata
+    end
+
+    def parse_pod_metadata(pod_object)
+      labels = syms_to_strs(pod_object['metadata']['labels'].to_h)
+      annotations = match_annotations(syms_to_strs(pod_object['metadata']['annotations'].to_h))
+      if @de_dot
+        self.de_dot!(labels)
+        self.de_dot!(annotations)
+      end
+      kubernetes_metadata = {
+          'namespace_name' => pod_object['metadata']['namespace'],
+          'pod_id'         => pod_object['metadata']['uid'],
+          'pod_name'       => pod_object['metadata']['name'],
+          'labels'         => labels,
+          'host'           => pod_object['spec']['nodeName'],
+          'master_url'     => @kubernetes_url
+      }
+      kubernetes_metadata['annotations'] = annotations unless annotations.empty?
+      return kubernetes_metadata
+    end
+
+    def syms_to_strs(hsh)
+      newhsh = {}
+      hsh.each_pair do |kk,vv|
+        if vv.is_a?(Hash)
+          vv = syms_to_strs(vv)
+        end
+        if kk.is_a?(Symbol)
+          newhsh[kk.to_s] = vv
+        else
+          newhsh[kk] = vv
+        end
+      end
+      newhsh
+    end
+
+  end
+end

data/lib/fluent/plugin/kubernetes_metadata_stats.rb

@@ -2,7 +2,7 @@
 # Fluentd Kubernetes Metadata Filter Plugin - Enrich Fluentd events with
 # Kubernetes metadata
 #
-# Copyright 2015 Red Hat, Inc.
+# Copyright 2017 Red Hat, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ module KubernetesMetadata
   class Stats
 
     def initialize
-      @stats = LruRedux::TTL::ThreadSafeCache.new(1000, 3600)
+      @stats = ::LruRedux::TTL::ThreadSafeCache.new(1000, 3600)
     end
 
     def bump(key)
@@ -32,6 +32,10 @@ module KubernetesMetadata
        @stats[key] = value
     end
 
+    def [](key)
+      @stats[key]
+    end
+
     def to_s
       "stats - " + [].tap do |a|
           @stats.each {|k,v| a << "#{k.to_s}: #{v}"}

data/lib/fluent/plugin/kubernetes_metadata_watch_namespaces.rb

@@ -0,0 +1,60 @@
+#
+# Fluentd Kubernetes Metadata Filter Plugin - Enrich Fluentd events with
+# Kubernetes metadata
+#
+# Copyright 2017 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require_relative 'kubernetes_metadata_common'
+
+module KubernetesMetadata
+  module WatchNamespaces
+
+    include ::KubernetesMetadata::Common
+
+    def start_namespace_watch
+      begin
+        resource_version = @client.get_namespaces.resourceVersion
+        watcher          = @client.watch_namespaces(resource_version)
+      rescue Exception=>e
+        message = "start_namespace_watch: Exception encountered setting up namespace watch from Kubernetes API #{@apiVersion} endpoint #{@kubernetes_url}: #{e.message}"
+        message += " (#{e.response})" if e.respond_to?(:response)
+        log.debug(message)
+        raise Fluent::ConfigError, message
+      end
+      watcher.each do |notice|
+        case notice.type
+          when 'MODIFIED'
+            cache_key = notice.object['metadata']['uid']
+            cached    = @namespace_cache[cache_key]
+            if cached
+              @namespace_cache[cache_key] = parse_namespace_metadata(notice.object)
+              @stats.bump(:namespace_cache_watch_updates)
+            else
+              @stats.bump(:namespace_cache_watch_misses)
+            end
+          when 'DELETED'
+            # ignore and let age out for cases where 
+            # deleted but still processing logs
+            @stats.bump(:namespace_cache_watch_deletes_ignored)
+          else
+            # Don't pay attention to creations, since the created namespace may not
+            # be used by any pod on this node.
+            @stats.bump(:namespace_cache_watch_ignored)
+        end
+      end
+    end
+
+  end
+end

data/lib/fluent/plugin/kubernetes_metadata_watch_pods.rb

@@ -0,0 +1,60 @@
+#
+# Fluentd Kubernetes Metadata Filter Plugin - Enrich Fluentd events with
+# Kubernetes metadata
+#
+# Copyright 2017 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require_relative 'kubernetes_metadata_common'
+
+module KubernetesMetadata
+  module WatchPods
+
+    include ::KubernetesMetadata::Common
+
+    def start_pod_watch
+      begin
+        resource_version = @client.get_pods.resourceVersion
+        watcher          = @client.watch_pods(resource_version)
+      rescue Exception => e
+        message = "Exception encountered fetching metadata from Kubernetes API endpoint: #{e.message}"
+        message += " (#{e.response})" if e.respond_to?(:response)
+
+        raise Fluent::ConfigError, message
+      end
+
+      watcher.each do |notice|
+        case notice.type
+          when 'MODIFIED'
+            cache_key = notice.object['metadata']['uid']
+            cached    = @cache[cache_key]
+            if cached
+              @cache[cache_key] = parse_pod_metadata(notice.object)
+              @stats.bump(:pod_cache_watch_updates)
+            else
+              @stats.bump(:pod_cache_watch_misses)
+            end
+          when 'DELETED'
+            # ignore and let age out for cases where pods
+            # deleted but still processing logs
+            @stats.bump(:pod_cache_watch_delete_ignored)
+          else
+            # Don't pay attention to creations, since the created pod may not
+            # end up on this node.
+            @stats.bump(:pod_cache_watch_ignored)
+        end
+      end
+    end
+  end
+end

data/test/helper.rb

@@ -30,6 +30,7 @@ require 'test/unit/rr'
 require 'fileutils'
 require 'fluent/log'
 require 'fluent/test'
+require 'minitest/autorun'
 require 'webmock/test_unit'
 require 'vcr'
 

data/test/plugin/test_filter_kubernetes_metadata.rb

@@ -151,8 +151,15 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
           kubernetes_url https://localhost:8443
           watch false
           cache_size 1
-        ')
-      d = create_driver(config)
+          include_namespace_metadata true
+        ', d: nil)
+      d = create_driver(config) if d.nil?
+      if ENV['LOGLEVEL'] 
+        logger = Logger.new(STDOUT)
+        logger.level = eval("Logger::#{ENV['LOGLEVEL'].upcase}")
+        instance = d.instance
+        instance.instance_variable_set(:@log,logger)
+      end
       d.run {
         d.emit(msg, @time)
       }.filtered
@@ -169,10 +176,82 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
       }.filtered
     end
 
+    test 'with docker & kubernetes metadata where id cache hit and metadata miss' do
+      VCR.use_cassette('kubernetes_docker_metadata') do
+        driver = create_driver('
+          kubernetes_url https://localhost:8443
+          watch false
+          cache_size 1
+          include_namespace_metadata true
+        ')
+        cache = driver.instance.instance_variable_get(:@id_cache)
+        cache['49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'] = {
+            :pod_id       =>'c76927af-f563-11e4-b32d-54ee7527188d',
+            :namespace_id =>'898268c8-4a36-11e5-9d81-42010af0194c'
+        }
+        stub_request(:any, 'https://localhost:8443/api/v1/namespaces/default/pods/fabric8-console-controller-98rqc').to_timeout
+        stub_request(:any, 'https://localhost:8443/api/v1/namespaces/default').to_timeout
+        es = emit({'time'=>'2015-05-08T09:22:01Z'}, '', d:driver)
+        expected_kube_metadata = {
+          'time'=>'2015-05-08T09:22:01Z',
+          'docker' => {
+              'container_id' => '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'
+          },
+          'kubernetes' => {
+            'pod_name'       => 'fabric8-console-controller-98rqc',
+            'container_name' => 'fabric8-console-container',
+            'namespace_name' => 'default',
+            'namespace_id'   => '898268c8-4a36-11e5-9d81-42010af0194c',
+            'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
+          }
+        }
+        
+        assert_equal(expected_kube_metadata, es.instance_variable_get(:@record_array)[0])
+      end
+    end
+
+    test 'with docker & kubernetes metadata where id cache hit and metadata is reloaded' do
+      VCR.use_cassette('kubernetes_docker_metadata') do
+        driver = create_driver('
+          kubernetes_url https://localhost:8443
+          watch false
+          cache_size 1
+          include_namespace_metadata true
+        ')
+        cache = driver.instance.instance_variable_get(:@id_cache)
+        cache['49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'] = {
+            :pod_id       =>'c76927af-f563-11e4-b32d-54ee7527188d',
+            :namespace_id =>'898268c8-4a36-11e5-9d81-42010af0194c'
+        }
+        es = emit({'time'=>'2015-05-08T09:22:01Z'}, '', d:driver)
+        expected_kube_metadata = {
+          'time'=>'2015-05-08T09:22:01Z',
+          'docker' => {
+              'container_id' => '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'
+          },
+          'kubernetes' => {
+            'host'           => 'jimmi-redhat.localnet',
+            'pod_name'       => 'fabric8-console-controller-98rqc',
+            'container_name' => 'fabric8-console-container',
+            'namespace_name' => 'default',
+            'namespace_id'   => '898268c8-4a36-11e5-9d81-42010af0194c',
+            'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
+            'master_url'     => 'https://localhost:8443',
+            'labels' => {
+              'component' => 'fabric8Console'
+            }
+          }
+        }
+        
+        assert_equal(expected_kube_metadata, es.instance_variable_get(:@record_array)[0])
+      end
+    end
+
     test 'with docker & kubernetes metadata' do
       VCR.use_cassette('kubernetes_docker_metadata') do
-        es = emit()
+        es = emit({'time'=>'2015-05-08T09:22:01Z'})
         expected_kube_metadata = {
+          'time'=>'2015-05-08T09:22:01Z',
           'docker' => {
               'container_id' => '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'
           },
@@ -181,6 +260,7 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
             'pod_name'       => 'fabric8-console-controller-98rqc',
             'container_name' => 'fabric8-console-container',
             'namespace_name' => 'default',
+            'namespace_id'   => '898268c8-4a36-11e5-9d81-42010af0194c',
             'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
             'master_url'     => 'https://localhost:8443',
             'labels' => {
@@ -188,6 +268,7 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
             }
           }
         }
+        
         assert_equal(expected_kube_metadata, es.instance_variable_get(:@record_array)[0])
       end
     end
@@ -238,6 +319,7 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
             'pod_name'       => 'fabric8-console-controller-98rqc',
             'container_name' => 'fabric8-console-container',
             'namespace_name' => 'default',
+            'namespace_id'   => '898268c8-4a36-11e5-9d81-42010af0194c',
             'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
             'master_url'     => 'https://localhost:8443',
             'labels' => {
@@ -271,6 +353,7 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
         }.to_json
       )
       stub_request(:any, 'https://localhost:8443/api/v1/namespaces/default/pods/fabric8-console-controller-98rqc').to_timeout
+      stub_request(:any, 'https://localhost:8443/api/v1/namespaces/default').to_timeout
       es = emit()
       expected_kube_metadata = {
         'docker' => {
@@ -279,7 +362,9 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
         'kubernetes' => {
           'pod_name'       => 'fabric8-console-controller-98rqc',
           'container_name' => 'fabric8-console-container',
-          'namespace_name' => 'default'
+          'namespace_name' => '.orphaned',
+          'orphaned_namespace' => 'default',
+          'namespace_id' => 'orphaned'
         }
       }
       assert_equal(expected_kube_metadata, es.instance_variable_get(:@record_array)[0])
@@ -350,6 +435,15 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
       assert_equal(msg.merge(json_log), es.instance_variable_get(:@record_array)[0])
     end
 
+    test 'ignores invalid json in log field' do
+      json_log = "{'foo':123}"
+      msg = {
+          'log' => json_log
+      }
+      es = emit_with_tag('non-kubernetes', msg, '')
+      assert_equal(msg, es.instance_variable_get(:@record_array)[0])
+    end
+
     test 'merges json log data with message field in MESSAGE' do
       json_log = {
         'timeMillis' => 1459853347608,
@@ -491,6 +585,7 @@ use_journal true
             'pod_name'       => 'fabric8-console-controller-98rqc',
             'container_name' => 'fabric8-console-container',
             'namespace_name' => 'default',
+            'namespace_id'   => '898268c8-4a36-11e5-9d81-42010af0194c',
             'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
             'master_url'     => 'https://localhost:8443',
             'labels' => {
@@ -556,6 +651,7 @@ use_journal true
                 'pod_name'       => 'fabric8-console-controller-98rqc',
                 'container_name' => 'fabric8-console-container',
                 'namespace_name' => 'default',
+                'namespace_id'   => '898268c8-4a36-11e5-9d81-42010af0194c',
                 'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
                 'master_url'     => 'https://localhost:8443',
                 'labels'         => {
@@ -595,6 +691,7 @@ use_journal true
             'pod_name'       => 'fabric8-console-controller-98rqc',
             'container_name' => 'fabric8-console-container',
             'namespace_name' => 'default',
+            'namespace_id'   => '898268c8-4a36-11e5-9d81-42010af0194c',
             'pod_id'         => 'c76927af-f563-11e4-b32d-54ee7527188d',
             'master_url'     => 'https://localhost:8443',
             'labels' => {

data/test/plugin/test_watch_namespaces.rb

@@ -0,0 +1,91 @@
+#
+# Fluentd Kubernetes Metadata Filter Plugin - Enrich Fluentd events with
+# Kubernetes metadata
+#
+# Copyright 2015 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require_relative '../helper'
+require 'ostruct'
+require_relative 'watch_test'
+
+class WatchNamespacesTestTest < WatchTest
+
+     include KubernetesMetadata::WatchNamespaces
+
+     setup do
+       @created = OpenStruct.new(
+         type: 'CREATED',
+         object: {
+           'metadata' => {
+                'name' => 'created',
+                'uid' => 'created_uid'
+            }
+         }
+       )
+       @modified = OpenStruct.new(
+         type: 'MODIFIED',
+         object: {
+           'metadata' => {
+                'name' => 'foo',
+                'uid' => 'modified_uid'
+            }
+         }
+       )
+       @deleted = OpenStruct.new(
+         type: 'DELETED',
+         object: {
+           'metadata' => {
+                'name' => 'deleteme',
+                'uid' => 'deleted_uid'
+            }
+         }
+       )
+     end
+
+    test 'namespace watch ignores CREATED' do
+      @client.stub :watch_namespaces, [@created] do
+       start_namespace_watch
+       assert_equal(false, @namespace_cache.key?('created_uid'))
+       assert_equal(1, @stats[:namespace_cache_watch_ignored])
+      end
+    end
+
+    test 'namespace watch ignores MODIFIED when info not in cache' do
+      @client.stub :watch_namespaces, [@modified] do
+       start_namespace_watch
+       assert_equal(false, @namespace_cache.key?('modified_uid'))
+       assert_equal(1, @stats[:namespace_cache_watch_misses])
+      end
+    end
+
+    test 'namespace watch updates cache when MODIFIED is received and info is cached' do
+      @namespace_cache['modified_uid'] = {}
+      @client.stub :watch_namespaces, [@modified] do
+       start_namespace_watch
+       assert_equal(true, @namespace_cache.key?('modified_uid'))
+       assert_equal(1, @stats[:namespace_cache_watch_updates])
+      end
+    end
+
+    test 'namespace watch ignores DELETED' do
+      @namespace_cache['deleted_uid'] = {}
+      @client.stub :watch_namespaces, [@deleted] do
+       start_namespace_watch
+       assert_equal(true, @namespace_cache.key?('deleted_uid'))
+       assert_equal(1, @stats[:namespace_cache_watch_deletes_ignored])
+      end
+    end
+
+end

data/test/plugin/test_watch_pods.rb

@@ -0,0 +1,102 @@
+#
+# Fluentd Kubernetes Metadata Filter Plugin - Enrich Fluentd events with
+# Kubernetes metadata
+#
+# Copyright 2015 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require_relative '../helper'
+require 'ostruct'
+require_relative 'watch_test'
+
+class DefaultPodWatchStrategyTest < WatchTest
+
+     include KubernetesMetadata::WatchPods
+
+     setup do
+       @created = OpenStruct.new(
+         type: 'CREATED',
+         object: {
+           'metadata' => {
+                'name' => 'created',
+                'namespace' => 'create',
+                'uid' => 'created_uid',
+                'labels' => {},
+            },
+            'spec' => {
+                'nodeName' => 'aNodeName'
+            }
+         }
+       )
+       @modified = OpenStruct.new(
+         type: 'MODIFIED',
+         object: {
+           'metadata' => {
+                'name' => 'foo',
+                'namespace' => 'modified',
+                'uid' => 'modified_uid',
+                'labels' => {},
+            },
+            'spec' => {
+                'nodeName' => 'aNodeName'
+            }
+         }
+       )
+       @deleted = OpenStruct.new(
+         type: 'DELETED',
+         object: {
+           'metadata' => {
+                'name' => 'deleteme',
+                'namespace' => 'deleted',
+                'uid' => 'deleted_uid'
+            }
+         }
+       )
+     end
+
+    test 'pod watch notice ignores CREATED' do
+      @client.stub :watch_pods, [@created] do
+       start_pod_watch
+       assert_equal(false, @cache.key?('created_uid'))
+       assert_equal(1, @stats[:pod_cache_watch_ignored])
+      end
+    end
+
+    test 'pod watch notice is ignored when info not cached and MODIFIED is received' do
+      @client.stub :watch_pods, [@modified] do
+       start_pod_watch
+       assert_equal(false, @cache.key?('modified_uid'))
+       assert_equal(1, @stats[:pod_cache_watch_misses])
+      end
+    end
+
+    test 'pod watch notice is updated when MODIFIED is received' do
+      @cache['modified_uid'] = {}
+      @client.stub :watch_pods, [@modified] do
+       start_pod_watch
+       assert_equal(true, @cache.key?('modified_uid'))
+       assert_equal(1, @stats[:pod_cache_watch_updates])
+      end
+    end
+
+    test 'pod watch notice is ignored when delete is received' do
+      @cache['deleted_uid'] = {}
+      @client.stub :watch_pods, [@deleted] do
+       start_pod_watch
+       assert_equal(true, @cache.key?('deleted_uid'))
+       assert_equal(1, @stats[:pod_cache_watch_delete_ignored])
+      end
+    end
+
+end

data/test/plugin/watch_test.rb

@@ -0,0 +1,57 @@
+#
+# Fluentd Kubernetes Metadata Filter Plugin - Enrich Fluentd events with
+# Kubernetes metadata
+#
+# Copyright 2015 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require_relative '../helper'
+require 'ostruct'
+
+class WatchTest < Test::Unit::TestCase
+   
+    setup do
+      @annotations_regexps = []
+      @namespace_cache = {}
+      @cache = {}
+      @stats = KubernetesMetadata::Stats.new
+      @client = OpenStruct.new
+      def @client.resourceVersion
+        '12345'
+      end
+      def @client.watch_pods(value)
+         []
+      end
+      def @client.watch_namespaces(value)
+         []
+      end
+      def @client.get_namespaces 
+          self
+      end
+      def @client.get_pods
+          self
+      end
+    end
+
+    def watcher=(value)
+    end
+
+    def log
+        logger = {}
+        def logger.debug(message)
+        end
+        logger
+    end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-02 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -207,7 +207,10 @@ files:
 - circle.yml
 - fluent-plugin-kubernetes_metadata_filter.gemspec
 - lib/fluent/plugin/filter_kubernetes_metadata.rb
+- lib/fluent/plugin/kubernetes_metadata_common.rb
 - lib/fluent/plugin/kubernetes_metadata_stats.rb
+- lib/fluent/plugin/kubernetes_metadata_watch_namespaces.rb
+- lib/fluent/plugin/kubernetes_metadata_watch_pods.rb
 - test/cassettes/invalid_api_server_config.yml
 - test/cassettes/kubernetes_docker_metadata.yml
 - test/cassettes/kubernetes_docker_metadata_annotations.yml
@@ -220,9 +223,12 @@ files:
 - test/plugin/test.token
 - test/plugin/test_cache_stats.rb
 - test/plugin/test_filter_kubernetes_metadata.rb
+- test/plugin/test_watch_namespaces.rb
+- test/plugin/test_watch_pods.rb
+- test/plugin/watch_test.rb
 homepage: https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter
 licenses:
-- ASL2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -243,7 +249,7 @@ rubyforge_project:
 rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
-summary: Filter plugin to add Kubernetes metadata
+summary: Fluentd filter plugin to add Kubernetes metadata
 test_files:
 - test/cassettes/invalid_api_server_config.yml
 - test/cassettes/kubernetes_docker_metadata.yml
@@ -257,3 +263,6 @@ test_files:
 - test/plugin/test.token
 - test/plugin/test_cache_stats.rb
 - test/plugin/test_filter_kubernetes_metadata.rb
+- test/plugin/test_watch_namespaces.rb
+- test/plugin/test_watch_pods.rb
+- test/plugin/watch_test.rb