fluent-plugin-watch-process 0.0.3 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9173fb842925d14e0f0acfc0fb42ee8b52fe7479
+  data.tar.gz: ef71cd69721481c35a648bf42fcf7da68e7fe320
+SHA512:
+  metadata.gz: 297dd832e5db012b66dbecf2323071143c9acbad29c0dea7f7fb4712e6cfc2e2af7eab78dc5be8af8c94cc2d83f3c1dfa48e049a299fa5881ddd7f857ea7a117
+  data.tar.gz: 4502c116b2af32e99d0f47d340b690033e4cd958c774b79b283b0ad692fbbc12e021ab5e6eadadf76ee13fd49bbcac51b825afbee3bcab6a8bd2a1649fd99375

data/.travis.yml

@@ -1,6 +1,20 @@
 language: ruby
 
 rvm:
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
+  - 2.3.1
+  - 2.2
+  - 2.1
+
+before_install:
+  - gem update bundler
+
+gemfile:
+  - Gemfile
+  - gemfiles/fluentd_v0.12.gemfile
+  - gemfiles/fluentd_v0.14.gemfile
+
+matrix:
+  include:
+    - rvm: 2.0.0
+      gemfile: gemfiles/fluentd_v0.12.gemfile
+

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "fluentd v0.12" do
+  gem "fluentd", "~> 0.12.0"
+end
+
+appraise "fluentd v0.14" do
+  gem "fluentd", "~> 0.14.0"
+end

data/README.md

@@ -25,7 +25,10 @@ install with gem or fluent-gem command as:
 $ gem install fluent-plugin-watch-process
 
 # for td-agent
-$ sudo /usr/lib64/fluent/ruby/bin/fluent-gem install fluent-plugin-watch-process
+$ sudo /usr/lib64/fluent/ruby/bin/fluent-gem install fluent-plugin-watch-process -v 0.1.0
+
+# for td-agent2 (recommend)
+$ sudo td-agent-gem install fluent-plugin-watch-process -v 0.1.0
 ```
 
 ## Configuration
@@ -36,14 +39,14 @@ It is a quick sample to output log to `/var/log/td-agent/td-agent.log` with td-a
 
 `````
 <source>
-  type watch_process
+  @type        watch_process
   tag          debug.batch.${hostname}  # Required
   lookup_user  batchuser                # Optional
   interval     10s                      # Optional (default: 5s)
 </source>
 
 <match debug.**>
-  type stdout
+  @type        stdout
 </match>
 `````
 

data/example1.conf

@@ -6,10 +6,10 @@
 # * fluent-plugin-elasticsearch
 
 <source>
-  type watch_process
+  @type watch_process
 
   # specify output tag
-  tag          batch_process
+  tag          batch.process
 
   # filter specific user owned process. if no need to filter, delete this line.
   lookup_user  batchuser
@@ -18,18 +18,16 @@
   interval     10s
 </source>
 
-<match batch_process>
-  type         record_reformer
-  output_tag   reformed.${tag}
-  enable_ruby  false
+# add hostname key into record
+<filter batch.process>
+  @type record_transformer
   <record>
-    # add hostname key into record
-    hostname   ${hostname}
+    hostname ${hostname}
   </record>
-</match>
+</filter>
 
-<match reformed.*>
-  type       elasticsearch
+<match batch.*>
+  @type      elasticsearch
   host       localhost
   port       9200
   logstash_format  true

data/example2.conf

@@ -5,9 +5,10 @@
 # * fluent-plugin-s3
 
 <source>
-  type watch_process
+  @type        watch_process
 
   # use ${hostname} placeholder to use filename
+  # If you want to customize it, Use #{Socket.gethostname} or #{Socket.gethostname.split('.').first} snippet for tag.
   tag          batch_process.${hostname}
 
   # filter specific user owned process. if no need to filter, delete this line.
@@ -18,7 +19,7 @@
 </source>
 
 <match batch_process.*>
-  type s3
+  @type s3
 
   aws_key_id YOUR_AWS_KEY_ID
   aws_sec_key YOUR_AWS_SECRET/KEY

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.3"
+  s.version     = "0.1.0"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-watch-process"
@@ -16,7 +16,9 @@ Gem::Specification.new do |s|
 
   # specify any dependencies:
   s.add_development_dependency "rake"
-  s.add_runtime_dependency "fluentd"
+  s.add_development_dependency "test-unit", ">= 3.1.0"
+  s.add_development_dependency "appraisal"
+  s.add_runtime_dependency "fluentd", ">= 0.10.58"
   s.add_runtime_dependency "fluent-mixin-rewrite-tag-name"
   s.add_runtime_dependency "fluent-mixin-type-converter"
 end

data/gemfiles/fluentd_v0.12.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "fluentd", "~> 0.12.0"
+
+gemspec :path => "../"

data/gemfiles/fluentd_v0.14.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "fluentd", "~> 0.14.0"
+
+gemspec :path => "../"

data/lib/fluent/plugin/in_watch_process.rb

@@ -1,3 +1,4 @@
+require "fluent/input"
 require 'fluent/mixin/rewrite_tag_name'
 require 'fluent/mixin/type_converter'
 
@@ -16,13 +17,9 @@ module Fluent
     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
+    config_set_default :types, DEFAULT_TYPES
 
     def initialize
       super
@@ -64,7 +61,7 @@ module Fluent
           next unless @lookup_user.nil? || @lookup_user.include?(data['user'])
           emit_tag = tag.dup
           filter_record(emit_tag, Engine.now, data)
-          Engine.emit(emit_tag, Engine.now, data)
+          router.emit(emit_tag, Engine.now, data)
         end
         io.close
         sleep @interval

data/test/plugin/test_in_watch_process.rb

@@ -21,7 +21,6 @@ class WatchProcessInputTest < Test::Unit::TestCase
       tag          input.watch_process
       lookup_user  apache, mycron
     ]
-    d.instance.inspect
     assert_equal 'input.watch_process', d.instance.tag
     assert_equal ['apache', 'mycron'], d.instance.lookup_user
   end

metadata

@@ -1,78 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-watch-process
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Kentaro Yoshida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2017-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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: fluentd
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fluentd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.58
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.58
 - !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: 
@@ -82,8 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -91,32 +111,33 @@ files:
 - example1.conf
 - example2.conf
 - fluent-plugin-watch-process.gemspec
+- gemfiles/fluentd_v0.12.gemfile
+- gemfiles/fluentd_v0.14.gemfile
 - lib/fluent/plugin/in_watch_process.rb
 - test/helper.rb
 - test/plugin/test_in_watch_process.rb
 homepage: https://github.com/y-ken/fluent-plugin-watch-process
 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'
 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.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fluentd Input plugin to collect continual process information via ps command.
   It is useful for cron/barch process monitoring.
 test_files: