fluent-plugin-kubernetes_metadata_input 0.21.10 → 0.21.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c929d1f5e10c24fdbecab39dea26e74e09b8056
-  data.tar.gz: 65ac83ca49083f4403aac1dcc4723ae8458fc3ed
+  metadata.gz: aa68b22868ff7bec361653d09a4575111cbc8bc8
+  data.tar.gz: 96682bf8aaf5524485838e4673558019b426dedd
 SHA512:
-  metadata.gz: c2796957b65e23a91a8b14d64cf216fc5b62087c726198af23e42c4a250f3596ee1313a979d4c370add6b1ca5e88017910dd53e39a4c4cde7fbb06e9b28730ce
-  data.tar.gz: 28e611357ccd31ad95bf656b304c0d41a9cf9e68ab574eb73124e4ed6cf94e01891718672edf231d0c81110525fda0f03e88c50874238007a3fb1117418b27b2
+  metadata.gz: 7c415e7e0eb4774c0e09ab52d1688161bb2c93dd9cb2c7e5670afa0dd12ff226acc5f3f7dd470ae510321f7eed4b7878a7e99988a5f4456434319402339addf2
+  data.tar.gz: 22c9c535ddcf34b9f380151868521dac10de44073b1ae0f333ea933130a9d8819a23145fd5aa75d4b06c7fbd9e10303fafdb7b2769e2c28d847538e149b4d59a

data/fluent-plugin-kubernetes_metadata_input.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_input"
-  gem.version       = "0.21.10"
+  gem.version       = "0.21.11"
   gem.authors       = ["Anton Sherkhonov"]
   gem.email         = ["sherkhonov@gmail.com"]
   gem.description   = %q{Input plugin to collect Kubernetes metadata}

data/lib/fluent/plugin/in_kubernetes_metadata.rb

@@ -93,6 +93,9 @@ module Fluent
           @bearer_token_file = pod_token
         end
       end
+
+      @get_res_string = "get_#{@resource.downcase}"
+      log.trace "resource get method is #{@get_res_string}"
     end
 
     def start
@@ -101,6 +104,7 @@ module Fluent
 
       @thread = Thread.new(&method(:watch_resource))
       @thread.abort_on_exception = true
+      log.trace "Exited the watcher thread"
 
     end
 
@@ -140,25 +144,26 @@ module Fluent
     end
 
     def watch_resource
-      begin
-        resource_version = @client.get_entities(@resource).resourceVersion
-        watcher          = @client.watch_entities(@resource, options = {resource_version: resource_version})
-      rescue Exception => e
-        raise Fluent::ConfigError, "Exception encountered fetching metadata from Kubernetes API endpoint: #{e.message}"
-      end
+      loop do
+        begin
+          resource_version = @client.send(@get_res_string).resourceVersion
+          watcher          = @client.watch_entities(@resource, options = {resource_version: resource_version})
+        rescue Exception => e
+          raise Fluent::ConfigError, "Exception encountered fetching metadata from Kubernetes API endpoint: #{e.message}"
+        end
 
 
-      begin
-        watcher.each do |notice|
-          time = Engine.now
-          emit_event(notice.object, time, notice.type)
+        begin
+          watcher.each do |notice|
+            time = Engine.now
+            emit_event(notice.object, time, notice.type)
+          end
+          log.trace "Exited resource watcher"
+        rescue
+          log.error "Unexpected error in resource watcher", :error=>$!.to_s
+          log.error_backtrace
         end
-        log.trace "Exited resource watcher"
-      rescue
-        log.error "Unexpected error in resource watcher", :error=>$!.to_s
-        log.error_backtrace
       end
-
     end
 
     def emit_event(event_obj, time, type)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_input
 version: !ruby/object:Gem::Version
-  version: 0.21.10
+  version: 0.21.11
 platform: ruby
 authors:
 - Anton Sherkhonov