fluent-plugin-watch-process 0.0.2 → 0.0.3

data/fluent-plugin-watch-process.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-watch-process"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-watch-process"
@@ -17,4 +17,6 @@ Gem::Specification.new do |s|
   # specify any dependencies:
   s.add_development_dependency "rake"
   s.add_runtime_dependency "fluentd"
+  s.add_runtime_dependency "fluent-mixin-rewrite-tag-name"
+  s.add_runtime_dependency "fluent-mixin-type-converter"
 end

data/lib/fluent/plugin/in_watch_process.rb

@@ -1,3 +1,6 @@
+require 'fluent/mixin/rewrite_tag_name'
+require 'fluent/mixin/type_converter'
+
 module Fluent
   class WatchProcessInput < Fluent::Input
     Plugin.register_input('watch_process', self)
@@ -5,33 +8,21 @@ module Fluent
     config_param :tag, :string
     config_param :command, :string, :default => nil
     config_param :keys, :string, :default => nil
-    config_param :types, :string, :default => nil
     config_param :interval, :string, :default => '5s'
     config_param :lookup_user, :string, :default => nil
     config_param :hostname_command, :string, :default => 'hostname'
 
     DEFAULT_KEYS = %w(start_time user pid parent_pid cpu_time cpu_percent memory_percent mem_rss mem_size state proc_name command)
-    DEFAULT_TYPES = %w(pid:integer parent_pid:integer cpu_percent:float memory_percent:float mem_rss:integer mem_size:integer)
-
-    Converters = {
-      'string' => lambda { |v| v.to_s },
-      'integer' => lambda { |v| v.to_i },
-      'float' => lambda { |v| v.to_f },
-      'bool' => lambda { |v|
-        case v.downcase
-        when 'true', 'yes', '1'
-          true
-        else
-          false
-        end
-      },
-      'time' => lambda { |v, time_parser|
-        time_parser.parse(v)
-      },
-      'array' => lambda { |v, delimiter|
-        v.to_s.split(delimiter)
-      }
-    }
+    DEFAULT_TYPES = "pid:integer,parent_pid:integer,cpu_percent:float,memory_percent:float,mem_rss:integer,mem_size:integer"
+
+    include Fluent::HandleTagNameMixin
+
+    include Fluent::Mixin::RewriteTagName
+    config_set_default :enable_placeholder_upcase, true
+    config_set_default :enable_placeholder_hostname, true
+
+    include Fluent::Mixin::TypeConverter
+    config_param :types, :string, :default => DEFAULT_TYPES
 
     def initialize
       super
@@ -43,11 +34,8 @@ module Fluent
 
       @command = @command || get_ps_command
       @keys = @keys.nil? ? DEFAULT_KEYS : @keys.to_s.gsub(' ', '').split(',')
-      @types = @types || DEFAULT_TYPES
-      @types_map = Hash[types.map{|v| v.split(':')}]
       @lookup_user = @lookup_user.gsub(' ', '').split(',') unless @lookup_user.nil?
       @interval = Config.time_value(@interval)
-      @hostname = `#{@hostname_command}`.chomp
       $log.info "watch_process: polling start. :tag=>#{@tag} :lookup_user=>#{@lookup_user} :interval=>#{@interval} :command=>#{@command}"
     end
 
@@ -65,22 +53,18 @@ module Fluent
         io.gets
         while result = io.gets
           keys_size = @keys.size
-          if result =~ /(?<lstart>(^\w+ \w+ \d+ \d\d:\d\d:\d\d \d+))/
+          if result =~ /(?<lstart>(^\w+\s+\w+\s+\d+\s+\d\d:\d\d:\d\d \d+))/
             lstart = Time.parse($~[:lstart])
-            values = result.sub($~[:lstart], '')
+            result = result.sub($~[:lstart], '')
             keys_size -= 1
           end
-          values = values.chomp.strip.split(/\s+/, keys_size)
-          data = Hash[
-            @keys.zip([lstart.to_s, values].reject(&:empty?).flatten).map do |k,v|
-              v = Converters[@types_map[k]].call(v) if @types_map.include?(k)
-              [k,v]
-            end
-          ]
+          values = [lstart.to_s, result.chomp.strip.split(/\s+/, keys_size)]
+          data = Hash[@keys.zip(values.reject(&:empty?).flatten)]
           data['elapsed_time'] = (Time.now - Time.parse(data['start_time'])).to_i if data['start_time']
           next unless @lookup_user.nil? || @lookup_user.include?(data['user'])
-          tag = @tag.gsub(/(\${[a-z]+}|__[A-Z]+__)/, get_placeholder)
-          Engine.emit(tag, Engine.now, data)
+          emit_tag = tag.dup
+          filter_record(emit_tag, Engine.now, data)
+          Engine.emit(emit_tag, Engine.now, data)
         end
         io.close
         sleep @interval
@@ -115,12 +99,5 @@ module Fluent
         OS.unix? and not OS.mac?
       end
     end
-
-    def get_placeholder
-      return {
-        '__HOSTNAME__' => @hostname,
-        '${hostname}' => @hostname,
-      }
-    end    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-watch-process
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,6 +43,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fluent-mixin-rewrite-tag-name
+  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: fluent-mixin-type-converter
+  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'
 description: 
 email:
 - y.ken.studio@gmail.com