fluent-plugin-kubernetes_metadata_filter 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3692100ccc53b2ec7d4665075b6be69a1c7d842f
-  data.tar.gz: 04a6184a07bd7964cbfb242787d4933ad1adc12a
+  metadata.gz: f2e0964802476e178c9905c6e0cbaba9ffadb7c1
+  data.tar.gz: 5ccaeb987a53deacc7c93726804737a459582852
 SHA512:
-  metadata.gz: a5e7cf199299a8824218a906fe25c8d32378fab859cfdd7768bd920e7084e0a024b0c7ce07bf6dfdbed1b8cd3a1a02c2b47e3032f4fcc582d8a53c555c58cc1b
-  data.tar.gz: 91eed13731d61c72dfaa68132a51a74aafacff32427e44e4ee43946a2ea1b8c861a9962ae36aa882321a5f3a07d518d9727e5812894fbea1d826f05614be6c3e
+  metadata.gz: 641df616bdc5284f88d3e363693de7ff996301aef62397d0f44fce6907b7ca602bb9c4b13451be058e8d47c944bb49c9fc22a994c0688520e4db463749ffd213
+  data.tar.gz: c6054cb7f0184b34ce9c4bee0c665cfda2bfb012e87ac5744eb4664cffe43c2589af046a18de640b86beb2762d05997d1d27a87c0dafce4fb01b291f6e6a6256

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.9.0"
+  gem.version       = "0.10.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

@@ -35,7 +35,7 @@ module Fluent
     config_param :bearer_token_file, :string, default: ''
     config_param :merge_json_log, :bool, default: true
 
-    def get_metadata(pod_name, container_name, namespace)
+    def get_metadata(namespace, pod_name, container_name)
       begin
         metadata = @client.get_pod(pod_name, namespace)
         if metadata
@@ -125,25 +125,24 @@ module Fluent
         if @kubernetes_url.present?
           cache_key = "#{metadata[:kubernetes][:namespace]}_#{metadata[:kubernetes][:pod_name]}_#{metadata[:kubernetes][:container_name]}"
 
-          if cache_key.present?
-            this                = self
-            metadata            = @cache.getset(cache_key) {
-              if metadata
-                metadata[:kubernetes] = this.get_metadata(
-                    metadata[:kubernetes][:pod_name],
-                    metadata[:kubernetes][:container_name],
-                    metadata[:kubernetes][:namespace]
-                )
-                metadata
-              end
-            }
-          end
+          this     = self
+          metadata = @cache.getset(cache_key) {
+            if metadata
+              kubernetes_metadata = this.get_metadata(
+                metadata[:kubernetes][:namespace],
+                metadata[:kubernetes][:pod_name],
+                metadata[:kubernetes][:container_name]
+              )
+              metadata[:kubernetes] = kubernetes_metadata if kubernetes_metadata
+              metadata
+            end
+          }
         end
       end
 
       es.each { |time, record|
         record = merge_json_log(record) if @merge_json_log
-        
+
         record = record.merge(metadata) if metadata
 
         new_es.add(time, record)

data/test/plugin/test_filter_kubernetes_metadata.rb

@@ -66,7 +66,7 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
     test 'invalid API server config' do
       VCR.use_cassette('invalid_api_server_config') do
         assert_raise Fluent::ConfigError do
-          d = create_driver('
+          create_driver('
             kubernetes_url https://localhost:8443
             bearer_token_file test/plugin/test.token
             watch false
@@ -165,7 +165,26 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
       assert_equal(expected_kube_metadata, es.instance_variable_get(:@record_array)[0])
     end
 
-
+    test 'with docker & inaccessible kubernetes metadata' do
+      stub_request(:any, 'https://localhost:8443/api').to_return(
+        body: {
+          versions: ['v1beta3', 'v1']
+        }.to_json
+      )
+      stub_request(:any, 'https://localhost:8443/api/v1/namespaces/default/pods/fabric8-console-controller-98rqc').to_timeout
+      es = emit()
+      expected_kube_metadata = {
+        docker: {
+          container_id: '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459'
+        },
+        kubernetes: {
+          pod_name:       'fabric8-console-controller-98rqc',
+          container_name: 'fabric8-console-container',
+          namespace:      'default'
+        }
+      }
+      assert_equal(expected_kube_metadata, es.instance_variable_get(:@record_array)[0])
+    end
 
     test 'with docker metadata, non-kubernetes' do
       es = emit_with_tag('non-kubernetes', {}, '')
@@ -183,4 +202,4 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
       assert_equal(json_log, es.instance_variable_get(:@record_array)[0])
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd