fluent-plugin-chef-client 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c88513a6f0f6fc5ce4aa8be22caf3e3bec0fb8b2
-  data.tar.gz: ab028022a87e013d5d146c2c2cb3ed4e73568f2a
+  metadata.gz: b44feefe34583e151300f0d32fdab9497a4045d6
+  data.tar.gz: ee6716e89069236cad8247e5773b64d029bd76d2
 SHA512:
-  metadata.gz: d7870177e02730ecabdcb25330e289975f7a2641049af3aa210145432910064b559524df4064c31eaa0d6863227459be7631a4ee35eb942b29ba71fbc5af4745
-  data.tar.gz: cc7807486939dd23caffe9d0a7401077ec02326fbbe1e31e1ba435510bfd77ee2e9fef16cf8aba9382d86267d05d211a54845dd3db7db1a18348e8d7008c5d1c
+  metadata.gz: 2373341c44f5691b96785427e7561470e4b3e189d41f7a7bb0153e4d6b1bddc9ace82f564fa751ac4d832d2e69d34f0ae75dc456bd8f7bcf05e38577b2426ca8
+  data.tar.gz: 6ae13da60366d46b673879c584d9952dfedd81cb4fca2f3bd456cd9c2c85279faa46dcc0e824e9bd4a418e4774928f451832b0314ba1ff9f676a15507d85d6b6

data/fluent-plugin-chef-client.gemspec

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

data/lib/fluent/plugin/in_chef_client.rb

@@ -1,3 +1,16 @@
+if __FILE__ == $0
+  module Fluent
+    class Input
+      def self.config_param(name, *args, &block)
+      end
+    end
+    class Plugin
+      def self.register_input(type, klass)
+      end
+    end
+  end
+end
+
 module Fluent
   class ChefClientInput < Input
     Plugin.register_input("chef_client", self)
@@ -5,26 +18,29 @@ module Fluent
     config_param :check_interval, :integer, :default => 60
     config_param :chef_server_url, :string, :default => nil
     config_param :client_key, :string, :default => nil
-    config_param :config_file, :string, :default => "/etc/chef/config.rb"
+    config_param :config_file, :string, :default => "/etc/chef/client.rb"
     config_param :node_name, :string, :default => nil
     config_param :tag_prefix, :string, :default => "chef_client"
 
     def initialize
       super
-      require "chef"
+      require "json"
+      require "rbconfig"
     end
 
     def configure(conf)
       super
-      ::Chef::Config.from_file(@config_file)
-      if @chef_server_url
-        ::Chef::Config[:chef_server_url] = @chef_server_url
-      end
-      if @client_key
-        ::Chef::Config[:client_key] = @client_key
-      end
-      if @node_name
-        ::Chef::Config[:node_name] = @node_name
+      @chef_config = {
+        :config_file     => @config_file,
+        :chef_server_url => @chef_server_url,
+        :client_key      => @client_key,
+        :node_name       => @node_name,
+      }
+      ruby = ::File.join(::RbConfig::CONFIG["bindir"], ::RbConfig::CONFIG["ruby_install_name"])
+      if ::File.executable?(ruby)
+        @ruby = ruby
+      else
+        @ruby = "ruby"
       end
     end
 
@@ -39,7 +55,6 @@ module Fluent
     end
 
     def run
-      node_name = ::Chef::Config[:node_name]
       next_run = ::Time.new
       while @running
         if ::Time.new < next_run
@@ -47,11 +62,26 @@ module Fluent
         else
           begin
             now = Engine.now
-            node = ::Chef::Node.load(node_name)
-            ohai_time = node["ohai_time"]
-            Engine.emit("#{@tag_prefix}.behind_from", now, {"value" => ohai_time ? (now - ohai_time) : -1})
+            data = nil
+            $log.debug("invoking process: #{@ruby} #{__FILE__}")
+            ::IO.popen([@ruby, __FILE__], "r+") do |io|
+              io.write(::JSON.dump(@chef_config))
+              io.close_write
+              data = ::JSON.load(io.read)
+            end
+            $log.debug("#{File.basename(__FILE__).dump} exits as #{$?.exitstatus}")
+            if $?.exitstatus == 0
+              data.each do |key, val|
+                Engine.emit("#{@tag_prefix}.#{key}", now, {"value" => val})
+              end
+              if ::Numeric === data["ohai_time"]
+                Engine.emit("#{@tag_prefix}.behind_seconds", now, {"value" => now - data["ohai_time"]})
+              end
+            else
+              raise("invalid response from #{__FILE__.dump}")
+            end
           rescue => error
-            $log.warn("failed to load attributes of node \`#{node_name.inspect}': #{error.inspect}")
+            $log.warn("failed to load attributes: #{error.inspect}")
             next
           ensure
             next_run = ::Time.new + @check_interval
@@ -59,5 +89,36 @@ module Fluent
         end
       end
     end
+
+    def run_once
+      require "chef"
+      if @config_file
+        ::Chef::Config.from_file(@config_file)
+      end
+      if @chef_server_url
+        ::Chef::Config[:chef_server_url] = @chef_server_url
+      end
+      if @client_key
+        ::Chef::Config[:client_key] = @client_key
+      end
+      if @node_name
+        ::Chef::Config[:node_name] = @node_name
+      end
+      node_name = ::Chef::Config[:node_name]
+      node = ::Chef::Node.load(node_name)
+      data = ::Hash[["ohai_time", "idletime_seconds", "uptime_seconds"].map { |attr| [attr, node[attr]] }]
+      STDOUT.puts(::JSON.dump(data))
+    end
+  end
+end
+
+if __FILE__ == $0
+  input = Fluent::ChefClientInput.new
+  data = JSON.load(STDIN.read)
+  if Hash === data
+    data.each do |key, val|
+      input.instance_variable_set(:"@#{key}", val)
+    end
   end
+  input.run_once
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-chef-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,30 +42,44 @@ dependencies:
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 11.18.0
+        version: 12.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 11.18.0
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.55
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.55
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ohai
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
 description: a fluent plugin for chef-client.
 email:
 - peek824545201@gmail.com