fluent-plugin-kubernetes_metadata_filter 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da9ac5757f2ae0199b718b45cf559a9c214eb486
-  data.tar.gz: 808080db4f5fe7cd15d0972596be8b0bd6310d19
+  metadata.gz: ae88fa238369257fb50ba6989fc08f80986ec4a0
+  data.tar.gz: 263164257b94e338517a23e06b58e0a7b923f41a
 SHA512:
-  metadata.gz: 9506b64f77aaf9c4c07bd55ca7939ee8a2fb6f14e527870ea0515d2f66527db45c2aff89ef5c38c9a345b65543ed20675a6c4a6773fb322bd0d30e24c6edb595
-  data.tar.gz: 7e1812dd6c2e14a14e29def29bea2c28aef596a520edb0ac4aa8f87f3eedaac187681842e503cc87c5878ad1192aaab338afcac48c704b0828dc06d9ed7c3501
+  metadata.gz: e81f454859bbb3338de78dbc1b0d468d6ea87110aa41f89eafb09f1bfb1e482bb5ada1dd09cd96d892b21d7287c66c9073bf31c812bb381876c05783598b0ed2
+  data.tar.gz: 400599efefa4014dacb62a660a5f2a6c83a0b6012c53cd9e4f75d7cf27e9ce86823cfdb27ee5bf8204316ec391ac4e95d143eb40a67cd41692f418a9268caaf1

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'codeclimate-test-reporter', :group => :test, :require => nil
+gem 'codeclimate-test-reporter', '<1.0.0', :group => :test, :require => nil
 gem 'rubocop', require: false
 
 # Specify your gem's dependencies in fluent-plugin-add.gemspec

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.29.0"
+  gem.version       = "0.30.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

@@ -16,6 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require_relative 'kubernetes_metadata_stats'
 module Fluent
   class KubernetesMetadataFilter < Fluent::Filter
     K8_POD_CA_CERT = 'ca.crt'
@@ -57,6 +58,7 @@ module Fluent
                  :default => '^(?<name_prefix>[^_]+)_(?<container_name>[^\._]+)(\.(?<container_hash>[^_]+))?_(?<pod_name>[^_]+)_(?<namespace>[^_]+)_[^_]+_[^_]+$'
 
     config_param :annotation_match, :array, default: []
+    config_param :stats_interval, :integer, default: 30
 
     def syms_to_strs(hsh)
       newhsh = {}
@@ -110,15 +112,63 @@ module Fluent
     def get_pod_metadata(namespace_name, pod_name)
       begin
         metadata = @client.get_pod(pod_name, namespace_name)
-        return if !metadata
-        return parse_pod_metadata(metadata)
-      rescue KubeException
+        unless metadata
+          @stats.bump(:pod_cache_api_nil_not_found)
+        else
+          begin
+            metadata = parse_pod_metadata(metadata)
+            @stats.bump(:pod_cache_api_updates)
+            return metadata
+          rescue Exception=>e
+            log.debug(e)
+            @stats.bump(:pod_cache_api_nil_bad_resp_payload)
+            nil
+          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
+      @curr_time = Time.now
+      return if @curr_time.to_i - @prev_time.to_i < @stats_interval
+      @prev_time = @curr_time
+      @stats.set(:pod_cache_size, @cache.count)
+      @stats.set(:namespace_cache_size, @namespace_cache.count)
+      log.info(@stats)
+    end
+
+    def get_namespace_metadata(namespace_name)
+      begin
+        metadata = @client.get_namespace(namespace_name)
+        unless metadata
+            @stats.bump(:namespace_cache_api_nil_not_found)
+        else
+          begin
+            metadata = parse_namespace_metadata(metadata)
+            @stats.bump(:namespace_cache_api_updates)
+            return metadata
+          rescue Exception => e
+            log.debug(e)
+            @stats.bump(:namespace_cache_api_nil_bad_resp_payload)
+            nil
+          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)
@@ -235,6 +285,7 @@ module Fluent
 
         this = self
         pod_metadata = @cache.getset(cache_key) {
+          @stats.bump(:pod_cache_miss)
           md = this.get_pod_metadata(
             namespace_name,
             pod_name,
@@ -245,14 +296,8 @@ module Fluent
 
         if @include_namespace_metadata
           namespace_metadata = @namespace_cache.getset(namespace_name) {
-            begin
-              namespace = @client.get_namespace(namespace_name)
-              if namespace
-                parse_namespace_metadata(namespace)
-              end
-            rescue KubeException
-              nil
-            end
+            @stats.bump(:namespace_cache_miss)
+            get_namespace_metadata(namespace_name)
           }
           metadata.merge!(namespace_metadata) if namespace_metadata
         end
@@ -289,7 +334,7 @@ module Fluent
 
         new_es.add(time, record)
       }
-
+      dump_stats
       new_es
     end
 
@@ -317,9 +362,11 @@ module Fluent
           end
           unless metadata
             log.debug "Error: could not match CONTAINER_NAME from record #{record}"
+            @stats.dump(:container_name_match_failed)
           end
         elsif record.has_key?('CONTAINER_NAME') && record['CONTAINER_NAME'].start_with?('k8s_')
           log.debug "Error: no container name and id in record #{record}"
+          @stats.dump(:container_name_id_missing)
         end
 
         if metadata
@@ -329,6 +376,7 @@ module Fluent
         new_es.add(time, record)
       }
 
