fluent-plugin-dstat 0.0.3 → 0.1.0

data/README.rdoc

@@ -1,16 +1,40 @@
-= fluent-plugin-dstat
+= Dstat plugin for Fluent
 
 Description goes here.
 
-== Contributing to fluent-plugin-dstat
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+== What's Dstat?
+
+Dstat is a versatile replacement for vmstat, iostat, netstat and ifstat.
+If you need more detail, see here[http://dag.wieers.com/home-made/dstat]
+This plugin use Dstat, so you need to install Dstat before using this plugin.
+
+== Configuration
+
+  <source>
+    type dstat
+    tag dstat
+    option -c 3
+  </source>
+
+* option:option for dstat command(default: -fcdnm 1)
+
+== Output Format
+
+When you use option -c, you get structured output data like below.
+
+  {
+  "hostname":"tsukuba000",
+  "dstat":{"total-cpu-usage":{"usr":"0",
+                              "sys":"0",
+                              "idl":"100",
+                              "wai":"0",
+                              "hiq":"0",
+                              "siq":"0"}}
+  }
+
+== Supported options
+
+  aio, cpu, cpu24, disk, epoch, fs, int, int24, io, ipc, load, lock, mem, net, page, page24, proc, raw, socket, swap, swapold, sys, tcp, udp, unix, vm, disk-tps, disk-util, dstat-cpu, dstat-ctxt, dstat-mem, freespace, top-bio, top-childwait, top-cpu,top-io, top-mem, top-oom, utmp, top-io -fc
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/fluent-plugin-dstat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fluent-plugin-dstat"
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shunsuke Mikami"]
-  s.date = "2011-12-01"
+  s.date = "2012-01-12"
   s.email = "shun0102@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",

data/lib/fluent/plugin/in_dstat.rb

@@ -1,7 +1,23 @@
 module Fluent
 
-
 class DstatInput < Input
+
+  def split_second_key(str)
+    result = []
+    while (str)
+      index = /[^ ] / =~ str
+      if index
+        result << str[0..index]
+      else
+        result << str unless str == " "
+	return result
+      end
+      str = str[(index + 1)..-1]
+    end
+
+    return result
+  end
+
   Plugin.register_input('dstat', self)
 
   def initialize
@@ -9,14 +25,16 @@ class DstatInput < Input
     @hostname = `hostname -s`.chomp!
     @line_number = 0
     @first_keys = []
+    @second_keys = []
   end
 
   config_param :tag, :string
-  config_param :option, :string, :default => "-fcdnm 1"
+  config_param :option, :string, :default => "-fcdnm"
+  config_param :delay, :integer, :default => 1
 
   def configure(conf)
     super
-    @command = "dstat #{@option}"
+    @command = "dstat #{@option} #{@delay}"
   end
 
   def start
@@ -46,23 +64,50 @@ class DstatInput < Input
 
       case @line_number
       when 0
-        @first_keys = line.split(" ").map {|i| i.gsub(/^-+|-+$/, "") }
+        @first_keys = line.split(" ")
       when 1
-        @second_keys = Array.new( @first_keys.length, nil)
-        line.split(/[:\|]/).each_with_index do |i, index|
-          keys = i.split(" ")
-          @second_keys[index] = keys
+        index = 0
+        @first_keys.each do |i|
+          @second_keys << line[index..(index + i.length - 1)]
+          index += i.length + 1
         end
       else
         hash = Hash.new()
-        line.split(/[:\|]/).each_with_index do |i, index|
-          keys = i.split(" ")
+        values = []
+        index = 0
+        @first_keys.each do |i|
+          values << line[index..(index + i.length - 1)]
+          index += i.length + 1
+        end
+
+        @first_keys.each_with_index do |i, index|
           value_hash = Hash.new()
-          @second_keys[index].each_with_index do |j, second_index|
-            value_hash[j] = keys[second_index]
+          first = i.gsub(/^-+|-+$/, "")
+          length = i.length
+
+          if first == "most-expensive"
+            s_key = @second_keys[index].gsub(/^\s+|\s+$/, "")
+            value_hash[s_key] = values[index]
+          else
+            keys = split_second_key(@second_keys[index])
+            second_index = 0
+
+            keys.each do |i|
+              next_index = second_index + i.length - 1
+              value = values[index][second_index..next_index]
+              second_index += i.length + 1
+              value = value.gsub(/^\s+|\s+$/, "") if value
+              value_hash[i.gsub(/^\s+|\s+$/, "")] = value
+            end
+          end
+
+          if hash[first].nil?
+            hash[first] = value_hash
+          else
+            hash[first] = hash[first].merge(value_hash)
           end
-          hash[@first_keys[index]] = value_hash
         end
+
         record = {
           'hostname' => @hostname,
           'dstat' => hash

data/test/plugin/test_in_dstat.rb

@@ -5,9 +5,18 @@ class DstatInputTest < Test::Unit::TestCase
     Fluent::Test.setup
   end
 
+  OPTIONS = ["aio", "cpu", "cpu24", "disk", 
+             "epoch", "fs", "int", "int24", "io", "ipc", "load", "lock",
+             "mem", "net", "page", "page24", "proc", "raw", "socket",
+             "swap", "swapold", "sys", "tcp", "udp", "unix", "vm",
+             "disk-tps", "disk-util", "dstat-cpu", "dstat-ctxt", "dstat-mem", "freespace",
+             "top-bio", "top-childwait", "top-cpu","top-io",
+             "top-mem", "top-oom", "utmp", "top-io -fc"]
+
   CONFIG = %[
     tag dstat
-    option -fcdnm 1
+    option --aio -cpu
+    delay 1
   ]
 
   def create_driver(conf=CONFIG)
@@ -16,17 +25,35 @@ class DstatInputTest < Test::Unit::TestCase
 
   def test_configure
     d = create_driver
-    assert_equal "-fcdnm 1", d.instance.option
+    assert_equal 1, d.instance.delay
   end
 
   def test_emit
-    d = create_driver
+
+    OPTIONS.each do |op|
+      #emit_with_conf(CONFIG)
+      conf = "tag dstat\n option --#{op}\n delay 1"
+      emit_with_conf(conf)
+    end
+
+  end
+
+  def emit_with_conf(conf)
+    d = create_driver(conf)
 
     d.run do
       sleep 2
     end
 
+    length = `dstat #{d.instance.option} #{d.instance.delay} 1`.split("\n")[0].split("\s").length
+
     emits = d.emits
     assert_equal true, emits.length > 0
+    assert_equal length, emits[0][2]['dstat'].length
+
+    puts "--- #{d.instance.option} ---"
+    puts emits[0][2]
+    puts "--- end ---"
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dstat
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000Z
+date: 2012-01-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &15374440 !ruby/object:Gem::Requirement
+  requirement: &22315940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.10.7
   type: :runtime
   prerelease: false
-  version_requirements: *15374440
+  version_requirements: *22315940
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &15373460 !ruby/object:Gem::Requirement
+  requirement: &22315460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15373460
+  version_requirements: *22315460
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &15342660 !ruby/object:Gem::Requirement
+  requirement: &22314980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15342660
+  version_requirements: *22314980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15341480 !ruby/object:Gem::Requirement
+  requirement: &22314500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *15341480
+  version_requirements: *22314500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &15340500 !ruby/object:Gem::Requirement
+  requirement: &22314020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *15340500
+  version_requirements: *22314020
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &15339620 !ruby/object:Gem::Requirement
+  requirement: &22313540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15339620
+  version_requirements: *22313540
 description: 
 email: shun0102@gmail.com
 executables: []
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2536050256067886842
+      hash: 3115706696286106192
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: