fluent-plugin-kubernetes_metadata_filter 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58bdc9ed97a93eb46eeec306ad5851b94d3b5656
-  data.tar.gz: 56806c61750f533d2190c0a0915fb1fed0b4d46e
+  metadata.gz: 149bef65a13bf7ef7fc0a3964b4f8ba0696489f8
+  data.tar.gz: 99f30525e67d6d92593a1e6bbd5160b19889dab0
 SHA512:
-  metadata.gz: e38271b6f13d95781df47a4c99474ec9d54bd8926a48a55d2613086079997728902d74b1207986325e36f9ea647b65786b0602f280a8ae5d4c37f3ae4737973a
-  data.tar.gz: 90a46813a80eec7928f35387adc4778d3c07e1e6f61eea0cf3ca1725ef8195bf73816f733bb7c5cb0464cd69269981a8fb7562bc2a3e17ffaf00384624821b74
+  metadata.gz: d06e30879346ca2cca50a377357860e353263e9887f00de254d9906632080d6ec61eca74657a68debd60bcb594df5afdaeca8d54596ee57690cd0c40851261ae
+  data.tar.gz: 57c74b482aed9cece0895b9959929c16fc8fa55c705d93b889270171be55c5150682fb03d7c2a60fbbbfa91089998481a126d73aa3534951cc5772ebd1b6c055

data/README.md

@@ -53,7 +53,7 @@ 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`)
 
-**NOTE:** As of the release 1.1.x of this plugin, it no longer supports parsing the source message into JSON and attaching it to the
+**NOTE:** As of the release 2.1.x of this plugin, it no longer supports parsing the source message into JSON and attaching it to the
 payload.  The following configuration options are removed:
 
 * `merge_json_log`

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       = "2.1.0"
+  gem.version       = "2.1.1"
   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

@@ -90,12 +90,12 @@ module Fluent::Plugin
           rescue Exception=>e
             log.debug(e)
             @stats.bump(:pod_cache_api_nil_bad_resp_payload)
-            log.trace("returning empty metadata for #{namespace_name}/#{pod_name} due to error") if log.trace?
+            log.trace("returning empty metadata for #{namespace_name}/#{pod_name} due to error '#{e}'") if log.trace?
           end
         end
-      rescue KubeException=>e
+      rescue Exception=>e
         @stats.bump(:pod_cache_api_nil_error)
-        log.debug "Exception encountered fetching pod metadata from Kubernetes API #{@apiVersion} endpoint #{@kubernetes_url}: #{e.message}"
+        log.debug "Exception '#{e}' encountered fetching pod metadata from Kubernetes API #{@apiVersion} endpoint #{@kubernetes_url}"
       end
       {}
     end
@@ -132,12 +132,12 @@ module Fluent::Plugin
           rescue Exception => e
             log.debug(e)
             @stats.bump(:namespace_cache_api_nil_bad_resp_payload)
-            log.trace("returning empty metadata for #{namespace_name} due to error") if log.trace?
+            log.trace("returning empty metadata for #{namespace_name} due to error '#{e}'") if log.trace?
           end
         end
-      rescue KubeException => kube_error
+      rescue Exception => 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}"
+        log.debug "Exception '#{kube_error}' encountered fetching namespace metadata from Kubernetes API #{@apiVersion} endpoint #{@kubernetes_url}"
       end
       {}
     end

data/lib/fluent/plugin/kubernetes_metadata_cache_strategy.rb

@@ -18,7 +18,6 @@
 #
 module KubernetesMetadata
   module CacheStrategy
-
     def get_pod_metadata(key, namespace_name, pod_name, record_create_time, batch_miss_cache)
       metadata = {}
       ids = @id_cache[key]

data/test/plugin/test_filter_kubernetes_metadata.rb

@@ -140,12 +140,6 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
           cache_size 1
         ', 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(default_tag: DEFAULT_TAG) {
         d.feed(@time, msg)
       }
@@ -164,6 +158,33 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
       d.filtered.map{|e| e.last}
     end
 
+    test 'inability to connect to the api server handles exception and doensnt block pipeline' do
+      VCR.use_cassette('kubernetes_docker_metadata') do
+        driver = create_driver('
+          kubernetes_url https://localhost:8443
+          watch false
+          cache_size 1
+        ')
+        stub_request(:any, 'https://localhost:8443/api/v1/namespaces/default/pods/fabric8-console-controller-98rqc').to_raise(SocketError.new('error from pod fetch'))
+        stub_request(:any, 'https://localhost:8443/api/v1/namespaces/default').to_raise(SocketError.new('socket error from namespace fetch'))
+        filtered = 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_id"=>"orphaned",
+            'namespace_name' => '.orphaned',
+            "orphaned_namespace"=>"default"
+          }
+        }
+        assert_equal(expected_kube_metadata, filtered[0])
+      end
+    end
+
     test 'with docker & kubernetes metadata where id cache hit and metadata miss' do
       VCR.use_cassette('kubernetes_docker_metadata') do
         driver = create_driver('

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Jimmi Dyson