fluent-plugin-munin 0.1.3 → 0.2.2

data/README.md

@@ -23,12 +23,17 @@ gem install fluent-plugin-munin
 `````
 <source>
   type            munin
-  server          localhost     # Optional (default: localhost)
-  port            4949          # Optional (default: 4949)
-  interval        10s           # Optional (default: 1m)
-  tag_prefix      input.munin   # Required
-  service         cpu,df        # Optional (not specify, fetch all enabled munin metrics)
-  record_hostname yes           # Optional (yes/no)
+  host            localhost    # Optional (default: localhost)
+  port            4949         # Optional (default: 4949)
+  interval        10s          # Optional (default: 1m)
+  tag_prefix      input.munin  # Required
+  # 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) 
 </source>
 
 <match input.munin.*>
@@ -37,10 +42,28 @@ gem install fluent-plugin-munin
 `````
 
 ### Output Sample
+record_hostname: no, nest_result: no
+`````
+input.munin.cpu: {"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: 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
+`````
+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
+`````
+> use munin
+> db.cpu.find({ "data.iowait" : { $gt : "200000" } })
+`````
+
 ## TODO
 patches welcome!
 

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.1.3"
+  s.version     = "0.2.2"
   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

@@ -12,16 +12,20 @@ module Fluent
     config_param :interval, :string, :default => '1m'
     config_param :tag_prefix, :string
     config_param :service, :string, :default => 'all'
+    config_param :nest_result, :string, :default => nil
+    config_param :nest_key, :string, :default => 'result'
     config_param :record_hostname, :string, :default => nil
 
     def configure(conf)
       super
       @hostname = get_munin_hostname
-      service_list = get_service_list
-      $log.info "munin-node #{@hostname} provides #{service_list}"
       @interval = Config.time_value(@interval)
+      service_list = get_service_list
       @services = @service == 'all' ? service_list : @service.split(',')
-      @record_hostname = @record_hostname || false
+      @record_hostname = Config.bool_value(@record_hostname) || false
+      @nest_result = Config.bool_value(@nest_result) || false
+      $log.info "munin-node connected: #{@hostname} #{service_list}"
+      $log.info "following munin-node service: #{@service}"
     end
 
     def start
@@ -41,7 +45,11 @@ module Fluent
           record = Hash.new
           record.store('hostname', @hostname) if @record_hostname
           record.store('service', key)
-          record.merge!(fetch(key).to_hash)
+          if (@nest_result)
+            record.store(@nest_key, fetch(key))
+          else
+            record.merge!(fetch(key).to_hash)
+          end
           Engine.emit(tag, Engine.now, record)
         end
         disconnect

data/test/plugin/test_in_munin.rb

@@ -33,7 +33,7 @@ class MuninInputTest < Test::Unit::TestCase
     assert_equal 4949, d.instance.port
     assert_equal 30, d.instance.interval
     assert_equal 'input.munin', d.instance.tag_prefix
-    assert_equal 'yes', d.instance.record_hostname
+    assert_equal true, d.instance.record_hostname
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-munin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &9216120 !ruby/object:Gem::Requirement
+  requirement: &12769240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9216120
+  version_requirements: *12769240
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &9214620 !ruby/object:Gem::Requirement
+  requirement: &12767660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9214620
+  version_requirements: *12767660
 - !ruby/object:Gem::Dependency
   name: munin-ruby
-  requirement: &9213740 !ruby/object:Gem::Requirement
+  requirement: &12766880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9213740
+  version_requirements: *12766880
 description: 
 email:
 - y.ken.studio@gmail.com