fluent-plugin-munin 0.2.2 → 0.3.1

data/README.md

@@ -30,10 +30,12 @@ gem install fluent-plugin-munin
   # specify munin plugin names by comma separated values.
   service         cpu          # Optional (not specify, fetch all enabled munin metrics)
   # inserting hostname into record.
-  record_hostname yes          # Optional (yes/no)
-  # multi row results to be nested or separated record.
-  nest_result     no           # Optional (yes/no)
-  nest_keyname    data         # Optional (default: result) 
+  record_hostname yes          # Optional (default: no)
+  # converting values type from string to number.
+  convert_type    yes          # Optional (default: no)
+  # metrics datasets to be nested or separated record.
+  nest_result     no           # Optional (default: no)
+  nest_key        data         # Optional (default: result) 
 </source>
 
 <match input.munin.*>
@@ -52,16 +54,21 @@ record_hostname: yes, nest_result: no
 input.munin.cpu: {"hostname":"myhost.example.com","service":"cpu","user":"113183","nice":"340","system":"26584","idle":"74205345","iowait":"26134","irq":"1","softirq":"506","steal":"0","guest":"0"}
 `````
 
-record_hostname: yes, nest_result: yes
+record_hostname: yes, nest_result: no, convert_type: yes #RECOMMEND
+`````
+input.munin.cpu: {"hostname":"myhost.example.com","service":"cpu","user":113183,"nice":340,"system":26584,"idle":74205345,"iowait":26134,"irq":1,"softirq":506,"steal":0,"guest":0}
+`````
+
+record_hostname: yes, nest_result: yes, nest_key: data
 `````
 input.munin.cpu: {"hostname":"myhost.example.com","service":"cpu","data":{"user":"113183","nice":"340","system":"26584","idle":"74205345","iowait":"26134","irq":"1","softirq":"506","steal":"0","guest":"0"}}
 `````
 
 ### MongoDB find example
-record_hostname: yes, nest_result: yes
+record_hostname: yes, nest_result: yes, convert_type: yes
 `````
 > use munin
-> db.cpu.find({ "data.iowait" : { $gt : "200000" } })
+> db.cpu.find({ "data.iowait" : { $gt : 200000 } })
 `````
 
 ## TODO

data/fluent-plugin-munin.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-munin"
-  s.version     = "0.2.2"
+  s.version     = "0.3.1"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-munin"

data/lib/fluent/plugin/in_munin.rb

@@ -14,6 +14,7 @@ module Fluent
     config_param :service, :string, :default => 'all'
     config_param :nest_result, :string, :default => nil
     config_param :nest_key, :string, :default => 'result'
+    config_param :convert_type, :string, :default => 'no'
     config_param :record_hostname, :string, :default => nil
 
     def configure(conf)
@@ -22,8 +23,9 @@ module Fluent
       @interval = Config.time_value(@interval)
       service_list = get_service_list
       @services = @service == 'all' ? service_list : @service.split(',')
-      @record_hostname = Config.bool_value(@record_hostname) || false
       @nest_result = Config.bool_value(@nest_result) || false
+      @convert_type = Config.bool_value(@convert_type) || false
+      @record_hostname = Config.bool_value(@record_hostname) || false
       $log.info "munin-node connected: #{@hostname} #{service_list}"
       $log.info "following munin-node service: #{@service}"
     end
@@ -90,11 +92,26 @@ module Fluent
       @munin ||= get_connection
       begin
         values = @munin.fetch(key)
+        return convert_type(values[key]) if @convert_type
         return values[key]
       rescue Munin::ConnectionError
         @munin = get_connection
         retry
       end
     end
+
+    def convert_type(ary)
+      data = Hash.new
+      ary.each do |key,value|
+        if value == value.to_f.to_s
+          data.store(key, value.to_f)
+        elsif value == value.to_i.to_s
+          data.store(key, value.to_i)
+        else
+          data.store(key, value)
+        end
+      end
+      return data
+    end
   end
 end

data/test/plugin/test_in_munin.rb

@@ -10,7 +10,8 @@ class MuninInputTest < Test::Unit::TestCase
     port                   4949
     interval               30
     tag_prefix             input.munin
-    record_hostname yes
+    record_hostname        yes
+    convert_type           no
   ]
 
   def create_driver(conf=CONFIG,tag='test')
@@ -26,9 +27,10 @@ class MuninInputTest < Test::Unit::TestCase
       port                   4949
       interval               30
       tag_prefix             input.munin
-      record_hostname yes
+      record_hostname        yes
+      convert_type           no
     ]
-    d.instance.inspect
+    p d.instance.inspect
     assert_equal 'localhost', d.instance.host
     assert_equal 4949, d.instance.port
     assert_equal 30, d.instance.interval

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-munin
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &12769240 !ruby/object:Gem::Requirement
+  requirement: &15089900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12769240
+  version_requirements: *15089900
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &12767660 !ruby/object:Gem::Requirement
+  requirement: &15089460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12767660
+  version_requirements: *15089460
 - !ruby/object:Gem::Dependency
   name: munin-ruby
-  requirement: &12766880 !ruby/object:Gem::Requirement
+  requirement: &15089040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12766880
+  version_requirements: *15089040
 description: 
 email:
 - y.ken.studio@gmail.com