fluent-plugin-chef-api 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed4b1268fb766c789707679046d7c45746ac1bb
-  data.tar.gz: 44adaddfdd08695e39c37d71252d2b8fc74b933b
+  metadata.gz: 15ef7ceb2205ce2e0669ab45ebcd0271db42d9d7
+  data.tar.gz: 392ab1da22f56d0b2b5b49928568a1ce3b997490
 SHA512:
-  metadata.gz: 45fc580243661f065579a4f5219d33425d7fd65f0a714d6c6fd3ffc37757607399282fb02c7d2616aebbb042e6f1fa191db5f60dfb13006bbe169e9556ecd8a5
-  data.tar.gz: f5dc3eefeba8682923021d46569ba589bcd4ead00d0687da3ab2c12ae6af85fb6bafcc55047d01a5652cd705af5180983cdd1dd1eea911e33bdfafcdf09749df
+  metadata.gz: a2a389686b0cca8d1d393cf17969607b07247d9a2c6de76d8252a803b2c588eeaf59fdaf34057627a6a27e6abf7baf527e1bdec1ce77dd2d992c6d615f221f70
+  data.tar.gz: f3fa4382f1fd36c2ca39c596eee76ee45032791d63fdc8759a3c6d84af88230c4652e4575f9d797b7a1a8505665570e8e26302b1fafc3e9e054173178bd5b1f9

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.swo
+*.swp

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

data/lib/fluent/plugin/in_chef_api.rb

@@ -11,7 +11,8 @@ module Fluent
     config_param :node_name, :string, :default => nil
     config_param :tag, :string, :default => "chef_api"
     config_param :chef_environment, :string, :default => nil
-    config_param :default_values, :hash, :default => nil
+    config_param :default_values, :hash, :default => {}
+    config_param :monitor_multi, :bool, :default => true
 
     def initialize
       super
@@ -84,7 +85,11 @@ module Fluent
           sleep(1)
         else
           begin
-            run_once(connection)
+            if @monitor_multi
+              run_once(connection)
+            else
+              run_once_single(connnection)
+            end
           rescue => error
             $log.warn("failed to fetch metrics: #{error.class}: #{error.message}")
             next
@@ -95,12 +100,14 @@ module Fluent
       end
     end
 
+    def run_once_single(connection)
+      data = @default_values.dup
+      node = connection.nodes.fetch(@node_name)
+      emit_node_metrics(node, data)
+    end
+
     def run_once(connection)
-      if @default_values
-        data = @default_values.dup
-      else
-        data = {}
-      end
+      data = @default_values.dup
       if @chef_environment
         nodes = connection.environments.fetch(@chef_environment).nodes
       else
@@ -117,16 +124,20 @@ module Fluent
         $log.warn("failed to shuffle nodes: #{error.class}: #{error.message}")
       end
       nodes.each do |node|
-        begin
-          Engine.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}))
-          end
-        rescue => error
-          $log.warn("failed to fetch metrics from node: #{node.name}: #{error.class}: #{error.message}")
+        emit_node_metrics(node, data)
+      end
+    end
+
+    def emit_node_metrics(node, data)
+      begin
+        Engine.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}))
         end
+      rescue => error
+        $log.warn("failed to fetch metrics from node: #{node.name}: #{error.class}: #{error.message}")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-chef-api
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A fluentd plugin for Chef's API