fluentd 0.10.32 → 0.10.33

data/.gitignore

@@ -0,0 +1,20 @@
+Gemfile.lock
+INSTALL
+NEWS
+Makefile
+Makefile.in
+README
+ac
+aclocal.m4
+autom4te.cache
+confdefs.h
+config.log
+config.status
+configure
+deps/
+fluent-cat
+fluent-gem
+fluentd
+pkg/*
+test/tmp/*
+make_dist.sh

data/.rvmrc

@@ -0,0 +1 @@
+rvm 1.9.3

data/ChangeLog

@@ -1,4 +1,17 @@
 
+Release 0.10.33 - 2013/03/28
+
+* add in_monitor_agent
+* switched from jeweler to bundler
+* updated dependency for msgpack from '~> 0.4.4' to '~> 0.4.4 OR ~> 0.5.4'
+* dded PluginId module so that in_monitor_agent can search plugins by id
+* BufferedOutput: added queued_chunk_flush_interval option to insert delay
+time before flushing queued chunks
+* BufferedOutput: randomize retry interval to prevent multiple servers from
+bursting network traffic at the same time
+* Configurable: sets @config instance variable
+
+
 Release 0.10.32 - 2013/03/04
 
 * in_tail: fixed the nil error problem which occurs with pos_file option

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org/'
+
+gemspec

data/Rakefile

@@ -1,52 +1,9 @@
-require 'rake'
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+
 require 'rake/testtask'
 require 'rake/clean'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "fluentd"
-    gemspec.summary = "Fluent event collector"
-    gemspec.author = "Sadayuki Furuhashi"
-    gemspec.email = "frsyuki@gmail.com"
-    gemspec.homepage = "http://fluentd.org/"
-    gemspec.has_rdoc = false
-    gemspec.require_paths = ["lib"]
-    gemspec.add_dependency "msgpack", "~> 0.4.4"
-    gemspec.add_dependency "json", ">= 1.4.3"
-    gemspec.add_dependency "yajl-ruby", "~> 1.0"
-    gemspec.add_dependency "cool.io", "~> 1.1.0"
-    gemspec.add_dependency "http_parser.rb", "~> 0.5.1"
-    gemspec.add_development_dependency "rake", ">= 0.9.2"
-    gemspec.add_development_dependency "rr", ">= 1.0.0"
-    gemspec.add_development_dependency "timecop", ">= 0.3.0"
-    gemspec.add_development_dependency "jeweler", ">= 1.0.0"
-    gemspec.test_files = Dir["test/**/*.rb"]
-    gemspec.files = Dir["bin/**/*", "lib/**/*", "test/**/*.rb"] +
-      %w[fluent.conf VERSION AUTHORS Rakefile COPYING fluentd.gemspec Gemfile]
-    gemspec.executables = ['fluentd', 'fluent-cat', 'fluent-gem', 'fluent-debug']
-    gemspec.required_ruby_version = '>= 1.9.2'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
-
-VERSION_FILE = "lib/fluent/version.rb"
-
-file VERSION_FILE => ["VERSION"] do |t|
-  version = File.read("VERSION").strip
-  File.open(VERSION_FILE, "w") {|f|
-    f.write <<EOF
-module Fluent
-
-VERSION = '#{version}'
-
-end
-EOF
-  }
-end
-
 task :test => [:base_test]
 
 Rake::TestTask.new(:base_test) do |t|
@@ -56,15 +13,4 @@ Rake::TestTask.new(:base_test) do |t|
   #t.warning = true
 end
 
-# workaround for fluentd >= 0 dependency
-task :mv_gemfile do
-  File.rename "Gemfile", "Gemfile.bak" rescue nil
-end
-
-# workaround for fluentd >= 0 dependency
-task :revert_gemfile do
-  File.rename "Gemfile.bak", "Gemfile" rescue nil
-end
-
-task :default => [VERSION_FILE, :mv_gemfile, :build, :revert_gemfile]
-
+task :default => [:test, :build]

data/fluent.conf

@@ -26,6 +26,15 @@
 #  tag apache.access
 #</source>
 
+# Listen HTTP for monitoring
+# http://localhost:24220/api/plugins
+# http://localhost:24220/api/plugins?type=TYPE
+# http://localhost:24220/api/plugins?tag=MYTAG
+<source>
+  type monitor_agent
+  port 24220
+</source>
+
 # Listen DRb for debug
 <source>
   type debug_agent
@@ -44,14 +53,14 @@
   type stdout
 </match>
 
