fluent-plugin-munin 0.0.1 → 0.1.1

data/Gemfile

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in fluent-plugin-twitter.gemspec
+# Specify your gem's dependencies in fluent-plugin-munin.gemspec
 gemspec
 gem "munin-ruby"

data/README.md

@@ -2,7 +2,7 @@ fluent-plugin-munin
 ===================
 
 ## Component
-Fluentd Input plugin. fetch munin-node metrics data with custom intervals.
+Fluentd Input plugin to fetch munin-node metrics data with custom intervals.
 
 ## Installation
 
@@ -23,12 +23,12 @@ gem install fluent-plugin-munin
 `````
 <source>
   type            munin
-  server          localhost
-  port            4949
-  interval        10
-  tag_prefix      input.munin
-  service         cpu,df
-  record_hostname yes
+  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)
 </source>
 
 <match input.munin.*>

data/fluent-plugin-munin.gemspec

@@ -3,11 +3,11 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-munin"
-  s.version     = "0.0.1"
+  s.version     = "0.1.1"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-munin"
-  s.summary     = %q{Fluentd Input plugin. fetch munin-node metrics data with custom intervals.}
+  s.summary     = %q{Fluentd Input plugin to fetch munin-node metrics data with custom intervals.}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/fluent/plugin/in_munin.rb

@@ -1,23 +1,25 @@
 module Fluent
   class MuninInput < Fluent::Input
     Plugin.register_input('munin', self)
-    require 'munin-ruby'
+
     def initialize
+      require 'munin-ruby'
       super
     end
 
     config_param :host, :string, :default => 'localhost'
     config_param :port, :integer, :default => 4949
-    config_param :interval, :integer, :default => 1
+    config_param :interval, :string, :default => '1m'
     config_param :tag_prefix, :string
-    config_param :service, :string, :default => nil
+    config_param :service, :string, :default => 'all'
     config_param :record_hostname, :string, :default => nil
 
     def configure(conf)
       super
       service_list = get_service_list
       $log.info "munin-node provides #{service_list.inspect}"
-      @services = @service.nil? ? service_list : @service.split(',')
+      @interval = Config.time_value(@interval)
+      @services = @service == 'all' ? service_list : @service.split(',')
       @record_hostname = @record_hostname || false
       @hostname = `hostname`.chomp
     end
@@ -28,7 +30,8 @@ module Fluent
 
     def shutdown
       disconnect
-      @thread.join
+      @munin.disconnect(false)
+      Thread.kill(@thread)
     end
 
     def run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-munin
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &21592420 !ruby/object:Gem::Requirement
+  requirement: &8370700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21592420
+  version_requirements: *8370700
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &21591140 !ruby/object:Gem::Requirement
+  requirement: &8369440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21591140
+  version_requirements: *8369440
 description: 
 email:
 - y.ken.studio@gmail.com
@@ -72,7 +72,7 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Fluentd Input plugin. fetch munin-node metrics data with custom intervals.
+summary: Fluentd Input plugin to fetch munin-node metrics data with custom intervals.
 test_files:
 - test/helper.rb
 - test/plugin/test_in_munin.rb