fluent-plugin-kubernetes_metadata_filter 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 989125c79b1bd4fa6f72d872f11d0fd439e18a0c
-  data.tar.gz: 624665a54645b53019d3e328ec9a37f5c68472d2
+  metadata.gz: a5a3f2f0bcabc1a6f56b3edf41aa6ca50475eac2
+  data.tar.gz: d20a1f8f5e75366fffab4cb256540c8241afc2d7
 SHA512:
-  metadata.gz: 37a5dac8e9f2b76f30c610d9636559e026820ba2ca75e2c8e4c640237c3b5e72c1cde67ca4692d5b19763362b1b56c5f63af0a4e664316c7f28401faf80ab28d
-  data.tar.gz: 998b7939864d1ef76898511f5c8656d3f84695a2e804ca7fbb5738e5404dcbe5f74db22b44473e36fa26cdc41dfdc41d5d1c2c27f021cf0438473ee271fe8be8
+  metadata.gz: f9733a0745ac08b92ea4ec8b6af1c414bdab974608b66ffffe5478c2a7171a37cd91dcbf4bea309aa4000d1bb4516d7169e69d7906635a333342ea6ba622f582
+  data.tar.gz: 75e087d65d6a28039ae945d7fa11196aa93f337269dfa0c368fd07e8d35953f8abd1e1bbdb6d50b66c6a9669fa30818949471c766d06069ef1f7a59041efdeb1

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.32.0"
+  gem.version       = "0.33.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

@@ -343,7 +343,6 @@ module Fluent
 
       es.each { |time, record|
         record = merge_json_log(record) if @merge_json_log
-
         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|
@@ -362,11 +361,11 @@ module Fluent
           end
           unless metadata
             log.debug "Error: could not match CONTAINER_NAME from record #{record}"
-            @stats.dump(:container_name_match_failed)
+            @stats.bump(: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)
+          @stats.bump(:container_name_id_missing)
         end
 
         if metadata

data/test/plugin/test_filter_kubernetes_metadata.rb

@@ -36,7 +36,7 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
 
   sub_test_case 'dump_stats' do
 
-    test 'dump stats with indclude_namespace_metadata' do
+    test 'dump stats with include_namespace_metadata' do
       VCR.use_cassette('kubernetes_docker_metadata') do
         d = create_driver('
           kubernetes_url https://localhost:8443
@@ -672,6 +672,49 @@ use_journal true
         assert_equal(expected_kube_metadata, es.instance_variable_get(:@record_array)[0])
       end
     end
-
+    test 'with CONTAINER_NAME that does not match' do
+      tag = 'var.log.containers.junk4_junk5_junk6-49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed450.log'
+      msg = {
+        'CONTAINER_NAME' => 'does_not_match',
+        'CONTAINER_ID_FULL' => '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459',
+        'randomfield' => 'randomvalue'
+      }
+      VCR.use_cassette('kubernetes_docker_metadata_annotations') do
+        es = emit_with_tag(tag, msg, '
+          kubernetes_url https://localhost:8443
+          watch false
+          cache_size 1
+          use_journal true
+        ')
+        expected_kube_metadata = {
+          'CONTAINER_NAME' => 'does_not_match',
+          'CONTAINER_ID_FULL' => '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459',
+          'randomfield' => 'randomvalue'
+        }
+        assert_equal(expected_kube_metadata, es.instance_variable_get(:@record_array)[0])
+      end
+    end
+    test 'with CONTAINER_NAME starts with k8s_ that does not match' do
+      tag = 'var.log.containers.junk4_junk5_junk6-49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed450.log'
+      msg = {
+        'CONTAINER_NAME' => 'k8s_doesnotmatch',
+        'CONTAINER_ID_FULL' => '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459',
+        'randomfield' => 'randomvalue'
+      }
+      VCR.use_cassette('kubernetes_docker_metadata_annotations') do
+        es = emit_with_tag(tag, msg, '
+          kubernetes_url https://localhost:8443
+          watch false
+          cache_size 1
+          use_journal true
+        ')
+        expected_kube_metadata = {
+          'CONTAINER_NAME' => 'k8s_doesnotmatch',
+          'CONTAINER_ID_FULL' => '49095a2894da899d3b327c5fde1e056a81376cc9a8f8b09a195f2a92bceed459',
+          'randomfield' => 'randomvalue'
+        }
+        assert_equal(expected_kube_metadata, 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.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd