fluent-plugin-grepcounter 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16a2bb7af97b5bbe3d7436c7f9ac749a74a8b660
-  data.tar.gz: 77e82589f64a366baf731899318c22c9cf076a37
+  metadata.gz: 86bdb8c2cc79fb721b52ca56d8c8e523cbdcc12f
+  data.tar.gz: b63dbf7c4a149a9fda4ef52c6c02a73092baae48
 SHA512:
-  metadata.gz: 28c15035659a4ced1b00e033f8ab53e51cde287be5a62ef57af4834a75ba755eba6f929f4c3422534f368cb3842f83112fc70bb41a54eefc915b1534de7b284e
-  data.tar.gz: b67364cf3cd70c42bdd6015238383100d04fc030a320804a6c41eaa792ddd15be5335bfe37d1f7faf41ae1a41b3f12f3bfdea4d4d366fdc6cb6afaadb6af6a85
+  metadata.gz: 34882d64a3c25e0740e9f80ecbadab394101391bd4ce121f713eee5640b336071477a137c20e25fbdfdbdbdf63d003dbbf1c7e4a4bea5e0453ff2cc62911c47a
+  data.tar.gz: 7990a6f34f89a4bd23c95824ebe58edbf85848c1c595ff02131b29fe676820d30125a49d6dddd2ca51d80a2eb98869c323b53aee1023f6b83288cceca6a01d1e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.4.1 (2013/11/30)
+
+Features
+
+  - add `remove_tag_prefix` option
+
 ## 0.4.0 (2013/11/30)
 
 Changes

data/README.md

@@ -112,6 +112,10 @@ Then, output bocomes as belows (indented). You can see the `message` field is jo
 
     Add tag prefix for output message
 
+- remove\_tag\_prefix (from 0.4.1)
+
+    Remove tag prefix for output message
+
 - output\_with\_joined\_delimiter (obsolete from 0.4.0)
 
     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.4.0"
+  s.version     = "0.4.1"
   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

@@ -20,6 +20,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
   config_param :output_tag, :string, :default => nil # obsolete
   config_param :tag, :string, :default => nil
   config_param :add_tag_prefix, :string, :default => 'count'
+  config_param :remove_tag_prefix, :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'
@@ -82,6 +83,21 @@ class Fluent::GrepCounterOutput < Fluent::Output
       end
     end
 
+    @tag_prefix = "#{@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
+
     @matches = {}
     @counts  = {}
     @mutex = Mutex.new
@@ -159,8 +175,10 @@ class Fluent::GrepCounterOutput < Fluent::Output
         count = flushed_counts[tag]
         matches = flushed_matches[tag]
         output = generate_output(count, matches, tag)
-        tag = @tag ? @tag : "#{@add_tag_prefix}.#{tag}"
-        Fluent::Engine.emit(tag, time, output) if output
+        if output
+          emit_tag = @tag_proc.call(tag)
+          Fluent::Engine.emit(emit_tag, time, output)
+        end
       end
     end
   end
@@ -182,17 +200,18 @@ class Fluent::GrepCounterOutput < Fluent::Output
     output
   end
 
+  def lstrip(string, substring)
+    string.index(substring) == 0 ? string[substring.size..-1] : string
+  end
+
   def match(string)
     begin
       return false if @regexp and !@regexp.match(string)
       return false if @exclude and @exclude.match(string)
     rescue ArgumentError => e
-      unless e.message.index("invalid byte sequence in") == 0
-        raise
-      end
+      raise e unless e.message.index("invalid byte sequence in") == 0
       string = replace_invalid_byte(string)
-      return false if @regexp and !@regexp.match(string)
-      return false if @exclude and @exclude.match(string)
+      retry
     end
     return true
   end

data/spec/out_grepcounter_spec.rb

@@ -281,6 +281,15 @@ describe Fluent::GrepCounterOutput do
       it { emit }
     end
 
+    context 'remove_tag_prefix' do
+      let(:config) { CONFIG + %[add_tag_prefix foo\nremove_tag_prefix syslog] }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("foo.host1", 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grepcounter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Naotoshi SEO