fluent-plugin-kubernetes_metadata_filter 3.1.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d866c3ad5e90fce69d2f0d2f1e988cfbafe87ec8be406f9f694fba19ed2c89b
-  data.tar.gz: e952f47b62639f3afc4227647407fca4cbbbce166d97867894fb1e3f7402724c
+  metadata.gz: 8e5a90f306729056c922bded6d93b4718b5741306bf2a3ed57f694ceca07316a
+  data.tar.gz: 98e5e2334f10e40123654286af7ee2841e0691969c251de9e6437430af01ae7b
 SHA512:
-  metadata.gz: 294b181f0cf88d4b70f3dd1e5d840b3c13e0a0c8a9adde9f970cc6d12797ccb2a2e7cb49bf411d12665dd58c7e70138ee29b258af6dce4d7d18e67ba782c466f
-  data.tar.gz: 1b5865080a46ee7a8f7c634f7154070ff751eb9bea51f974f922cfcd7c13945ee8ae1aff15ff08f79239718126c192efce3c6b9292928d749250c586912d1f64
+  metadata.gz: 6fd2015c041919bdde2a3a6ef817de65054b3819b684ad6ce3b216b49c0a850281b1e14ca04c2db8556d4c6d6716cb39f2d882c2c1d2ab4cba4ddc0b46dde929
+  data.tar.gz: 35f99fc6cb137c0e2714be1c515651358fd93af8bfa18e883c1f7747f04fd4f6d43cc9b4f2e8e88a62a618087f71f3c7bdd8a42ba343dba5d7a8ec2ebc1eb731

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes_metadata_filter (3.1.1)
+    fluent-plugin-kubernetes_metadata_filter (3.1.3)
       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.2)
+    fluentd (1.15.3)
       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.10.0)
+    kubeclient (4.10.1)
       http (>= 3.0, < 5.0)
       jsonpath (~> 1.0)
       recursive-open-struct (~> 1.1, >= 1.1.1)
@@ -73,13 +73,13 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     minitest (4.7.5)
-    msgpack (1.5.6)
+    msgpack (1.6.0)
     multi_json (1.15.0)
     netrc (0.11.0)
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
-    power_assert (2.0.1)
+    power_assert (2.0.2)
     public_suffix (4.0.7)
     rainbow (3.1.1)
     rake (13.0.6)
@@ -115,14 +115,14 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     strptime (0.2.5)
-    test-unit (3.0.9)
+    test-unit (3.5.5)
       power_assert
     test-unit-rr (1.0.5)
       rr (>= 1.1.1)
       test-unit (>= 2.5.2)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.3)
+    tzinfo-data (1.2022.6)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
@@ -148,7 +148,7 @@ DEPENDENCIES
   minitest (~> 4.0)
   rake
   rubocop
-  test-unit (~> 3.0.2)
+  test-unit (~> 3.5.5)
   test-unit-rr (~> 1.0.3)
   vcr
   webmock

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.1'
+  gem.version       = '3.1.3'
   gem.authors       = ['OpenShift Cluster Logging','Jimmi Dyson']
   gem.email         = ['team-logging@redhat.com','jimmidyson@gmail.com']
   gem.description   = 'Filter plugin to add Kubernetes metadata'
@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'copyright-header'
   gem.add_development_dependency 'minitest', '~> 4.0'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'test-unit', '~> 3.0.2'
+  gem.add_development_dependency 'test-unit', '~> 3.5.5'
   gem.add_development_dependency 'test-unit-rr', '~> 1.0.3'
   gem.add_development_dependency 'vcr'
   gem.add_development_dependency 'webmock'

data/lib/fluent/plugin/filter_kubernetes_metadata.rb

@@ -108,6 +108,9 @@ module Fluent::Plugin
           # recreate client to refresh token
           log.info("Encountered '401 Unauthorized' exception, recreating client to refresh token")
           create_client()
+        elsif e.error_code == 404
+          log.debug "Encountered '404 Not Found' exception, pod not found"
+          @stats.bump(:pod_cache_api_nil_error)
         else
           log.error "Exception '#{e}' encountered fetching pod metadata from Kubernetes API #{@apiVersion} endpoint #{@kubernetes_url}"
           @stats.bump(:pod_cache_api_nil_error)
@@ -331,6 +334,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/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.1
+  version: 3.1.3
 platform: ruby
 authors:
 - OpenShift Cluster Logging
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.5.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.5.5
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement