fluent-plugin-kubernetes_metadata_filter 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58d897a095da0f86d4df33f0b5c58c82d85076803d6d0dbedc5de3a31d43d156
-  data.tar.gz: 462a281ecfee82ba19b551e42a0a7b5231588d8e0c822c7c1056520184ba1200
+  metadata.gz: 4dda6d742dd87da5fb17389aa54f6c5fe1e17beb39ad2ad66d1e990b1a013e95
+  data.tar.gz: 0c5b3e36fe6c0b3017c9057b88df9349b8866e5d2901cf779b4f2f94da5e5fc5
 SHA512:
-  metadata.gz: 895146267be4067440ecd5e0466f8b62c0d618aed2dcc2e1cb335035d99ec1f9b3f1e4b39cadc16e641206877ebd92b012bca7f82da941a06ca55c5c7615d842
-  data.tar.gz: fdd45eff7c2ba1c1aeca22fe524dbfc9d2d0f94509f7731d1f199c925213fc7e57ad6fd75c2578b794e2f6ef8e20016aa06ed13d6cd90583794ebb960811dfc6
+  metadata.gz: 42fae7c4dd1f717d95d8015a9a66f2b65fafa80d55fb7751a3bdc374edeb06433974045a6f365ecd654734b957d3d48ab04cf15d64d4cc91f0c589792616f491
+  data.tar.gz: a20b407a2e4edb14c25f4a6fbad5bd6a4c016364ce785bebddab12b9b06d803f9ce189c5eaebdcd7b0826366568465b41f7fcef0691162c3f4a92ae7be077a86

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes_metadata_filter (3.1.0)
+    fluent-plugin-kubernetes_metadata_filter (3.1.2)
       fluentd (>= 0.14.0, < 1.16)
       kubeclient (>= 4.0.0, < 5.0.0)
       lru_redux
@@ -30,7 +30,7 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluentd (1.15.1)
+    fluentd (1.15.2)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
@@ -62,7 +62,7 @@ GEM
     http_parser.rb (0.8.0)
     jsonpath (1.1.2)
       multi_json
-    kubeclient (4.9.3)
+    kubeclient (4.10.0)
       http (>= 3.0, < 5.0)
       jsonpath (~> 1.0)
       recursive-open-struct (~> 1.1, >= 1.1.1)
@@ -73,7 +73,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     minitest (4.7.5)
-    msgpack (1.5.4)
+    msgpack (1.6.0)
     multi_json (1.15.0)
     netrc (0.11.0)
     parallel (1.22.1)
@@ -122,7 +122,7 @@ GEM
       test-unit (>= 2.5.2)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.1)
+    tzinfo-data (1.2022.4)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext

data/fluent-plugin-kubernetes_metadata_filter.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-kubernetes_metadata_filter'
-  gem.version       = '3.1.0'
+  gem.version       = '3.1.2'
   gem.authors       = ['OpenShift Cluster Logging','Jimmi Dyson']
   gem.email         = ['team-logging@redhat.com','jimmidyson@gmail.com']
   gem.description   = 'Filter plugin to add Kubernetes metadata'

data/lib/fluent/plugin/filter_kubernetes_metadata.rb

@@ -331,6 +331,11 @@ module Fluent::Plugin
         metadata['kubernetes'].merge!(pod_metadata) if pod_metadata
         metadata['kubernetes'].delete('containers')
       end
+      metadata['kubernetes'].tap do |kube|
+        kube.each_pair do |k,v|
+          kube[k.dup] = v.dup
+        end
+      end
       metadata.delete('docker') if metadata['docker'] && (metadata['docker']['container_id'].nil? || metadata['docker']['container_id'].empty?)
       metadata
     end

data/lib/fluent/plugin/kubernetes_metadata_watch_pods.rb

@@ -52,7 +52,7 @@ module KubernetesMetadata
           # recreate client to refresh token
           log.info("Encountered '401 Unauthorized' exception in watch, recreating client to refresh token")
           create_client()
-          namespace_watcher = nil
+          pod_watcher = nil
         else
           # treat all other errors the same as StandardError, log, swallow and reset
           @stats.bump(:pod_watch_failures)

data/test/plugin/test_filter_kubernetes_metadata.rb

@@ -373,6 +373,23 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
       end
     end
 
+    test 'kubernetes metadata is cloned so it further processing does not modify the cache' do
+
+      VCR.use_cassettes([{ name: 'valid_kubernetes_api_server' }, { name: 'kubernetes_get_api_v1' }, { name: 'kubernetes_get_pod' }, { name: 'kubernetes_get_namespace_default' }]) do
+
+        d = create_driver('
+          kubernetes_url https://localhost:8443
+          watch false
+          cache_size 1')
+        d.run(default_tag: VAR_LOG_POD_TAG) do
+          d.feed(@time, { 'time' => '2015-05-08T09:22:01Z' })
+          d.feed(@time, { 'time' => '2015-05-08T09:22:01Z' })
+        end
+        filtered = d.filtered.map(&:last)
+        assert_not_equal(filtered[0]['kubernetes']['labels'].object_id, filtered[1]['kubernetes']['labels'].object_id, "Exp. meta to be cloned")
+      end
+    end
+
     test 'with docker & kubernetes metadata & namespace_id enabled' do
       VCR.use_cassettes([{ name: 'valid_kubernetes_api_server' }, { name: 'kubernetes_get_api_v1' }, { name: 'kubernetes_get_pod' },
                          { name: 'kubernetes_get_namespace_default', options: { allow_playback_repeats: true } }]) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - OpenShift Cluster Logging
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd