fluent-plugin-grepcounter 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f187009dead1522e4bef22b7a505085d271ee46c
-  data.tar.gz: ff997a2771fa6e16a5fa6f44758d0a46d59cbeeb
+  metadata.gz: ea3e539761fa0ef96bbda6bd542b61f0895cea0a
+  data.tar.gz: 216334103aeb12132996863c36044758da74e822
 SHA512:
-  metadata.gz: 2fa074c1989f4117b55a5e656d7e1290e8e60dfe9ce55c97c007da627bea24bf4690256413c6bac5d688a9c585b1d9b3f65a421b568a6ccd1b8784460cf9d944
-  data.tar.gz: 12d5df257832eb73754849bc9b0acc95a0834cc05b4ab32ed0f996ad6732525daf2971dbbb4074734c987b8e3b9340ff0691dba9d0cb34c6a69316b432954296
+  metadata.gz: 9c916df6a00e90ee8d5f0be5d8a1f7e1067d147f25005d8e5678ac62ea6331c8abab30a8f14046c9eec1acfa753cbac1d2dfc5484636f8e495b4fd2f1803518e
+  data.tar.gz: bec68bc60449c25b7f4ffefeddc227e170e929871b5dfd3fe46381a478a5ec5ebcb7310d9033184825d9f046cba0ac797f4f9104f60fd0840aadafe2aaae2909

data/.travis.yml

@@ -1,6 +1,9 @@
+sudo: false
 rvm:
-  - 1.9.3
-  - 2.0.0
   - 2.1.*
+  - 2.2.*
+  - 2.3.0
 gemfile:
   - Gemfile
+before_install:
+  - gem update bundler

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.6.0 (2017/01/23)
+
+Changes:
+
+* Drop ruby 1.9.2 and 2.0.0 supports
+
+Enhancements:
+
+* Add config descriptions
+* Add fluent module require explicitly
+
 ## 0.5.6 (2015/05/10)
 
 Enhancements:

data/fluent-plugin-grepcounter.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-grepcounter"
-  s.version     = "0.5.6"
+  s.version     = "0.6.0"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-grepcounter"
@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pry"
   s.add_development_dependency "pry-nav"
   s.add_development_dependency "coveralls"
+  s.add_development_dependency "test-unit", "~> 3.1.5"
 end

data/lib/fluent/plugin/out_grepcounter.rb

@@ -1,3 +1,5 @@
+require 'fluent/output'
+
 # encoding: UTF-8
 class Fluent::GrepCounterOutput < Fluent::Output
   Fluent::Plugin.register_output('grepcounter', self)
@@ -19,30 +21,64 @@ class Fluent::GrepCounterOutput < Fluent::Output
     require 'pathname'
   end
 
-  config_param :input_key, :string, :default => nil
-  config_param :regexp, :string, :default => nil
-  config_param :exclude, :string, :default => nil
-  (1..REGEXP_MAX_NUM).each {|i| config_param :"regexp#{i}",  :string, :default => nil }
+  config_param :input_key, :string, :default => nil,
+               :desc => <<-DESC
+The target field key to grep out.
+Use with regexp or exclude.
+DESC
+  config_param :regexp, :string, :default => nil,
+               :desc => 'The filtering regular expression.'
+  config_param :exclude, :string, :default => nil,
+               :desc => 'The excluding regular expression like grep -v.'
+  (1..REGEXP_MAX_NUM).each {|i| config_param :"regexp#{i}", :string, :default => nil }
   (1..REGEXP_MAX_NUM).each {|i| config_param :"exclude#{i}", :string, :default => nil }
-  config_param :count_interval, :time, :default => 5
-  config_param :threshold, :integer, :default => nil # not obsolete, though
+  config_param :count_interval, :time, :default => 5,
+               :desc => 'The interval time to count in seconds.'
+  config_param :threshold, :integer, :default => nil, # not obsolete, though
+               :desc => <<-DESC
+The threshold number to emit.
+Emit if count value >= specified value.
+Note that this param is not obsolete.
+DESC
   config_param :comparator, :string, :default => '>=' # obsolete
-  config_param :less_than, :float, :default => nil
-  config_param :less_equal, :float, :default => nil
-  config_param :greater_than, :float, :default => nil
-  config_param :greater_equal, :float, :default => nil
+  config_param :less_than, :float, :default => nil,
+               :desc => 'Emit if count value is less than (<) specified value.'
+  config_param :less_equal, :float, :default => nil,
+               :desc => 'Emit if count value is less than or equal to (<=) specified value.'
+  config_param :greater_than, :float, :default => nil,
+               :desc => 'Emit if count value is greater than (>) specified value.'
+  config_param :greater_equal, :float, :default => nil,
+               :desc => <<-DESC
+This is same with threshold option.
+Emit if count value is greater than or equal to (>=) specified value.
+DESC
   config_param :output_tag, :string, :default => nil # obsolete
-  config_param :tag, :string, :default => nil
-  config_param :add_tag_prefix, :string, :default => nil
-  config_param :remove_tag_prefix, :string, :default => nil
-  config_param :add_tag_suffix, :string, :default => nil
-  config_param :remove_tag_suffix, :string, :default => nil
-  config_param :remove_tag_slice, :string, :default => nil
+  config_param :tag, :string, :default => nil,
+               :desc => 'The output tag. Required for aggregate all.'
+  config_param :add_tag_prefix, :string, :default => nil,
+               :desc => 'Add tag prefix for output message.'
+  config_param :remove_tag_prefix, :string, :default => nil,
+               :desc => 'Remove tag prefix for output message.'
+  config_param :add_tag_suffix, :string, :default => nil,
+               :desc => 'Add tag suffix for output message.'
+  config_param :remove_tag_suffix, :string, :default => nil,
+               :desc => 'Remove tag suffix for output message.'
+  config_param :remove_tag_slice, :string, :default => nil,
+               :desc => <<-DESC
+Remove tag parts by slice function.
+Note that this option behaves like tag.split('.').slice(min..max).
+DESC
   config_param :output_with_joined_delimiter, :string, :default => nil # obsolete
-  config_param :delimiter, :string, :default => nil
-  config_param :aggregate, :string, :default => 'tag'
-  config_param :replace_invalid_sequence, :bool, :default => false
-  config_param :store_file, :string, :default => nil
+  config_param :delimiter, :string, :default => nil,
+               :desc => 'Output matched messages after joined with the specified delimiter.'
+  config_param :aggregate, :string, :default => 'tag',
+               :desc => 'Aggregation unit. One of all, in_tag, out_tag can be specified.'
+  config_param :replace_invalid_sequence, :bool, :default => false,
+               :desc => "Replace invalid byte sequence in UTF-8 with '?' character if true."
+  config_param :store_file, :string, :default => nil,
+               :desc => <<-DESC
+Store internal count data into a file of the given path on shutdown, and load on statring.
+DESC
 
   attr_accessor :counts
   attr_accessor :matches

data/spec/out_grepcounter_spec.rb

@@ -526,10 +526,10 @@ describe Fluent::GrepCounterOutput do
         loaded_saved_at = driver.instance.saved_at
         loaded_saved_duration = driver.instance.saved_duration
 
-        expect(loaded_counts).to eql(stored_counts)
-        expect(loaded_matches).to eql(stored_matches)
-        expect(loaded_saved_at).to eql(stored_saved_at)
-        expect(loaded_saved_duration).to eql(stored_saved_duration)
+        expect(loaded_counts).to eq(stored_counts)
+        expect(loaded_matches).to eq(stored_matches)
+        expect(loaded_saved_at).to eq(stored_saved_at)
+        expect(loaded_saved_duration).to eq(stored_saved_duration)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grepcounter
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.5
 description: Fluentd plugin to count the number of matched messages, and emit if exceeds
   the threshold
 email:
@@ -149,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-grepcounter
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to count the number of matched messages, and emit if exceeds