fluent-plugin-kubernetes-objects 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cfb891f22b53744c43fc6c2e1518d84a6b9f777715b8e76cdf6203d060dfebb
-  data.tar.gz: 33e009c355bddf26ab670daf63891344edcba1e25cc449f482fd4021ff9537f9
+  metadata.gz: 0e1ae1f0a72c88ab818dced9eaf85683eb49a903536dc3fc3faa85b8bb400121
+  data.tar.gz: 0ed3d5f01ed05962ac6533af1d4c4ef63fcf281864f622bd88114536ff634047
 SHA512:
-  metadata.gz: 16d37fd0ff1778a2f02d60bb08fb45137fd18bacd4484add87df8d7d6fbda0a231225dcc443dc20d93df7ce6aee1bc03e22f08020260eb80af413959f693529d
-  data.tar.gz: 66ccb72b7b271c55d67e573fbb614a57e7c6a4fa1bc8755d2eb47d09af3e5481865219c3e8ee3a291416365f53d5d3341b4cc510f32f4418be8ae9915f7a0aab
+  metadata.gz: 24ae054a132bb0e3c24cd463bcc0687e9915c368160b5c49389d78dc2884b71dddb453b188551d0465fba0459b303965372ca7223e03ac942f4b9ea69bf56c96
+  data.tar.gz: 29f4a961ebcbbdd8def931c820976563a498992082f8b2630aa0604744aabc836b6ee8134db55341f37f25b964156e5da24a9dbe553fb1f60a3fe1efe6e66214

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-objects (1.0.0)
-      fluentd (~> 1.3)
+    fluent-plugin-kubernetes-objects (1.1.1)
+      fluentd (~> 1.4)
       kubeclient (~> 4.2)
 
 GEM
@@ -17,7 +17,7 @@ GEM
     docile (1.3.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    fluentd (1.3.3)
+    fluentd (1.4.1)
       cool.io (>= 1.4.5, < 2.0.0)
       dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
@@ -39,7 +39,7 @@ GEM
     http-form_data (2.1.1)
     http_parser.rb (0.6.0)
     json (2.1.0)
-    kubeclient (4.2.2)
+    kubeclient (4.3.0)
       http (~> 3.0)
       recursive-open-struct (~> 1.0, >= 1.0.4)
       rest-client (~> 2.0)
@@ -47,7 +47,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
     minitest (5.11.3)
-    msgpack (1.2.6)
+    msgpack (1.2.9)
     netrc (0.11.0)
     power_assert (1.1.3)
     public_suffix (3.0.3)
@@ -72,7 +72,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2018.9)
+    tzinfo-data (1.2019.1)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext

data/fluent-plugin-kubernetes-objects.gemspec

@@ -11,12 +11,12 @@ Gem::Specification.new do |spec|
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  #if spec.respond_to?(:metadata)
-  #  spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-  #else
-  #  raise 'RubyGems 2.0 or newer is required to protect against ' \
-  #    'public gem pushes.'
-  #end
+ # if spec.respond_to?(:metadata)
+ #   spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
+ # else
+ #   raise 'RubyGems 2.0 or newer is required to protect against ' \
+ #     'public gem pushes.'
+ # end
 
   spec.require_paths = ['lib']
   spec.test_files    = Dir.glob('test/**/**.rb')
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_runtime_dependency 'fluentd', '~> 1.3'
+  spec.add_runtime_dependency 'fluentd', '~> 1.4'
   spec.add_runtime_dependency 'kubeclient', '~> 4.2'
 
   spec.add_development_dependency 'bundler', '~> 2.0'

data/lib/fluent/plugin/in_kubernetes_objects.rb

@@ -5,7 +5,7 @@ require 'kubeclient'
 
 module Fluent::Plugin
   class KubernetesObjectsInput < Fluent::Plugin::Input
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
 
     Fluent::Plugin.register_input('kubernetes_objects', self)
 
@@ -72,6 +72,9 @@ module Fluent::Plugin
 
       desc 'A selector to restrict the list of returned objects by fields.'
       config_param :field_selector, :string, default: nil
+
+      desc 'The interval at which the objects will be watched.'
+      config_param :interval, :time, default: 15 * 60
     end
 
     config_section :storage do
@@ -140,7 +143,7 @@ module Fluent::Plugin
         if @bearer_token_file.nil? && File.exist?(secret_token_file)
           @bearer_token_file = secret_token_file
         end
-    end
+      end
 
       ssl_options = {
         client_cert: @client_cert && OpenSSL::X509::Certificate.new(File.read(@client_cert)),
@@ -174,10 +177,12 @@ module Fluent::Plugin
         o = o.to_h.dup
         o[:as] = :raw
         resource_name = o.delete(:resource_name)
+        watch_interval = o.delete(:interval)
+
         version = @storage.get(resource_name)
         o[:resource_version] = version if version
         @client.public_send("watch_#{resource_name}", o).tap do |watcher|
-          create_watcher_thread resource_name, watcher
+          create_watcher_thread resource_name, watcher, watch_interval
         end
       end
     end
@@ -209,7 +214,7 @@ module Fluent::Plugin
                         ->(item) { item['metadata'].update requestResourceVersion: resource_version }
                       else
                         ->(item) {}
-          end
+                      end
 
           # result['items'] might be nil due to https://github.com/kubernetes/kubernetes/issues/13096
           items = result['items'].to_a
@@ -222,14 +227,17 @@ module Fluent::Plugin
       end
     end
 
-    def create_watcher_thread(object_name, watcher)
+    def create_watcher_thread(object_name, watcher, interval)
       thread_create(:"watch_#{object_name}") do
         tag = generate_tag "#{object_name}.watch"
-        watcher.each do |entity|
-          log.trace { "Received new object from watching #{object_name}" }
-          entity = JSON.parse(entity)
-          router.emit tag, Fluent::Engine.now, entity
-          @storage.put object_name, entity['object']['metadata']['resourceVersion']
+        while thread_current_running?
+          watcher.each do |entity|
+            log.trace { "Received new object from watching #{object_name}" }
+            entity = JSON.parse(entity)
+            router.emit tag, Fluent::Engine.now, entity
+            @storage.put object_name, entity['object']['metadata']['resourceVersion']
+            sleep(interval)
+          end
         end
       end
     end

data/test/fluent/plugin/in_kubernetes_objects_test.rb

@@ -135,7 +135,7 @@ describe Fluent::Plugin::KubernetesObjectsInput do
         stub_k8s_events params: {resourceVersion: "123456"}
 
         d.run expect_emits: 1, timeout: 3
-            ensure
+      ensure
         f.unlink
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes-objects
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: kubeclient
   requirement: !ruby/object:Gem::Requirement