fluent-plugin-grep 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8ed5698594f518f8856725be943ebe18632086e
-  data.tar.gz: c52945cd2644ff09ec8ca4ed71d3d4196fa76768
+  metadata.gz: b28e2f9df47ff5255ba541d237af0803507d0b54
+  data.tar.gz: 6f3d5af7d9893d5cdc27a20499273f0030c507f7
 SHA512:
-  metadata.gz: e00ac4165583c2647cf00c1704b8bdc3d0913008ec7f0d2edc2f904b553b8b613770373df37b4575cfb9aeddfae467ac8f032b76d855bb96f2134df1804089e5
-  data.tar.gz: d45ed519f94552d0d84b76da994ef378021566065052e62f46932bc13223bb42b7c896938974c5fa95730b6a9f16fcf9ea570d4134e6226f4a5fd06ee8a900f0
+  metadata.gz: 6ab25c093315af58af4517eb5239765386cbbfff46822c1225c9a56467833a033d7de7f2f174cae0ca817af448292558ab80dcd35edfdad2df5d93829f463cb8
+  data.tar.gz: 6baedc91f8bfeb856f2ac54c1473ad8f6f0a936fbd8036d462b017ef201042d809ea83a4a86cac57be5180f8026e99582159cf18510b47d49d60650aa2fedc56

data/.travis.yml

@@ -1,7 +1,7 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.*
 gemfile:
   - Gemfile
   - Gemfile.fluentd.lt.0.10.43

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.3.3 (2014/04/12)
+
+Enhancements:
+
+* Add `add_tag_suffix` and `remove_tag_suffix` options
+* Allow . in tag options to support compatibility with HandleTagNameMixin
+
 ## 0.3.2 (2014/02/04)
 
 Enhancement:

data/README.md

@@ -12,7 +12,7 @@ Fluentd plugin to grep messages.
       regexp WARN
       exclude favicon
       add_tag_prefix greped
-    </source>
+    </match>
 
 Assuming following inputs are coming:
 
@@ -36,7 +36,7 @@ Now, `regexpN` and `excludeN` options are available to specify grep conditions f
       regexp2 foo ^awesome$
       exclude1 message favicon
       add_tag_prefix greped
-    </source>
+    </match>
 
 Assuming following inputs are coming:
 

data/fluent-plugin-grep.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-grep"
-  s.version     = "0.3.2"
+  s.version     = "0.3.3"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-grep"

data/lib/fluent/plugin/out_grep.rb

@@ -9,6 +9,8 @@ class Fluent::GrepOutput < 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 :replace_invalid_sequence, :bool, :default => false
   (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 }
@@ -45,24 +47,10 @@ class Fluent::GrepOutput < Fluent::Output
       @excludes[key] = Regexp.compile(exclude)
     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 = 'greped' # not ConfigError to support lower version compatibility
     end
-
-    @tag_prefix = "#{@add_tag_prefix}." if @add_tag_prefix
-    @tag_prefix_match = "#{@remove_tag_prefix}." if @remove_tag_prefix
-    @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
-        Proc.new {|tag| lstrip(tag, @tag_prefix_match) }
-      elsif @tag_prefix
-        Proc.new {|tag| "#{@tag_prefix}#{tag}" }
-      else
-        Proc.new {|tag| tag }
-      end
+    @tag_proc = tag_proc
   end
 
   def emit(tag, es, chain)
@@ -88,8 +76,25 @@ class Fluent::GrepOutput < Fluent::Output
 
   private
 
-  def lstrip(string, substring)
-    string.index(substring) == 0 ? string[substring.size..-1] : string
+  def tag_proc
+    rstrip = Proc.new {|str, substr| str.chomp(substr) }
+    lstrip = Proc.new {|str, substr| str.start_with?(substr) ? str[substr.size..-1] : str }
+    tag_prefix = "#{rstrip.call(@add_tag_prefix, '.')}." if @add_tag_prefix
+    tag_suffix = ".#{lstrip.call(@add_tag_suffix, '.')}" if @add_tag_suffix
+    tag_prefix_match = "#{rstrip.call(@remove_tag_prefix, '.')}." if @remove_tag_prefix
+    tag_suffix_match = ".#{lstrip.call(@remove_tag_suffix, '.')}" if @remove_tag_suffix
+    tag_fixed = @tag if @tag
+    if tag_fixed
+      Proc.new {|tag| tag_fixed }
+    elsif tag_prefix_match and tag_suffix_match
+      Proc.new {|tag| "#{tag_prefix}#{rstrip.call(lstrip.call(tag, tag_prefix_match), tag_suffix_match)}#{tag_suffix}" }
+    elsif tag_prefix_match
+      Proc.new {|tag| "#{tag_prefix}#{lstrip.call(tag, tag_prefix_match)}#{tag_suffix}" }
+    elsif tag_suffix_match
+      Proc.new {|tag| "#{tag_prefix}#{rstrip.call(tag, tag_suffix_match)}#{tag_suffix}" }
+    else
+      Proc.new {|tag| "#{tag_prefix}#{tag}#{tag_suffix}" }
+    end
   end
 
   def match(regexp, string)

data/spec/out_grep_bench.rb

@@ -31,3 +31,6 @@ end
 # AFTER  regexps, exludes (0.3.0) 
 #              user     system      total        real
 #          2.700000   0.050000   2.750000 (  3.340524)
+# AFTER  add_tag_suffix, remove_tag_suffix (0.3.3)
+#              user     system      total        real
+#          2.470000   0.020000   2.490000 (  3.012241)

data/spec/out_grep_spec.rb

@@ -160,6 +160,7 @@ describe Fluent::GrepOutput do
           add_tag_prefix foo
         ]
       end
+      let(:tag) { 'syslog.host1' }
       before do
         Fluent::Engine.stub(:now).and_return(time)
         Fluent::Engine.should_receive(:emit).with("foo.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
@@ -174,6 +175,7 @@ describe Fluent::GrepOutput do
           remove_tag_prefix syslog
         ]
       end
+      let(:tag) { 'syslog.host1' }
       before do
         Fluent::Engine.stub(:now).and_return(time)
         Fluent::Engine.should_receive(:emit).with("host1", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
@@ -181,6 +183,114 @@ describe Fluent::GrepOutput do
       it { emit }
     end
 
+    context 'add_tag_suffix' do
+      let(:config) do
+        CONFIG + %[
+          regexp ping
+          add_tag_suffix foo
+        ]
+      end
+      let(:tag) { 'syslog.host1' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("#{tag}.foo", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
+      end
+      it { emit }
+    end
+
+    context 'remove_tag_suffix' do
+      let(:config) do
+        CONFIG + %[
+          regexp ping
+          remove_tag_suffix host1
+        ]
+      end
+      let(:tag) { 'syslog.host1' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("syslog", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
+      end
+      it { emit }
+    end
+
+    context 'all tag options' do
+      let(:config) do
+        CONFIG + %[
+          regexp ping
+          add_tag_prefix foo
+          remove_tag_prefix syslog
+          add_tag_suffix foo
+          remove_tag_suffix host1
+        ]
+      end
+      let(:tag) { 'syslog.foo.host1' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("foo.foo.foo", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
+      end
+      it { emit }
+    end
+
+    context 'add_tag_prefix.' do
+      let(:config) do
+        CONFIG + %[
+          regexp ping
+          add_tag_prefix foo.
+        ]
+      end
+      let(:tag) { 'syslog.host1' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("foo.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
+      end
+      it { emit }
+    end
+
+    context 'remove_tag_prefix.' do
+      let(:config) do
+        CONFIG + %[
+          regexp ping
+          remove_tag_prefix syslog.
+        ]
+      end
+      let(:tag) { 'syslog.host1' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("host1", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
+      end
+      it { emit }
+    end
+
+    context '.add_tag_suffix' do
+      let(:config) do
+        CONFIG + %[
+          regexp ping
+          add_tag_suffix .foo
+        ]
+      end
+      let(:tag) { 'syslog.host1' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("#{tag}.foo", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
+      end
+      it { emit }
+    end
+
+    context '.remove_tag_suffix' do
+      let(:config) do
+        CONFIG + %[
+          regexp ping
+          remove_tag_suffix .host1
+        ]
+      end
+      let(:tag) { 'syslog.host1' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("syslog", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
+      end
+      it { emit }
+    end
+
     context 'replace_invalid_sequence' do
       let(:config) do
         CONFIG + %[

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grep
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.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