fluent-plugin-dstat 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da7754b1412274c5b20c0fdd8090f141e45ee5c4
-  data.tar.gz: a1fdcaaa0583d70f1c4aaca6ba6f9538aadda82d
+  metadata.gz: 689378189e1225c23f9d6e083077f40d3760833d
+  data.tar.gz: f8fb4a49ab1d3586ab5ec4c72fb6c157c5d4a163
 SHA512:
-  metadata.gz: 7bee0b4b8a2139f84eceff5d3941529db3ca17e2330d10b013efb30692c0646528f98e0f8dedf02005cdad6ad50a9c4d20b7c0cdd396bf5fdd16f29e8fc7d026
-  data.tar.gz: df21f44396dd13cce329b12e0437e8dd1653c8808223a163d1c731da8b7505436bd31db71179c439936195c1ffa0f1cd1294487e60ab0cbe3dd741b32e75b21e
+  metadata.gz: 4dd33c9bbad811a3f60bb0a352d8294829f4ec87e5dd8d52d68fa05109fd550ef7ceb40f07368c023133938f0a45fc0509e1422575b377893569cb7f2f8bc7d7
+  data.tar.gz: 0a0a1cb719f99b1cb0e1944a1782e556e15733924f588ff06db27ae7d6b7d84e04c9689934c35fa6487c6b8e5ac3bfc5b20240f3483ff4afa69d77576c408c01

data/README.md

@@ -10,7 +10,7 @@ This plugin use Dstat, so you need to install Dstat before using this plugin.
 
 ```
 <source>
-  type dstat
+  @type dstat
   tag dstat
   option -c
   delay 3
@@ -23,19 +23,21 @@ This plugin use Dstat, so you need to install Dstat before using this plugin.
   * 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)
+  * the tag of event. You can embed hostname by `#{}` feature, e.g. `tag "dstat.#{Socket.gethostname}"`.
 
 ## Output Format
 
 When you use option -a, you get structured output data like below.
 
-  {
+```
+{
   "hostname":"tsukuba000",
-   dstat":{"total cpu usage":"usr":"0.0","sys":"0.0","idl":"100.0","wai":"0.0","hiq":"0.0","siq":"0.0"},
+  "dstat":{"total cpu usage":"usr":"0.0","sys":"0.0","idl":"100.0","wai":"0.0","hiq":"0.0","siq":"0.0"},
            "dsk/total":{"read":"0.0","writ":"0.0"},"net/total":{"recv":"148.0","send":"164.0"},
            "paging":{"in":"0.0","out":"0.0"},
            "system":{"int":"16.333","csw":"29.0"}}
-  }
+}
+```
 
 ## Supported options
 

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/fluent-plugin-dstat.gemspec

@@ -3,12 +3,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fluent-plugin-dstat"
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   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 = "2015-08-15"
   s.email = "shun0102@gmail.com"
   s.license = "Apache-2.0"
   s.extra_rdoc_files = [
@@ -36,20 +35,17 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fluent-mixin-rewrite-tag-name>, [">= 0"])
       s.add_runtime_dependency(%q<fluentd>, [">= 0.10.7", "< 2"])
       s.add_runtime_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<test-unit>, [">= 3.0.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
     else
-      s.add_runtime_dependency(%q<fluent-mixin-rewrite-tag-name>, [">= 0"])
       s.add_runtime_dependency(%q<fluentd>, [">= 0.10.7", "< 2"])
       s.add_runtime_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<test-unit>, [">= 3.0.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
     end
   else
-    s.add_runtime_dependency(%q<fluent-mixin-rewrite-tag-name>, [">= 0"])
     s.add_runtime_dependency(%q<fluentd>, [">= 0.10.7", "< 2"])
     s.add_runtime_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<test-unit>, [">= 3.0.0"])

data/lib/fluent/plugin/in_dstat.rb

@@ -1,5 +1,4 @@
 require 'fluent/input'
-require 'fluent/mixin/rewrite_tag_name'
 
 module Fluent
   class DstatInput < Input
@@ -14,7 +13,6 @@ module Fluent
       @first_keys = []
       @second_keys = []
       @data_array = []
-      @max_lines = 100
       @last_time = Time.now
     end
 
@@ -26,7 +24,7 @@ module Fluent
       end
     end
 
-    desc "supported ${hostname} placeholder powered by Fluent::Mixin::RewriteTagName"
+    desc "the tag of event"
     config_param :tag, :string
     desc "dstat command path"
     config_param :dstat_path, :string, :default => "dstat"
@@ -35,25 +33,33 @@ module Fluent
     desc "Run dstat command every `delay` seconds"
     config_param :delay, :integer, :default => 1
     desc "Write dstat result to this file"
-    config_param :tmp_file, :string, :default => "/tmp/dstat.csv"
+    config_param :tmp_file, :string, :default => "/tmp/fluent-plugin-dstat.fifo"
     desc "hostname command path"
     config_param :hostname_command, :string, :default => "hostname"
 
-    include Fluent::Mixin::RewriteTagName
-
     def configure(conf)
       super
 
-      @command = "#{@dstat_path} #{@option} --output #{@tmp_file} #{@delay}"
+      @command = "#{@dstat_path} #{@option} --nocolor --output #{@tmp_file} #{@delay} > /dev/null 2>&1"
       @hostname = `#{@hostname_command}`.chomp!
+
+      begin
+        `#{@dstat_path} --version`
+      rescue Errno::ENOENT
+        raise ConfigError, "'#{@dstat_path}' command not found. Install dstat before run fluentd"
+      end
     end
 
     def check_dstat
-      restart if (Time.now - @last_time) > @delay*3
+      now = Time.now
+      if now - @last_time > @delay * 3
+        $log.info "Process dstat(#{@pid}) is stopped. Last updated: #{@last_time}"
+        restart
+      end
     end
 
     def start
-      touch_or_truncate(@tmp_file)
+      system("mkfifo #{@tmp_file}")
       @io = IO.popen(@command, "r")
       @pid = @io.pid
 
@@ -94,7 +100,6 @@ module Fluent
       @dw.detach
       @tw.detach
       @line_number = 0
-      touch_or_truncate(@tmp_file)
 
       @io = IO.popen(@command, "r")
       @pid = @io.pid
@@ -104,14 +109,6 @@ module Fluent
       @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 == ""
@@ -147,18 +144,8 @@ module Fluent
             'hostname' => @hostname,
             'dstat' => data
           }
-          emit_tag = @tag.dup
-          filter_record(emit_tag, Engine.now, record)
-          router.emit(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)
+          router.emit(@tag, Engine.now, record)
         end
-
         @line_number += 1
         @last_time = Time.now
       end
@@ -172,25 +159,24 @@ module Fluent
       def initialize(path, &receive_lines)
         super path, INTERVAL
         @path = path
-        @io = File.open(path)
-        @pos = 0
+        @io = File.open(path, File::NONBLOCK | File::TRUNC)
         @receive_lines = receive_lines
+        @partial = ""
       end
 
       def on_change(prev, cur)
-        return if cur.size < @pos
-
-        buffer = @io.read(cur.size - @pos)
-        @pos = cur.size
-        lines = []
-        while line = buffer.slice!(/.*?\n/m)
-          lines << line.chomp
-        end
+        buffer = @io.read_nonblock(65536)
+        lines = buffer.split("\n").map(&:chomp)
+        return if lines.empty?
+        lines[0] = @partial + lines.first unless @partial.empty?
+        @partial = buffer.end_with?("\n") ? "" : lines.pop
         @receive_lines.call(lines)
+      rescue IO::WaitReadable
+        # will be readable on next event
       end
     end
 
-    class TimerWatcher < Coolio::TimerWatcher
+    class TimerWatcher < Cool.io::TimerWatcher
       def initialize(interval, repeat, &check_dstat)
         @check_dstat = check_dstat
         super(interval, repeat)

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dstat
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Shunsuke Mikami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2016-12-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: fluent-mixin-rewrite-tag-name
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement