fluent-plugin-chef-api 0.5.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f0ec63562f649c34c1192372ba89e946190dd94d
-  data.tar.gz: 1791e941960d83e262b538ef9a5b1db4cff9506a
+SHA256:
+  metadata.gz: 070b7dc276e40de20ceabc4847664ee951932c6e23efdddc65c4a010605d30c6
+  data.tar.gz: 9bbf0481aef9a47ef2c16bf07cacdbd4220bf0822994f4ca780162b9ffc4103f
 SHA512:
-  metadata.gz: 78b43e19595dd67509942094d1e52af0c39815c25d979921968748f5722014154b085592fd25266dcd99884a706f76400ebb7fff8e77023ce7a8319f768838f8
-  data.tar.gz: e88d95406f913a9f4541fa4f31468fcb071a7beda38f4cd92c250641ed95b4a5f67bd74dd1b9134ad801de3529463fbd2e5828350cb79f7e46a1836c34cd6dad
+  metadata.gz: f97e4e02d5923acd6a6ad71d3345577205ebb6453db5240804c4a64f43e43bb5fdf01132b5caefaf711bdd8ee5a24dc754453870fa309d677a25663d5b3ab58f
+  data.tar.gz: b312778e66980c087a855aaa26ea93a388d9161ae8d424fbf5ce19df4271e3e6f050836485bcd7eb1f1dd125734f8e9e5c6077e22258c5040c2c953cf05662f1

data/fluent-plugin-chef-api.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-chef-api"
-  spec.version       = "0.5.1"
+  spec.version       = "1.0.0"
   spec.authors       = ["Yamashita Yuu"]
   spec.email         = ["peek824545201@gmail.com"]
   spec.license       = "Apache-2.0"
@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_dependency "fluentd"
+  spec.add_dependency "fluentd", ">= 1.0.0"
   spec.add_dependency "chef-api", "~> 0.5.0"
 end

data/lib/fluent/plugin/in_chef_api.rb

@@ -1,9 +1,12 @@
-#!/usr/bin/env ruby
+require 'fluent/plugin/input'
+require "chef-api"
 
-module Fluent
-  class ChefAPIInput < Input
+module Fluent::Plugin
+  class ChefAPIInput < Fluent::Plugin::Input
     Plugin.register_input("chef_api", self)
 
+    helpers :thread
+
     config_param :check_interval, :integer, :default => 60
     config_param :chef_server_url, :string, :default => nil
     config_param :client_key, :string, :default => nil
@@ -16,33 +19,32 @@ module Fluent
 
     def initialize
       super
-      require "chef-api"
     end
 
     class ChefConfig
       def self.load_file(file)
-        new(file).instance_eval { @config.dup }
+        new(file).instance_eval { @chef_config.dup }
       end
 
       def initialize(file)
-        @config = {}
+        @chef_config = {}
         instance_eval(::File.read(file))
       end
 
       def chef_server_url(value)
-        @config[:endpoint] = value
+        @chef_config[:endpoint] = value
       end
 
       def node_name(value)
-        @config[:client] = value
+        @chef_config[:client] = value
       end
 
       def client_key(value)
-        @config[:key] = ::File.read(value)
+        @chef_config[:key] = ::File.read(value)
       end
 
       def ssl_verify_mode(value)
-        @config[:ssl_verify] = value != :verify_none
+        @chef_config[:ssl_verify] = value != :verify_none
       end
 
       def method_missing(*args)
@@ -52,50 +54,35 @@ module Fluent
 
     def configure(conf)
       super
-      @config = {}
       if @config_file
-        @config = @config.merge(ChefConfig.load_file(@config_file))
+        @chef_config = ChefConfig.load_file(@config_file).to_hash
+      else
+        @chef_config = {}
       end
       if @chef_server_url
-        @config[:endpoint] = @chef_server_url
+        @chef_config[:endpoint] = @chef_server_url
       end
       if @node_name
-        @config[:client] = value
+        @chef_config[:client] = value
       end
       if @client_key
-        @config[:key] = ::File.read(@client_key)
+        @chef_config[:key] = ::File.read(@client_key)
       end
     end
 
     def start
-      @running = true
-      @thread = ::Thread.new(&method(:run))
-    end
-
-    def shutdown
-      @running = false
-      @thread.join
+      thread_create(:chef_api, &method(:run))
+      super
     end
 
     def run
-      connection = ChefAPI::Connection.new(@config.dup)
-      next_run = ::Time.new
-      while @running
-        if ::Time.new < next_run
-          sleep(1)
+      super
+      @connection = ChefAPI::Connection.new(@chef_config.dup)
+      timer_execute(:chef_api_input, @check_interval) do
+        if @monitor_multi
+          run_once(connection)
         else
-          begin
-            if @monitor_multi
-              run_once(connection)
-            else
-              run_once_single(connection)
-            end
-          rescue => error
-            $log.warn("failed to fetch metrics: #{error.class}: #{error.message}")
-            next
-          ensure
-            next_run = ::Time.new + @check_interval
-          end
+          run_once_single(connection)
         end
       end
     end
@@ -114,7 +101,7 @@ module Fluent
       else
         nodes = connection.nodes
       end
-      Engine.emit("#{@tag}.nodes", Engine.now, data.merge({"value" => nodes.count}))
+      router.emit("#{@tag}.nodes", Engine.now, data.merge({"value" => nodes.count}))
       begin
         nodes.instance_eval do
           if Hash === @collection
@@ -122,7 +109,7 @@ module Fluent
           end
         end
       rescue => error
-        $log.warn("failed to shuffle nodes: #{error.class}: #{error.message}")
+        log.warn("failed to shuffle nodes", error: error)
       end
       nodes.each do |node|
         emit_node_metrics(node, data)
@@ -131,14 +118,14 @@ module Fluent
 
     def emit_node_metrics(node, data)
       begin
-        Engine.emit("#{@tag}.run_list", Engine.now, data.merge({"value" => node.run_list.length, "node" => node.name}))
+        router.emit("#{@tag}.run_list", Engine.now, data.merge({"value" => node.run_list.length, "node" => node.name}))
         if node.automatic["ohai_time"]
           ohai_time = node.automatic["ohai_time"].to_i
-          Engine.emit("#{@tag}.ohai_time", Engine.now, data.merge({"value" => ohai_time, "node" => node.name}))
-          Engine.emit("#{@tag}.behind_seconds", Engine.now, data.merge({"value" => Time.new.to_i - ohai_time, "node" => node.name}))
+          router.emit("#{@tag}.ohai_time", Engine.now, data.merge({"value" => ohai_time, "node" => node.name}))
+          router.emit("#{@tag}.behind_seconds", Engine.now, data.merge({"value" => Time.new.to_i - ohai_time, "node" => node.name}))
         end
       rescue => error
-        $log.warn("failed to fetch metrics from node: #{node.name}: #{error.class}: #{error.message}")
+        log.warn("failed to fetch metrics from node: #{node.name}", error: error)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-chef-api
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: chef-api
   requirement: !ruby/object:Gem::Requirement
@@ -99,8 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A fluentd plugin for Chef's API