fluent-plugin-dstat 0.2.3 → 0.2.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fc4761593955b9c9bd4cb5bd1488446829ee8e23
+  data.tar.gz: 6082e8de5344ea01c541dd452466c670452625f5
+SHA512:
+  metadata.gz: 1b83eefbe45c89710d3da6cdb8d96eacc247b784f61d620d0b769d8bf365501c6b9e3c295e7dd2c58f52f96035e29ca2a695f708282b9f4e6dc628440ebd258c
+  data.tar.gz: 83be387534ec99e441d59994d10f5bec21d894205f46d3bbd67119a3ab1368c56950be540f85d5c2a3ab83d80c0917d9bfa26527706d7dc32f908861a55adca6

data/README.md

@@ -1,6 +1,4 @@
-Dstat plugin for Fluent
-
-Description goes here.
+Dstat plugin for [Fluentd](http://fluentd.org)
 
 ## What's Dstat?
 
@@ -19,7 +17,13 @@ This plugin use Dstat, so you need to install Dstat before using this plugin.
  </source>
 ```
 
-* option:option for dstat command(default: -fcdnm)
+#### Parameters
+
+* option
+  * option for dstat command (default: -fcdnm)
+
+* tag
+  * supported ${hostname} placeholder powered by [Fluent::Mixin::RewriteTagName](https://github.com/y-ken/fluent-mixin-rewrite-tag-name)
 
 ## Output Format
 

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/fluent-plugin-dstat.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: fluent-plugin-dstat 0.2.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "fluent-plugin-dstat"
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Shunsuke Mikami"]
-  s.date = "2012-12-15"
+  s.date = "2014-02-09"
   s.email = "shun0102@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -29,12 +31,11 @@ Gem::Specification.new do |s|
     "test/plugin/test_in_dstat.rb"
   ]
   s.homepage = "http://github.com/shun0102/fluent-plugin-dstat"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.2.0"
   s.summary = "Dstat Input plugin for Fluent event collector"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<fluentd>, ["~> 0.10.7"])

data/lib/fluent/plugin/in_dstat.rb

@@ -1,176 +1,183 @@
+require 'fluent/mixin/rewrite_tag_name'
+
 module Fluent
+  class DstatInput < Input
 
-class DstatInput < Input
+    Plugin.register_input('dstat', self)
 
-  Plugin.register_input('dstat', self)
+    def initialize
+      super
 
-  def initialize
-    super
-    require 'csv'
-    @line_number = 0
-    @first_keys = []
-    @second_keys = []
-    @data_array = []
-    @max_lines = 100
-    @last_time = Time.now
-  end
+      require 'csv'
+      @line_number = 0
+      @first_keys = []
+      @second_keys = []
+      @data_array = []
+      @max_lines = 100
+      @last_time = Time.now
+    end
 
-  config_param :tag, :string
-  config_param :option, :string, :default => "-fcdnm"
-  config_param :delay, :integer, :default => 1
-  config_param :tmp_file, :string, :default => "/tmp/dstat.csv"
-  config_param :hostname_command, :string, :default => "hostname"
+    config_param :tag, :string
+    config_param :dstat_path, :string, :default => "dstat"
+    config_param :option, :string, :default => "-fcdnm"
+    config_param :delay, :integer, :default => 1
+    config_param :tmp_file, :string, :default => "/tmp/dstat.csv"
+    config_param :hostname_command, :string, :default => "hostname"
 
-  def configure(conf)
-    super
-    @command = "dstat #{@option} --output #{@tmp_file} #{@delay}"
-    @hostname = `#{@hostname_command}`.chomp!
-  end
+    include Fluent::Mixin::RewriteTagName
 
-  def check_dstat
-    restart if (Time.now - @last_time) > @delay*3
-  end
+    def configure(conf)
+      super
 
-  def start
-    touch_or_truncate(@tmp_file)
-    @io = IO.popen(@command, "r")
-    @pid = @io.pid
-
-    @loop = Coolio::Loop.new
-    @dw = DstatCSVWatcher.new(@tmp_file, &method(:receive_lines))
-    @dw.attach(@loop)
-    @tw = TimerWatcher.new(1, true,  &method(:check_dstat))
-    @tw.attach(@loop)
-    @thread = Thread.new(&method(:run))
-  end
+      @command = "#{@dstat_path} #{@option} --output #{@tmp_file} #{@delay}"
+      @hostname = `#{@hostname_command}`.chomp!
+    end
 
-  def shutdown
-    Process.kill(:TERM, @pid)
-    @dw.detach
-    @tw.detach
-    @loop.stop
-    @thread.join
-    File.delete(@tmp_file)
-  end
+    def check_dstat
+      restart if (Time.now - @last_time) > @delay*3
+    end
 
-  def run
-    begin
-      @loop.run
-    rescue
-      $log.error "unexpected error", :error=>$!.to_s
-      $log.error_backtrace
+    def start
+      touch_or_truncate(@tmp_file)
+      @io = IO.popen(@command, "r")
+      @pid = @io.pid
+
+      @loop = Coolio::Loop.new
+      @dw = DstatCSVWatcher.new(@tmp_file, &method(:receive_lines))
+      @dw.attach(@loop)
+      @tw = TimerWatcher.new(1, true,  &method(:check_dstat))
+      @tw.attach(@loop)
+      @thread = Thread.new(&method(:run))
     end
-  end
 
-  def restart
-    Process.detach(@pid)
-    Process.kill(:TERM, @pid)
-    @dw.detach
-    @tw.detach
-    @line_number = 0
-    touch_or_truncate(@tmp_file)
-
-    @io = IO.popen(@command, "r")
-    @pid = @io.pid
-    @dw = DstatCSVWatcher.new(@tmp_file, &method(:receive_lines))
-    @dw.attach(@loop)
-    @tw = TimerWatcher.new(1, true,  &method(:check_dstat))
-    @tw.attach(@loop)
-  end
+    def shutdown
+      Process.kill(:TERM, @pid)
+      @dw.detach
+      @tw.detach
+      @loop.stop
+      @thread.join
+      File.delete(@tmp_file)
+    end
 
-  def touch_or_truncate(file)
-    if File.exist?(file)
-      File.truncate(file, 0)
-    else
-      `touch #{file}`
+    def run
+      begin
+        @loop.run
+      rescue
+        $log.error "unexpected error", :error=>$!.to_s
+        $log.error_backtrace
+      end
     end
-  end
 
-  def receive_lines(lines)
-    lines.each do |line|
-      next if line == ""
-      case @line_number
-      when 0..1
-      when 2
-        line.delete!("\"")
-        @first_keys = CSV.parse_line(line)
-        pre_key = ""
-        @first_keys.each_with_index do |key, index|
-          if key.nil? || key == ""
-            @first_keys[index] = pre_key
+    def restart
+      Process.detach(@pid)
+      Process.kill(:TERM, @pid)
+      @dw.detach
+      @tw.detach
+      @line_number = 0
+      touch_or_truncate(@tmp_file)
+
+      @io = IO.popen(@command, "r")
+      @pid = @io.pid
+      @dw = DstatCSVWatcher.new(@tmp_file, &method(:receive_lines))
+      @dw.attach(@loop)
+      @tw = TimerWatcher.new(1, true,  &method(:check_dstat))
+      @tw.attach(@loop)
+    end
+
+    def touch_or_truncate(file)
+      if File.exist?(file)
+        File.truncate(file, 0)
+      else
+        `touch #{file}`
+      end
+    end
+
+    def receive_lines(lines)
+      lines.each do |line|
+        next if line == ""
+        case @line_number
+        when 0..1
+        when 2
+          line.delete!("\"")
+          @first_keys = CSV.parse_line(line)
+          pre_key = ""
+          @first_keys.each_with_index do |key, index|
+            if key.nil? || key == ""
+              @first_keys[index] = pre_key
+            end
+            pre_key = @first_keys[index]
           end
-          pre_key = @first_keys[index]
-        end
-      when 3
-        line.delete!("\"")
-        @second_keys = line.split(',')
-        @first_keys.each_with_index do |key, index|
-          @data_array[index] = {}
-          @data_array[index][:first] = key
-          @data_array[index][:second] = @second_keys[index]
+        when 3
+          line.delete!("\"")
+          @second_keys = line.split(',')
+          @first_keys.each_with_index do |key, index|
+            @data_array[index] = {}
+            @data_array[index][:first] = key
+            @data_array[index][:second] = @second_keys[index]
+          end
+        else
+          values = line.split(',')
+          data = Hash.new { |hash,key| hash[key] = Hash.new {} }
+          values.each_with_index do |v, index|
+            data[@first_keys[index]][@second_keys[index]] = v
+          end
+          record = {
+            'hostname' => @hostname,
+            'dstat' => data
+          }
+          emit_tag = @tag.dup
+          filter_record(emit_tag, Engine.now, record)
+          Engine.emit(emit_tag, Engine.now, record)
         end
-      else
-        values = line.split(',')
-        data = Hash.new { |hash,key| hash[key] = Hash.new {} }
-        values.each_with_index do |v, index|
-          data[@first_keys[index]][@second_keys[index]] = v
+
+        if (@line_number % @max_lines) == (@max_lines - 1)
+          @dw.detach
+          File.truncate(@tmp_file, 0)
+          @dw = DstatCSVWatcher.new(@tmp_file, &method(:receive_lines))
+          @dw.attach(@loop)
         end
-        record = {
-          'hostname' => @hostname,
-          'dstat' => data
-        }
-        Engine.emit(@tag, Engine.now, record)
-      end
 
-      if (@line_number % @max_lines) == (@max_lines - 1)
-        @dw.detach
-        File.truncate(@tmp_file, 0)
-        @dw = DstatCSVWatcher.new(@tmp_file, &method(:receive_lines))
-        @dw.attach(@loop)
+        @line_number += 1
+        @last_time = Time.now
       end
 
-      @line_number += 1
-      @last_time = Time.now
     end
 
-  end
+    class DstatCSVWatcher < Cool.io::StatWatcher
+      INTERVAL = 0.500
+      attr_accessor :previous, :cur
 
-  class DstatCSVWatcher < Cool.io::StatWatcher
-    INTERVAL = 0.500
-    attr_accessor :previous, :cur
+      def initialize(path, &receive_lines)
+        super path, INTERVAL
+        @path = path
+        @io = File.open(path)
+        @pos = 0
+        @receive_lines = receive_lines
+      end
 
-    def initialize(path, &receive_lines)
-      super path, INTERVAL
-      @path = path
-      @io = File.open(path)
-      @pos = 0
-      @receive_lines = receive_lines
+      def on_change(prev, cur)
+        buffer = @io.read(cur.size - @pos)
+        @pos = cur.size
+        lines = []
+        while line = buffer.slice!(/.*?\n/m)
+          lines << line.chomp
+        end
+        @receive_lines.call(lines)
+      end
     end
 
-    def on_change(prev, cur)
-      buffer = @io.read(cur.size - @pos)
-      @pos = cur.size
-      lines = []
-      while line = buffer.slice!(/.*?\n/m)
-        lines << line.chomp
+    class TimerWatcher < Coolio::TimerWatcher
+      def initialize(interval, repeat, &check_dstat)
+        @check_dstat = check_dstat
+        super(interval, repeat)
       end
-      @receive_lines.call(lines)
-    end
-  end
-  class TimerWatcher < Coolio::TimerWatcher
-    def initialize(interval, repeat, &check_dstat)
-      @check_dstat = check_dstat
-      super(interval, repeat)
-    end
 
-    def on_timer
-      @check_dstat.call
-    rescue
-      $log.error $!.to_s
-      $log.error_backtrace
+      def on_timer
+        @check_dstat.call
+      rescue
+        $log.error $!.to_s
+        $log.error_backtrace
+      end
     end
   end
 end
-
-
-end

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dstat
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.2.4
 platform: ruby
 authors:
 - Shunsuke Mikami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.7
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.4
 description: 
@@ -99,7 +88,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
+- ".document"
 - AUTHORS
 - Gemfile
 - LICENSE.txt
@@ -112,29 +101,25 @@ files:
 - test/plugin/test_in_dstat.rb
 homepage: http://github.com/shun0102/fluent-plugin-dstat
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2096726281248138972
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Dstat Input plugin for Fluent event collector
 test_files: []