fluent-plugin-kubernetes_metadata_filter 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 680668f1e22329aae7625573584b692ac587467eda5b8d6ee3d4532b59a94fa5
-  data.tar.gz: df055f83a86f4ab3fa3f2485c897f052699169c84867fff343163d99e26cee2d
+  metadata.gz: 0e365c5ac830a5565d8f42a0644729dc4adf2cd32e9322e84fb458f197f75444
+  data.tar.gz: eac9165306d860bfdfc69f512e4cf8d5e3cfe9808749822b5464703b452617a9
 SHA512:
-  metadata.gz: 790bfa10c0bfee5e749992181b420e63c6cf8c22e2240ee97a81b1755e9dfba82431ca2c517df4f9fceaab4d5a16d46cd68a42ec014448954dec73c83a2357ab
-  data.tar.gz: a3891a3a4da006eccb4345070664d0e9f0f51137e7e23a43eaf9907f4b27cfc3b1f9a633069e68a32f62a3c234883492a013d04a17fd4df83372299338e4f479
+  metadata.gz: 2fbcfe0b9541f1778f981bdd9b962f89f54e5d3f1539a1e1af4aaa32ac5ddfb15a4e700f8c405af3bbc65c67f0bc733aa4850206a884df994c7254bc66b46379
+  data.tar.gz: b3ca6d2c9688a7b662e359c0f587ba852fb0824b04ee90228c7b8a2867bff8cbfb7f9cc974a65c9053cbfbbc9edde9fd3085984501f14869bf53e8f4bdfb06e1

data/Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'codeclimate-test-reporter', '<1.0.0', group: :test, require: nil
+gem 'codeclimate-test-reporter', '< 1.0.0', group: :test, require: nil
 gem 'rubocop'
 
 # Specify your gem's dependencies in fluent-plugin-add.gemspec

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes_metadata_filter (3.6.0)
+    fluent-plugin-kubernetes_metadata_filter (3.7.0)
       fluentd (>= 0.14.0, < 1.19)
       kubeclient (>= 4.0.0, < 5.0.0)
-      lru_redux
+      sin_lru_redux
 
 GEM
   remote: https://rubygems.org/
@@ -13,6 +13,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     base64 (0.2.0)
+    bigdecimal (3.1.9)
     bump (0.10.0)
     charlock_holmes (0.7.7)
     codeclimate-test-reporter (0.6.0)
@@ -21,7 +22,8 @@ GEM
     cool.io (1.9.0)
     copyright-header (1.0.22)
       github-linguist
-    crack (0.4.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
     csv (3.3.0)
     docile (1.4.0)
@@ -76,7 +78,6 @@ GEM
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
     logger (1.6.2)
-    lru_redux (1.1.0)
     mime-types (3.6.0)
       logger
       mime-types-data (~> 3.2015)
@@ -128,6 +129,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
+    sin_lru_redux (2.4.0)
     strptime (0.2.5)
     test-unit (3.5.5)
       power_assert
@@ -167,4 +169,4 @@ DEPENDENCIES
   yajl-ruby
 
 BUNDLED WITH
-   2.3.16
+   2.4.22

data/README.md

@@ -44,6 +44,7 @@ Configuration options for fluent.conf are:
 This must use named capture groups for `container_name`, `pod_name`, `namespace`, and either `pod_uuid (/var/log/pods)` or `docker_id (/var/log/containers)`
 * `cache_size` - size of the cache of Kubernetes metadata to reduce requests to the API server (default: `1000`)
 * `cache_ttl` - TTL in seconds of each cached element. Set to negative value to disable TTL eviction (default: `3600` - 1 hour)
+* `ignore_nil` - ignore caching if the value is null (default: `true`)
 * `watch` - set up a watch on pods on the API server for updates to metadata (default: `true`)
 * `annotation_match` - Array of regular expressions matching annotation field names. Matched annotations are added to a log record.
 * `allow_orphans` - Modify the namespace and namespace id to the values of `orphaned_namespace_name` and `orphaned_namespace_id`

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.6.0'
+  gem.version       = '3.7.0'
   gem.authors       = ['OpenShift Cluster Logging','Jimmi Dyson']
   gem.email         = ['team-logging@redhat.com','jimmidyson@gmail.com']
   gem.description   = 'Filter plugin to add Kubernetes metadata'
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'fluentd', ['>= 0.14.0', '< 1.19']
   gem.add_runtime_dependency 'kubeclient', ['>= 4.0.0', '< 5.0.0']
-  gem.add_runtime_dependency 'lru_redux'
+  gem.add_runtime_dependency 'sin_lru_redux'
 
   gem.add_development_dependency 'bump'
   gem.add_development_dependency 'bundler', '~> 2.0'

data/lib/fluent/plugin/filter_kubernetes_metadata.rb

@@ -44,6 +44,7 @@ module Fluent::Plugin
     config_param :kubernetes_url, :string, default: nil
     config_param :cache_size, :integer, default: 1000
     config_param :cache_ttl, :integer, default: 60 * 60
+    config_param :ignore_nil, :integer, default: true
     config_param :watch, :bool, default: true
     config_param :apiVersion, :string, default: 'v1'
     config_param :client_cert, :string, default: nil
@@ -192,13 +193,13 @@ module Fluent::Plugin
       end
 
       # Caches pod/namespace UID tuples for a given container UID.
-      @id_cache = LruRedux::TTL::ThreadSafeCache.new(@cache_size, @cache_ttl)
+      @id_cache = LruRedux::TTL::ThreadSafeCache.new(@cache_size, @cache_ttl, @ignore_nil)
 
       # Use the container UID as the key to fetch a hash containing pod metadata
-      @cache = LruRedux::TTL::ThreadSafeCache.new(@cache_size, @cache_ttl)
+      @cache = LruRedux::TTL::ThreadSafeCache.new(@cache_size, @cache_ttl, @ignore_nil)
 
       # Use the namespace UID as the key to fetch a hash containing namespace metadata
-      @namespace_cache = LruRedux::TTL::ThreadSafeCache.new(@cache_size, @cache_ttl)
+      @namespace_cache = LruRedux::TTL::ThreadSafeCache.new(@cache_size, @cache_ttl, @ignore_nil)
 
       @tag_to_kubernetes_name_regexp_compiled = Regexp.compile(@tag_to_kubernetes_name_regexp)
 

data/lib/fluent/plugin/kubernetes_metadata_stats.rb

@@ -22,7 +22,7 @@ require 'lru_redux'
 module KubernetesMetadata
   class Stats
     def initialize
-      @stats = ::LruRedux::TTL::ThreadSafeCache.new(1000, 3600)
+      @stats = ::LruRedux::TTL::ThreadSafeCache.new(1000, 3600, true)
     end
 
     def bump(key)

data/test/plugin/test_cache_strategy.rb

@@ -25,9 +25,9 @@ class TestCacheStrategy
 
   def initialize
     @stats = KubernetesMetadata::Stats.new
-    @cache = LruRedux::TTL::ThreadSafeCache.new(100, 3600)
-    @id_cache = LruRedux::TTL::ThreadSafeCache.new(100, 3600)
-    @namespace_cache = LruRedux::TTL::ThreadSafeCache.new(100, 3600)
+    @cache = LruRedux::TTL::ThreadSafeCache.new(100, 3600, true)
+    @id_cache = LruRedux::TTL::ThreadSafeCache.new(100, 3600, true)
+    @namespace_cache = LruRedux::TTL::ThreadSafeCache.new(100, 3600, true)
     @orphaned_namespace_name = '.orphaned'
     @orphaned_namespace_id = 'orphaned'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - OpenShift Cluster Logging
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-06 00:00:00.000000000 Z
+date: 2025-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -52,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: lru_redux
+  name: sin_lru_redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -291,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Fluentd filter plugin to add Kubernetes metadata