+      dump_stats
       new_es
     end
 
@@ -341,7 +389,9 @@ module Fluent
             unless @preserve_json_log
               record.delete(@merge_json_log_key)
             end
-          rescue JSON::ParserError
+          rescue JSON::ParserError=>e
+            @stats.bump(:merge_json_parse_errors)
+            log.debug(e)
           end
         end
       end
@@ -376,9 +426,7 @@ module Fluent
         watcher          = @client.watch_pods(resource_version)
       rescue Exception => e
         message = "Exception encountered fetching metadata from Kubernetes API endpoint: #{e.message}"
-        if e.respond_to?(:response)
-          message += " (#{e.response})"
-        end
+        message += " (#{e.response})" if e.respond_to?(:response)
 
         raise Fluent::ConfigError, message
       end
@@ -390,20 +438,32 @@ module Fluent
             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
-      resource_version = @client.get_namespaces.resourceVersion
-      watcher          = @client.watch_namespaces(resource_version)
+      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'
@@ -411,12 +471,17 @@ module Fluent
             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

data/lib/fluent/plugin/kubernetes_metadata_stats.rb

@@ -0,0 +1,41 @@
+#
+# 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.
+#
+module KubernetesMetadata
+  class Stats
+
+    def initialize
+      @stats = LruRedux::TTL::ThreadSafeCache.new(1000, 3600)
+    end
+
+    def bump(key)
+        @stats[key] = @stats.getset(key) { 0 } + 1
+    end
+
+    def set(key, value)
+       @stats[key] = value
+    end
+
+    def to_s
+      "stats - " + [].tap do |a|
+          @stats.each {|k,v| a << "#{k.to_s}: #{v}"}
+      end.join(', ')
+    end
+
+  end
+end

data/test/plugin/test_cache_stats.rb

@@ -0,0 +1,36 @@
+#
+# 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 'fluent/plugin/kubernetes_metadata_stats'
+require 'webmock/test_unit'
+WebMock.disable_net_connect!
+
+class KubernetesMetadataCacheStatsTest < Test::Unit::TestCase
+  
+    test 'watch stats' do
+      require 'lru_redux'
+      stats = KubernetesMetadata::Stats.new
+      stats.bump(:missed)
+      stats.bump(:deleted)
+      stats.bump(:deleted)
+
+      assert_equal("stats - deleted: 2, missed: 1", stats.to_s)
+    end
+    
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -207,6 +207,7 @@ files:
 - circle.yml
 - fluent-plugin-kubernetes_metadata_filter.gemspec
 - lib/fluent/plugin/filter_kubernetes_metadata.rb
+- lib/fluent/plugin/kubernetes_metadata_stats.rb
 - test/cassettes/invalid_api_server_config.yml
 - test/cassettes/kubernetes_docker_metadata.yml
 - test/cassettes/kubernetes_docker_metadata_annotations.yml
@@ -217,6 +218,7 @@ files:
 - test/cassettes/valid_kubernetes_api_server.yml
 - test/helper.rb
 - test/plugin/test.token
+- test/plugin/test_cache_stats.rb
 - test/plugin/test_filter_kubernetes_metadata.rb
 homepage: https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter
 licenses:
@@ -238,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Filter plugin to add Kubernetes metadata
@@ -253,4 +255,5 @@ test_files:
 - test/cassettes/valid_kubernetes_api_server.yml
 - test/helper.rb
 - test/plugin/test.token
+- test/plugin/test_cache_stats.rb
 - test/plugin/test_filter_kubernetes_metadata.rb