-## match tag=system.** and forward to another fluent server
-#<match system.**>
-#  type forward
-#  host 192.168.0.11
-#  <secondary>
-#    host 192.168.0.12
-#  </secondary>
-#</match>
+# match tag=system.** and forward to another fluent server
+<match system.**>
+  type forward
+  host 192.168.0.11
+  <secondary>
+    host 192.168.0.12
+  </secondary>
+</match>
 
 ## match tag=myapp.** and forward and write to file
 #<match myapp.**>

data/fluentd.gemspec

@@ -1,160 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/fluent/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = "fluentd"
-  s.version = "0.10.14"
+Gem::Specification.new do |gem|
+  gem.name          = "fluentd"
+  gem.version       = Fluent::VERSION # see lib/fluent/version.rb
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Sadayuki Furuhashi"]
-  s.date = "2012-03-07"
-  s.email = "frsyuki@gmail.com"
-  s.executables = ["fluentd", "fluent-cat", "fluent-gem"]
-  s.extra_rdoc_files = [
-    "ChangeLog",
-    "README",
-    "README.rdoc"
-  ]
-  s.files = [
-    "AUTHORS",
-    "COPYING",
-    "Gemfile",
-    "Rakefile",
-    "VERSION",
-    "bin/fluent-cat",
-    "bin/fluent-gem",
-    "bin/fluentd",
-    "fluent.conf",
-    "fluentd.gemspec",
-    "lib/fluent/buffer.rb",
-    "lib/fluent/command/cat.rb",
-    "lib/fluent/command/fluentd.rb",
-    "lib/fluent/config.rb",
-    "lib/fluent/engine.rb",
-    "lib/fluent/env.rb",
-    "lib/fluent/event.rb",
-    "lib/fluent/input.rb",
-    "lib/fluent/load.rb",
-    "lib/fluent/log.rb",
-    "lib/fluent/match.rb",
-    "lib/fluent/mixin.rb",
-    "lib/fluent/output.rb",
-    "lib/fluent/parser.rb",
-    "lib/fluent/plugin.rb",
-    "lib/fluent/plugin/buf_file.rb",
-    "lib/fluent/plugin/buf_memory.rb",
-    "lib/fluent/plugin/buf_zfile.rb",
-    "lib/fluent/plugin/in_exec.rb",
-    "lib/fluent/plugin/in_forward.rb",
-    "lib/fluent/plugin/in_http.rb",
-    "lib/fluent/plugin/in_status.rb",
-    "lib/fluent/plugin/in_stream.rb",
-    "lib/fluent/plugin/in_syslog.rb",
-    "lib/fluent/plugin/in_tail.rb",
-    "lib/fluent/plugin/out_copy.rb",
-    "lib/fluent/plugin/out_exec.rb",
-    "lib/fluent/plugin/out_exec_filter.rb",
-    "lib/fluent/plugin/out_file.rb",
-    "lib/fluent/plugin/out_forward.rb",
-    "lib/fluent/plugin/out_null.rb",
-    "lib/fluent/plugin/out_roundrobin.rb",
-    "lib/fluent/plugin/out_stdout.rb",
-    "lib/fluent/plugin/out_stream.rb",
-    "lib/fluent/plugin/out_test.rb",
-    "lib/fluent/process.rb",
-    "lib/fluent/status.rb",
-    "lib/fluent/supervisor.rb",
-    "lib/fluent/test.rb",
-    "lib/fluent/test/base.rb",
-    "lib/fluent/test/input_test.rb",
-    "lib/fluent/test/output_test.rb",
-    "lib/fluent/version.rb",
-    "test/config.rb",
-    "test/helper.rb",
-    "test/match.rb",
-    "test/mixin.rb",
-    "test/plugin/in_exec.rb",
-    "test/plugin/in_forward.rb",
-    "test/plugin/in_http.rb",
-    "test/plugin/in_stream.rb",
-    "test/plugin/out_copy.rb",
-    "test/plugin/out_exec.rb",
-    "test/plugin/out_exec_filter.rb",
-    "test/plugin/out_file.rb",
-    "test/plugin/out_forward.rb",
-    "test/plugin/out_roundrobin.rb",
-    "test/plugin/out_stream.rb"
-  ]
-  s.homepage = "http://fluentd.org/"
-  s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new("~> 1.9.2")
-  s.rubygems_version = "1.8.12"
-  s.summary = "Fluent event collector"
-  s.test_files = ["test/config.rb", "test/helper.rb", "test/match.rb", "test/mixin.rb", "test/plugin/in_exec.rb", "test/plugin/in_forward.rb", "test/plugin/in_http.rb", "test/plugin/in_stream.rb", "test/plugin/out_copy.rb", "test/plugin/out_exec.rb", "test/plugin/out_exec_filter.rb", "test/plugin/out_file.rb", "test/plugin/out_forward.rb", "test/plugin/out_roundrobin.rb", "test/plugin/out_stream.rb"]
+  gem.authors       = ["Sadayuki Furuhashi"]
+  gem.email         = ["frsyuki@gmail.com"]
+  gem.description   = %q{Fluentd is an event collector system. It is a generalized version of syslogd, which handles JSON objects for its log messages}
+  gem.summary       = %q{Fluentd event collector}
+  gem.homepage      = "http://fluentd.org/"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+  gem.has_rdoc = false
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fluentd>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0.9.2"])
-      s.add_development_dependency(%q<rr>, [">= 1.0.0"])
-      s.add_development_dependency(%q<timecop>, [">= 0.3.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<rake>, [">= 0.9.2"])
-      s.add_development_dependency(%q<rr>, [">= 1.0.0"])
-      s.add_development_dependency(%q<timecop>, [">= 0.3.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.0.0"])
-      s.add_runtime_dependency(%q<msgpack>, ["~> 0.4.4"])
-      s.add_runtime_dependency(%q<json>, [">= 1.4.3"])
-      s.add_runtime_dependency(%q<yajl-ruby>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<cool.io>, ["~> 1.1.0"])
-      s.add_runtime_dependency(%q<http_parser.rb>, ["~> 0.5.1"])
-      s.add_development_dependency(%q<rake>, [">= 0.9.2"])
-      s.add_development_dependency(%q<rr>, [">= 1.0.0"])
-      s.add_development_dependency(%q<timecop>, [">= 0.3.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.0.0"])
-    else
-      s.add_dependency(%q<fluentd>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0.9.2"])
-      s.add_dependency(%q<rr>, [">= 1.0.0"])
-      s.add_dependency(%q<timecop>, [">= 0.3.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.0.0"])
-      s.add_dependency(%q<rake>, [">= 0.9.2"])
-      s.add_dependency(%q<rr>, [">= 1.0.0"])
-      s.add_dependency(%q<timecop>, [">= 0.3.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.0.0"])
-      s.add_dependency(%q<msgpack>, ["~> 0.4.4"])
-      s.add_dependency(%q<json>, [">= 1.4.3"])
-      s.add_dependency(%q<yajl-ruby>, ["~> 1.0"])
-      s.add_dependency(%q<cool.io>, ["~> 1.1.0"])
-      s.add_dependency(%q<http_parser.rb>, ["~> 0.5.1"])
-      s.add_dependency(%q<rake>, [">= 0.9.2"])
-      s.add_dependency(%q<rr>, [">= 1.0.0"])
-      s.add_dependency(%q<timecop>, [">= 0.3.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.0.0"])
-    end
-  else
-    s.add_dependency(%q<fluentd>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0.9.2"])
-    s.add_dependency(%q<rr>, [">= 1.0.0"])
-    s.add_dependency(%q<timecop>, [">= 0.3.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.0.0"])
-    s.add_dependency(%q<rake>, [">= 0.9.2"])
-    s.add_dependency(%q<rr>, [">= 1.0.0"])
-    s.add_dependency(%q<timecop>, [">= 0.3.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.0.0"])
-    s.add_dependency(%q<msgpack>, ["~> 0.4.4"])
-    s.add_dependency(%q<json>, [">= 1.4.3"])
-    s.add_dependency(%q<yajl-ruby>, ["~> 1.0"])
-    s.add_dependency(%q<cool.io>, ["~> 1.1.0"])
-    s.add_dependency(%q<http_parser.rb>, ["~> 0.5.1"])
-    s.add_dependency(%q<rake>, [">= 0.9.2"])
-    s.add_dependency(%q<rr>, [">= 1.0.0"])
-    s.add_dependency(%q<timecop>, [">= 0.3.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.0.0"])
-  end
-end
+  gem.required_ruby_version = '>= 1.9.2'
+
+  gem.add_runtime_dependency(%q<msgpack>, [">= 0.4.4", "!= 0.5.0", "!= 0.5.1", "!= 0.5.2", "!= 0.5.3", "< 0.6.0"])
+  gem.add_runtime_dependency(%q<json>, [">= 1.4.3"])
+  gem.add_runtime_dependency(%q<yajl-ruby>, ["~> 1.0"])
+  gem.add_runtime_dependency(%q<cool.io>, ["~> 1.1.0"])
+  gem.add_runtime_dependency(%q<http_parser.rb>, ["~> 0.5.1"])
 
+  gem.add_development_dependency(%q<rake>, [">= 0.9.2"])
+  gem.add_development_dependency(%q<rr>, [">= 1.0.0"])
+  gem.add_development_dependency(%q<timecop>, [">= 0.3.0"])
+end

data/lib/fluent/buffer.rb

@@ -219,6 +219,17 @@ class BasicBuffer < Buffer
     @queue.size
   end
 
+  def total_queued_chunk_size
+    total = 0
+    @map.each_value {|c|
+      total += c.size
+    }
+    @queue.each {|c|
+      total += c.size
+    }
+    total
+  end
+
   #def new_chunk(key)
   #end
 

data/lib/fluent/config.rb

@@ -233,6 +233,8 @@ end
 
 
 module Configurable
+  attr_reader :config
+
   def self.included(mod)
     mod.extend(ClassMethods)
   end
@@ -245,6 +247,8 @@ module Configurable
   end
 
   def configure(conf)
+    @config = conf
+
     self.class.config_params.each_pair {|name,(block,opts)|
       varname = :"@#{name}"
       if val = conf[name.to_s]
@@ -356,5 +360,24 @@ module Configurable
 end
 
 
+module PluginId
+  def configure(conf)
+    @id = conf['id']
+    super
+  end
+
+  def require_id
+    unless @id
+      raise ConfigError, "'id' parameter is required"
+    end
+    @id
+  end
+
+  def plugin_id
+    @id ? @id : "object:#{object_id.to_s(16)}"
+  end
+end
+
+
 end
 

data/lib/fluent/input.rb

@@ -20,20 +20,21 @@ module Fluent
 
 class Input
   include Configurable
+  include PluginId
 
-	def initialize
+  def initialize
     super
-	end
+  end
 
-	def configure(conf)
+  def configure(conf)
     super
-	end
+  end
 
-	def start
-	end
+  def start
+  end
 
-	def shutdown
-	end
+  def shutdown
+  end
 end
 
 

data/lib/fluent/mixin.rb

@@ -217,4 +217,5 @@ module SetTagKeyMixin
   end
 end
 
+
 end

data/lib/fluent/output.rb

@@ -48,6 +48,7 @@ end
 
 class Output
   include Configurable
+  include PluginId
 
   def initialize
     super
@@ -164,6 +165,7 @@ class BufferedOutput < Output
   config_param :retry_limit, :integer, :default => 17
   config_param :retry_wait, :time, :default => 1.0
   config_param :num_threads, :integer, :default => 1
+  config_param :queued_chunk_flush_interval, :time, :default => 1
 
   def configure(conf)
     super
@@ -301,7 +303,7 @@ class BufferedOutput < Output
       end
 
       if has_next
-        return time  # call try_flush soon
+        return Engine.now + @queued_chunk_flush_interval
       else
         return time + 1  # TODO 1
       end
@@ -370,12 +372,13 @@ class BufferedOutput < Output
 
   def calc_retry_wait
     # TODO retry pattern
-    if @error_history.size <= @retry_limit
-      @retry_wait * (2 ** (@error_history.size-1))
-    else
-      # secondary retry
-      @retry_wait * (2 ** (@error_history.size-2-@retry_limit))
-    end
+    wait = if @error_history.size <= @retry_limit
+             @retry_wait * (2 ** (@error_history.size-1))
+           else
+             # secondary retry
+             @retry_wait * (2 ** (@error_history.size-2-@retry_limit))
+           end
+    wait + (rand * (wait / 4.0) - (wait / 8.0))
   end
 
   def write_abort

data/lib/fluent/plugin/in_monitor_agent.rb

@@ -0,0 +1,288 @@
+#
+# Fluent
+#
+# Copyright (C) 2011 FURUHASHI Sadayuki
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+module Fluent
+
+class MonitorAgentInput < Input
+  Plugin.register_input('monitor_agent', self)
+
+  require 'webrick'
+
+  def initialize
+    require 'cgi'
+    super
+  end
+
+  config_param :bind, :string, :default => '0.0.0.0'
+  config_param :port, :integer, :default => 24220
+
+  class MonitorServlet < WEBrick::HTTPServlet::AbstractServlet
+    def initialize(server, agent)
+      @agent = agent
+    end
+
+    def do_GET(req, res)
+      begin
+        code, header, body = process(req, res)
+      rescue
+        code, header, body = render_json_error(500, {
+          'message '=> 'Internal Server Error',
+          'error' => "#{$!}",
+          'backgrace'=> $!.backtrace,
+        })
+      end
+
+      # set response code, header and body
+      res.status = code
+      header.each_pair {|k,v|
+        res[k] = v
+      }
+      res.body = body
+    end
+
+    def build_object(req, res)
+      unless req.path_info == ""
+        return render_json_error(404, "Not found")
+      end
+
+      # parse ?=query string
+      if req.query_string
+        begin
+          qs = CGI.parse(req.query_string)
+        rescue
+          return render_json_error(400, "Invalid query string")
+        end
+      else
+        qs = Hash.new {|h,k| [] }
+      end
+
+      # if ?debug=1 is set, set :with_debug_info for get_monitor_info
+      # and :pretty_json for render_json_error
+      opts = {}
+      if s = qs['debug'] and s[0]
+        opts[:with_debug_info] = true
+        opts[:pretty_json] = true
+      end
+
+      if tags = qs['tag'] and tag = tags[0]
+        # ?tag= to search an output plugin by match pattern
+        if obj = @agent.plugin_info_by_tag(tag, opts)
+          list = [obj]
+        else
+          list = []
+        end
+
+      elsif plugin_ids = qs['id'] and plugin_id = plugin_ids[0]
+        # ?id= to search a plugin by 'id <plugin_id>' config param
+        if obj = @agent.plugin_info_by_id(plugin_id, opts)
+          list = [obj]
+        else
+          list = []
+        end
+
+      elsif types = qs['type'] and type = types[0]
+        # ?type= to search plugins by 'type <type>' config param
+        list = @agent.plugins_info_by_type(type, opts)
+
+      else
+        # otherwise show all plugins
+        list = @agent.plugins_info_all(opts)
+      end
+
+      return list, opts
+    end
+
+    def render_json(obj, opts={})
+      render_json_error(200, obj, opts)
+    end
+
+    def render_json_error(code, obj, opts={})
+      if opts[:pretty_json]
+        js = JSON.pretty_generate(obj)
+      else
+        js = obj.to_json
+      end
+      [code, {'Content-Type'=>'application/json'}, js]
+    end
+  end
+
+  class LTSVMonitorServlet < MonitorServlet
+    def process(req, res)
+      list, opts = build_object(req, res)
+      return unless list
+
+      normalized = JSON.parse(list.to_json)
+
+      text = ''
+
+      normalized.map {|hash|
+        row = []
+        hash.each_pair {|k,v|
+          unless v.is_a?(Hash) || v.is_a?(Array)
+            row << "#{k}:#{v}"
+          end
+        }
+        text << row.join("\t") << "\n"
+      }
+
+      [200, {'Content-Type'=>'text/plain'}, text]
+    end
+  end
+
+  class JSONMonitorServlet < MonitorServlet
+    def process(req, res)
+      list, opts = build_object(req, res)
+      return unless list
+
+      render_json({
+        'plugins' => list
+      }, opts)
+    end
+  end
+
+  def start
+    $log.debug "listening monitoring http server on http://#{@bind}:#{@port}/api/plugins"
+    @srv = WEBrick::HTTPServer.new({
+      :BindAddress => @bind,
+      :Port => @port,
+      :Logger => WEBrick::Log.new(STDERR, WEBrick::Log::FATAL),
+      :AccessLog => [],
+    })
+    @srv.mount('/api/plugins', LTSVMonitorServlet, self)
+    @srv.mount('/api/plugins.json', JSONMonitorServlet, self)
+    @thread = Thread.new {
+      @srv.start
+    }
+  end
+
+  def shutdown
+    if @srv
+      @srv.shutdown
+      @srv = nil
+    end
+    if @thread
+      @thread.join
+      @thread = nil
+    end
+  end
+
+  MONITOR_INFO = {
+    'plugin_id' => 'plugin_id',
+    'type' => 'config["type"]',
+    'output_plugin' => 'is_a?(::Fluent::Output)',
+    'buffer_queue_length' => '@buffer.queue_size',
+    'buffer_total_queued_size' => '@buffer.total_queued_chunk_size',
+    'retry_count' => '@error_history.size',
+    'config' => 'config',
+  }
+
+  def all_plugins
+    array = []
+
+    # get all input plugins
+    array.concat Engine.sources
+
+    # get all output plugins
+    Engine.matches.each {|m|
+      MonitorAgentInput.collect_children(m.output, array)
+    }
+
+    array
+  end
+
+  # get nexted plugins (such as <store> of the copy plugin)
+  # from the plugin `pe` recursively
+  def self.collect_children(pe, array=[])
+    array << pe
+    if pe.is_a?(MultiOutput) && pe.respond_to?(:outputs)
+      pe.outputs.each {|nop|
+        collect_children(nop, array)
+      }
+    end
+    array
+  end
+
+  # try to match the tag and get the info from the
+  # matched output plugin
+  def plugin_info_by_tag(tag, opts={})
+    m = Engine.match(tag)
+    if m
+      pe = m.output
+      get_monitor_info(pe, opts)
+    else
+      nil
+    end
+  end
+
+  # search a plugin by plugin_id
+  def plugin_info_by_id(plugin_id, opts={})
+    found = all_plugins.find {|pe|
+      pe.respond_to?(:plugin_id) && pe.plugin_id.to_s == plugin_id
+    }
+    if found
+      get_monitor_info(found, opts)
+    else
+      nil
+    end
+  end
+
+  # This method returns an array because
+  # multiple plugins could have the same type
+  def plugins_info_by_type(type, opts={})
+    array = all_plugins.select {|pe|
+      pe.config['type'] == type rescue nil
+    }
+    array.map {|pe|
+      get_monitor_info(pe, opts)
+    }
+  end
+
+  def plugins_info_all(opts={})
+    all_plugins.map {|pe|
+      get_monitor_info(pe, opts)
+    }
+  end
+
+  # get monitor info from the plugin `pe` and return a hash object
+  def get_monitor_info(pe, opts={})
+    obj = {}
+
+    # run MONITOR_INFO in plugins' instance context and store the info to obj
+    MONITOR_INFO.each_pair {|key,code|
+      begin
+        obj[key] = pe.instance_eval(code)
+      rescue
+      end
+    }
+
+    # include all instance variables if :with_debug_info is set
+    if opts[:with_debug_info]
+      iv = {}
+      pe.instance_eval do
+        instance_variables.each {|sym|
+          key = sym.to_s[1..-1]  # removes first '@'
+          iv[key] = instance_variable_get(sym)
+        }
+      end
+      obj['instance_variables'] = iv
+    end
+
+    obj
+  end
+end
+
+end

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-VERSION = '0.10.32'
+VERSION = '0.10.33'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.32
+  version: 0.10.33
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,54 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -139,38 +169,26 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-description: 
-email: frsyuki@gmail.com
+description: Fluentd is an event collector system. It is a generalized version of
+  syslogd, which handles JSON objects for its log messages
+email:
+- frsyuki@gmail.com
 executables:
-- fluentd
 - fluent-cat
-- fluent-gem
 - fluent-debug
+- fluent-gem
+- fluentd
 extensions: []
-extra_rdoc_files:
-- ChangeLog
-- README.rdoc
+extra_rdoc_files: []
 files:
+- .gitignore
+- .rvmrc
 - AUTHORS
 - COPYING
+- ChangeLog
+- Gemfile
+- README.rdoc
 - Rakefile
-- VERSION
 - bin/fluent-cat
 - bin/fluent-debug
 - bin/fluent-gem
@@ -201,6 +219,7 @@ files:
 - lib/fluent/plugin/in_forward.rb
 - lib/fluent/plugin/in_gc_stat.rb
 - lib/fluent/plugin/in_http.rb
+- lib/fluent/plugin/in_monitor_agent.rb
 - lib/fluent/plugin/in_object_space.rb
 - lib/fluent/plugin/in_status.rb
 - lib/fluent/plugin/in_stream.rb
@@ -247,8 +266,6 @@ files:
 - test/plugin/out_roundrobin.rb
 - test/plugin/out_stdout.rb
 - test/plugin/out_stream.rb
-- ChangeLog
-- README.rdoc
 homepage: http://fluentd.org/
 licenses: []
 post_install_message: 
@@ -272,7 +289,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Fluent event collector
+summary: Fluentd event collector
 test_files:
 - test/config.rb
 - test/helper.rb
@@ -296,3 +313,4 @@ test_files:
 - test/plugin/out_roundrobin.rb
 - test/plugin/out_stdout.rb
 - test/plugin/out_stream.rb
+has_rdoc: false

data/VERSION

@@ -1 +0,0 @@
-0.10.32