fluent-plugin-chef-api 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5325782f5a23cb6584cbdeb9a6ab7faa65620917
-  data.tar.gz: 9428717dc18abf198a3a4827dfc08bdb7b6c5e8d
+  metadata.gz: d9e66bb1109a731eaf573839fd6e9a147efc4b17
+  data.tar.gz: e80e0956ec0c2b644e46575820a8bd8711f5b667
 SHA512:
-  metadata.gz: 49eaaad8744e1ab70b9272cb2bb00e6ced26cc5eb5eaf0fbcf443b1258743d4593affee24c41112779fb5509a451e792e1037b1ab0a50f923d6c44ce767130c4
-  data.tar.gz: 562d55aa0a9887443e1610a2cac3b9c4c0137bab3e2392ab4cee68b9af61e92525327e82aa0e7db2a7f68fbcb2e672a61a2fc29aac0a427426de6417b59db2c5
+  metadata.gz: a6fdb5d1e87a4d81121a7b079f9a5b22cb9bc71d1e2168f5b82666e523b6db363e918377d43631abd8283b48c8addb4c4d789b20c24207e0cfc1b1b90e4ac920
+  data.tar.gz: 50adcd5cf697041470116c1a4ba8da169599c414b7062ab8dde411646681abe12a4c9e6df8c79182f8ea36a3658c5bd08a018607d25d3f0a11a51d3faa763cbb

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.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["Yamashita Yuu"]
   spec.email         = ["peek824545201@gmail.com"]
   spec.license       = "Apache-2.0"

data/lib/fluent/plugin/in_chef_api.rb

@@ -17,8 +17,52 @@ module Fluent
       require "chef-api"
     end
 
+    class ChefConfig
+      def self.load_file(file)
+        new(file).instance_eval { @config.dup }
+      end
+
+      def initialize(file)
+        @config = {}
+        instance_eval(::File.read(file))
+      end
+
+      def chef_server_url(value)
+        @config[:endpoint] = value
+      end
+
+      def node_name(value)
+        @config[:client] = value
+      end
+
+      def client_key(value)
+        @config[:key] = ::File.read(value)
+      end
+
+      def ssl_verify_mode(value)
+        @config[:ssl_verify] = value != :verify_none
+      end
+
+      def method_missing(*args)
+        # nop
+      end
+    end
+
     def configure(conf)
       super
+      @config = {}
+      if @config_file
+        @config = @config.merge(ChefConfig.load_file(@config_file))
+      end
+      if @chef_server_url
+        @config[:endpoint] = @chef_server_url
+      end
+      if @node_name
+        @config[:client] = value
+      end
+      if @client_key
+        @config[:key] = ::File.read(@client_key)
+      end
     end
 
     def start
@@ -32,11 +76,7 @@ module Fluent
     end
 
     def run
-      connection = ChefAPI::Connection.new(
-        :endpoint => @chef_server_url,
-        :client   => @node_name,
-        :key      => ::File.read(@client_key),
-      )
+      connection = ChefAPI::Connection.new(@config.dup)
       next_run = ::Time.new
       while @running
         if ::Time.new < next_run
@@ -66,7 +106,7 @@ module Fluent
       nodes.each do |node|
         begin
           Engine.emit("#{@tag}.run_list", Engine.now, data.merge({"value" => node.run_list.length, "node" => node.name}))
-          ohai_time = node.automatic.fetch("ohai_time")
+          ohai_time = node.automatic.fetch("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}))
         rescue => error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-chef-api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yamashita Yuu