fluent-plugin-kubernetes_metadata_filter 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b4cdd88c2018db17f1f6c4f565c20f3cc3342f14507b2a5a10f9db7789cd8b9
-  data.tar.gz: 5a1ae4c194f575deb1820a3c32af0f33d942a35169aea258c69163d11a389ae8
+  metadata.gz: 58d897a095da0f86d4df33f0b5c58c82d85076803d6d0dbedc5de3a31d43d156
+  data.tar.gz: 462a281ecfee82ba19b551e42a0a7b5231588d8e0c822c7c1056520184ba1200
 SHA512:
-  metadata.gz: 4a5ae4a897eaa97475ba1d4e9326502eb1560097824f0e765790bdc20645a9385a606a19ef786112c08de3590fea11338c6a8d52a29a778fc68df6f65582ab35
-  data.tar.gz: 27bc0c9721ca5d1c0d3e498c758dbf839200efee3fb6ad55078c8caff1716d3b762a75f11dd222926a5384bb5367d8400197fc0ac76919af11daa272b0bf238f
+  metadata.gz: 895146267be4067440ecd5e0466f8b62c0d618aed2dcc2e1cb335035d99ec1f9b3f1e4b39cadc16e641206877ebd92b012bca7f82da941a06ca55c5c7615d842
+  data.tar.gz: fdd45eff7c2ba1c1aeca22fe524dbfc9d2d0f94509f7731d1f199c925213fc7e57ad6fd75c2578b794e2f6ef8e20016aa06ed13d6cd90583794ebb960811dfc6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes_metadata_filter (3.0.1)
+    fluent-plugin-kubernetes_metadata_filter (3.1.0)
       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.0)
+    fluentd (1.15.1)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
@@ -73,7 +73,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     minitest (4.7.5)
-    msgpack (1.5.3)
+    msgpack (1.5.4)
     multi_json (1.15.0)
     netrc (0.11.0)
     parallel (1.22.1)

data/README.md

@@ -60,6 +60,8 @@ when true (default: `true`)
 * `skip_namespace_metadata` - Skip the namespace_id field from the metadata. The fetch_namespace_metadata function will be skipped. The plugin will be faster and cpu consumption will be less.
 * `stats_interval` - The interval to display cache stats (default: 30s).  Set to 0 to disable stats collection and logging
 * `watch_retry_interval` - The time interval in seconds for retry backoffs when watch connections fail. (default: `10`)
+* `open_timeout` - The time in seconds to wait for a connection to kubernetes service. (default: `3`)
+* `read_timeout` - The time in seconds to wait for a read from kubernetes service. (default: `10`)
 
 
 Reading from a JSON formatted log files with `in_tail` and wildcard filenames while respecting the CRI-o log format with the same config you need the fluent-plugin "multi-format-parser":

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.0.1'
+  gem.version       = '3.1.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'

data/lib/fluent/plugin/filter_kubernetes_metadata.rb

@@ -50,6 +50,8 @@ module Fluent::Plugin
     config_param :client_key, :string, default: nil
     config_param :ca_file, :string, default: nil
     config_param :verify_ssl, :bool, default: true
+    config_param :open_timeout, :integer, default: 3
+    config_param :read_timeout, :integer, default: 10
 
     REGEX_VAR_LOG_PODS = '(var\.log\.pods)\.(?<namespace>[^_]+)_(?<pod_name>[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)_(?<pod_uuid>[a-z0-9-]*)\.(?<container_name>.+)\..*\.log$'
     REGEX_VAR_LOG_CONTAINERS = '(var\.log\.containers)\.(?<pod_name>[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)_(?<namespace>[^_]+)_(?<container_name>.+)-(?<docker_id>[a-z0-9]{64})\.log$'
@@ -299,6 +301,10 @@ module Fluent::Plugin
         @apiVersion,
         ssl_options: @ssl_options,
         auth_options: @auth_options,
+        timeouts: {
+          open: @open_timeout,
+          read: @read_timeout
+        },
         as: :parsed_symbolized
       )
     end

metadata

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