fluent-plugin-dstat 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/fluent-plugin-dstat.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "fluent-plugin-dstat"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shunsuke Mikami"]
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "fluent-plugin-dstat.gemspec",
-    "lib/fluent-plugin-dstat.rb",
+    "lib/fluent/plugin/in_dstat.rb",
     "test/helper.rb",
     "test/plugin/test_in_dstat.rb"
   ]

data/lib/fluent/plugin/in_dstat.rb

@@ -0,0 +1,82 @@
+module Fluent
+
+
+class DstatInput < Input
+  Plugin.register_input('dstat', self)
+
+  def initialize
+    super
+    @hostname = `hostname -s`.chomp!
+    @line_number = 0
+    @first_keys = []
+  end
+
+  config_param :tag, :string
+  config_param :option, :string, :default => "-fcdnm 1"
+
+  def configure(conf)
+    super
+    @command = "dstat #{@option}"
+  end
+
+  def start
+    @io = IO.popen(@command, "r")
+    @pid = @io.pid
+    @thread = Thread.new(&method(:run))
+  end
+
+  def shutdown
+    Process.kill(:TERM, @pid)
+    if @thread.join(60)  # TODO wait time
+      return
+    end
+    Process.kill(:KILL, @pid)
+    @thread.join
+  end
+
+  def run
+    @io.each_line(&method(:each_line))
+  end
+
+  private
+  def each_line(line)
+    begin
+      line.chomp!
+      line.gsub!(/\e\[7l/, "")
+
+      case @line_number
+      when 0
+        @first_keys = line.split(" ").map {|i| i.gsub(/^-+|-+$/, "") }
+      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
+        end
+      else
+        hash = Hash.new()
+        line.split(/[:\|]/).each_with_index do |i, index|
+          keys = i.split(" ")
+          value_hash = Hash.new()
+          @second_keys[index].each_with_index do |j, second_index|
+            value_hash[j] = keys[second_index]
+          end
+          hash[@first_keys[index]] = value_hash
+        end
+        record = {
+          'hostname' => @hostname,
+          'dstat' => hash
+        }
+        Engine.emit(@tag, Engine.now, record)
+      end
+      @line_number += 1
+
+    rescue
+      $log.error "exec failed to emit", :error=>$!, :line=>line
+      $log.warn_backtrace $!.backtrace
+    end
+  end
+end
+
+
+end

data/test/plugin/test_in_dstat.rb

@@ -1,5 +1,4 @@
-require 'fluent/test'
-require 'net/http'
+require 'helper'
 
 class DstatInputTest < Test::Unit::TestCase
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dstat
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &21572860 !ruby/object:Gem::Requirement
+  requirement: &15374440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.10.7
   type: :runtime
   prerelease: false
-  version_requirements: *21572860
+  version_requirements: *15374440
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21572260 !ruby/object:Gem::Requirement
+  requirement: &15373460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21572260
+  version_requirements: *15373460
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &21571660 !ruby/object:Gem::Requirement
+  requirement: &15342660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21571660
+  version_requirements: *15342660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21571060 !ruby/object:Gem::Requirement
+  requirement: &15341480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21571060
+  version_requirements: *15341480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21570500 !ruby/object:Gem::Requirement
+  requirement: &15340500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *21570500
+  version_requirements: *15340500
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &21570020 !ruby/object:Gem::Requirement
+  requirement: &15339620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21570020
+  version_requirements: *15339620
 description: 
 email: shun0102@gmail.com
 executables: []
@@ -93,7 +93,7 @@ files:
 - Rakefile
 - VERSION
 - fluent-plugin-dstat.gemspec
-- lib/fluent-plugin-dstat.rb
+- lib/fluent/plugin/in_dstat.rb
 - test/helper.rb
 - test/plugin/test_in_dstat.rb
 homepage: http://github.com/shun0102/fluent-plugin-dstat
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3260140895686169377
+      hash: -2536050256067886842
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: