fluent-plugin-grepcounter 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a3f68aa7d961b029edcb310440dafcc74f4e27c
-  data.tar.gz: 685ed1187c0349c9980077cf843e8cdd37627973
+  metadata.gz: 02fcfc4239d3f9c72ad1831c502ffa09c71552f8
+  data.tar.gz: e341d89ebae652e888159f2e830c4ed3252dcc3d
 SHA512:
-  metadata.gz: 2bd4ac357031dae5ab89d58e1ed35c90722cfa0fb2f64aab213a4c6d286956bea5bb0ef58a081eccf7bee797dd89a05738ceb26a25802cb1766650e83c57d926
-  data.tar.gz: 52505feb90d47a807b645e86fbce71c3383faec26d0a01d1832c462ab4b8886b297d607a78d7d20b2d0732107d824558eb684a1f953b1b837d1d790742362080
+  metadata.gz: 530e25bea4620fe5798183dbb48d3c1a8a5b760fc05f28fed0bba103392ab65d02e19922946fc8b920945f069368cd0e6388885dd993dc8d77a389ed1171280a
+  data.tar.gz: cf539ce20180ab51363a4e5f03cd46179b2530322f3d1f553cbd9e9942acda61eb307ae0a1f15407021765eee34fec55855b4877b67ea8b07601ecc4eaa84e32

data/.travis.yml

@@ -1,6 +1,6 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.*
 gemfile:
   - Gemfile

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.3 (2014/04/11)
+
+Enhancement:
+
+* Add `add_tag_suffix` and `remove_tag_suffix` options
+
 ## 0.5.2 (2014/02/04)
 
 Enhancement:

data/README.md

@@ -21,7 +21,7 @@ An example of grepcounter configuration:
       exclude favicon.ico
       threshold 1
       add_tag_prefix warn.count
-    </source>
+    </match>
 
 Then, output bocomes as belows (indented):
 
@@ -46,7 +46,7 @@ You may want to output `message` as a string, then use `delimiter` option like:
       threshold 1
       add_tag_prefix warn.count
       delimiter \n
-    </source>
+    </match>
 
 Then, output bocomes as belows (indented). You can see the `message` field is joined with \n.
 
@@ -115,6 +115,14 @@ Then, output bocomes as belows (indented). You can see the `message` field is jo
 
     Remove tag prefix for output message
 
+- add\_tag\_suffix
+
+    Add tag suffix for output message
+
+- remove\_tag\_suffix
+
+    Remove tag suffix for output message
+
 - delimiter
 
     Output matched messages after `join`ed with the specified delimiter.

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.2"
+  s.version     = "0.5.3"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-grepcounter"

data/lib/fluent/plugin/out_grepcounter.rb

@@ -30,6 +30,8 @@ class Fluent::GrepCounterOutput < Fluent::Output
   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 :output_with_joined_delimiter, :string, :default => nil # obsolete
   config_param :delimiter, :string, :default => nil
   config_param :aggregate, :string, :default => 'tag'
@@ -92,22 +94,24 @@ class Fluent::GrepCounterOutput < Fluent::Output
       end
     end
 
-    if @tag.nil? and @add_tag_prefix.nil? and @remove_tag_prefix.nil?
+    if @tag.nil? and @add_tag_prefix.nil? and @remove_tag_prefix.nil? and @add_tag_suffix.nil? and @remove_tag_suffix.nil?
       @add_tag_prefix = 'count' # not ConfigError to support lower version compatibility
     end
     @tag_prefix = "#{@add_tag_prefix}." if @add_tag_prefix
+    @tag_suffix = ".#{@add_tag_suffix}" if @add_tag_suffix
     @tag_prefix_match = "#{@remove_tag_prefix}." if @remove_tag_prefix
+    @tag_suffix_match = ".#{@remove_tag_suffix}" if @remove_tag_suffix
     @tag_proc =
       if @tag
         Proc.new {|tag| @tag }
-      elsif @tag_prefix and @tag_prefix_match
-        Proc.new {|tag| "#{@tag_prefix}#{lstrip(tag, @tag_prefix_match)}" }
+      elsif @tag_prefix_match and @tag_suffix_match
+        Proc.new {|tag| "#{@tag_prefix}#{rstrip(lstrip(tag, @tag_prefix_match), @tag_suffix_match)}#{@tag_suffix}" }
       elsif @tag_prefix_match
-        Proc.new {|tag| lstrip(tag, @tag_prefix_match) }
-      elsif @tag_prefix
-        Proc.new {|tag| "#{@tag_prefix}#{tag}" }
+        Proc.new {|tag| "#{@tag_prefix}#{lstrip(tag, @tag_prefix_match)}#{@tag_suffix}" }
+      elsif @tag_suffix_match
+        Proc.new {|tag| "#{@tag_prefix}#{rstrip(tag, @tag_suffix_match)}#{@tag_suffix}" }
       else
-        Proc.new {|tag| tag }
+        Proc.new {|tag| "#{@tag_prefix}#{tag}#{@tag_suffix}" }
       end
 
     case @aggregate
@@ -245,6 +249,10 @@ class Fluent::GrepCounterOutput < Fluent::Output
     output
   end
 
+  def rstrip(string, substring)
+    string.chomp(substring)
+  end
+
   def lstrip(string, substring)
     string.index(substring) == 0 ? string[substring.size..-1] : string
   end

data/spec/out_grepcounter_spec.rb

@@ -302,6 +302,7 @@ describe Fluent::GrepCounterOutput do
 
     context 'add_tag_prefix' do
       let(:config) { CONFIG + %[add_tag_prefix foo] }
+      let(:tag) { 'syslog.host1' }
       before do
         Fluent::Engine.stub(:now).and_return(time)
         Fluent::Engine.should_receive(:emit).with("foo.#{tag}", time, expected)
@@ -311,6 +312,7 @@ describe Fluent::GrepCounterOutput do
 
     context 'remove_tag_prefix' do
       let(:config) { CONFIG + %[remove_tag_prefix syslog] }
+      let(:tag) { 'syslog.host1' }
       before do
         Fluent::Engine.stub(:now).and_return(time)
         Fluent::Engine.should_receive(:emit).with("host1", time, expected)
@@ -318,6 +320,41 @@ describe Fluent::GrepCounterOutput do
       it { emit }
     end
 
+    context 'add_tag_suffix' do
+      let(:config) { CONFIG + %[add_tag_suffix foo] }
+      let(:tag) { 'syslog.host1' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("#{tag}.foo", time, expected)
+      end
+      it { emit }
+    end
+
+    context 'remove_tag_suffix' do
+      let(:config) { CONFIG + %[remove_tag_suffix host1] }
+      let(:tag) { 'syslog.host1' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("syslog", time, expected)
+      end
+      it { emit }
+    end
+
+    context 'all tag options' do
+      let(:config) { CONFIG + %[
+         add_tag_prefix foo
+         add_tag_suffix foo
+         remove_tag_prefix syslog
+         remove_tag_suffix host1
+      ]}
+      let(:tag) { 'syslog.foo.host1' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("foo.foo.foo", time, expected)
+      end
+      it { emit }
+    end
+
     context 'output_with_joined_delimiter (obsolete)' do
       # \\n shall be \n in config file
       let(:config) { CONFIG + %[output_with_joined_delimiter \\n] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grepcounter
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd