fluent-plugin-grepcounter 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86bdb8c2cc79fb721b52ca56d8c8e523cbdcc12f
-  data.tar.gz: b63dbf7c4a149a9fda4ef52c6c02a73092baae48
+  metadata.gz: 3b6b29ceafed9d27f2a47aaae6f4509944a958c3
+  data.tar.gz: a7efb1d61d2a585f49a81a22b0c3d3dfa0b122f4
 SHA512:
-  metadata.gz: 34882d64a3c25e0740e9f80ecbadab394101391bd4ce121f713eee5640b336071477a137c20e25fbdfdbdbdf63d003dbbf1c7e4a4bea5e0453ff2cc62911c47a
-  data.tar.gz: 7990a6f34f89a4bd23c95824ebe58edbf85848c1c595ff02131b29fe676820d30125a49d6dddd2ca51d80a2eb98869c323b53aee1023f6b83288cceca6a01d1e
+  metadata.gz: f6df4866a77929e798551961c6349ceb88d80b58f7959af60536b12cbcf4bd93e93311823da8abb882828f4cf6f3b313d2c50f34d682e700b6ae7f4f2054e19e
+  data.tar.gz: 78b66fd77923e02947ae8a1a45da3e89e5c30eba12bb96f7970a80f109f91f8956f6233c3c0e400958f2c9c8500b66f7238b6ec471f32273dd005a6c9d7f23dd

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.4.2 (2013/12/12)
+
+Features
+
+  - Allow to use `remove_tag_prefix` option alone
+
 ## 0.4.1 (2013/11/30)
 
 Features

data/README.md

@@ -32,7 +32,7 @@ Then, output bocomes as belows (indented):
       "input_tag_last":"host1",
     }
 
-### output_with_joined_delimiter
+### Output message by joining with a delimiter
 
 As default, the `grepcounter` plugin outputs matched `message` as an array as shown above. 
 You may want to output `message` as a string, then use `delimiter` option like:

data/fluent-plugin-grepcounter.gemspec

@@ -3,11 +3,11 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-grepcounter"
-  s.version     = "0.4.1"
-  s.authors     = ["Naotoshi SEO"]
+  s.version     = "0.4.2"
+  s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-grepcounter"
-  s.summary     = "Fluentd plugin to count the number of matched messages, and emit if exeeds the threshold"
+  s.summary     = "Fluentd plugin to count the number of matched messages, and emit if exceeds the threshold"
   s.description = s.summary
   s.licenses    = ["MIT"]
 

data/lib/fluent/plugin/out_grepcounter.rb

@@ -19,7 +19,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
   config_param :greater_equal, :float, :default => nil
   config_param :output_tag, :string, :default => nil # obsolete
   config_param :tag, :string, :default => nil
-  config_param :add_tag_prefix, :string, :default => 'count'
+  config_param :add_tag_prefix, :string, :default => nil
   config_param :remove_tag_prefix, :string, :default => nil
   config_param :output_with_joined_delimiter, :string, :default => nil # obsolete
   config_param :delimiter, :string, :default => nil
@@ -83,7 +83,11 @@ class Fluent::GrepCounterOutput < Fluent::Output
       end
     end
 
-    @tag_prefix = "#{@add_tag_prefix}."
+    if @tag.nil? and @add_tag_prefix.nil? and @remove_tag_prefix.nil?
+      @add_tag_prefix = 'count' # 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

data/spec/out_grepcounter_spec.rb

@@ -282,10 +282,10 @@ describe Fluent::GrepCounterOutput do
     end
 
     context 'remove_tag_prefix' do
-      let(:config) { CONFIG + %[add_tag_prefix foo\nremove_tag_prefix syslog] }
+      let(:config) { CONFIG + %[remove_tag_prefix syslog] }
       before do
         Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("foo.host1", time, expected)
+        Fluent::Engine.should_receive(:emit).with("host1", time, expected)
       end
       it { emit }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grepcounter
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
-- Naotoshi SEO
+- Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -80,7 +80,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Fluentd plugin to count the number of matched messages, and emit if exeeds
+description: Fluentd plugin to count the number of matched messages, and emit if exceeds
   the threshold
 email:
 - sonots@gmail.com
@@ -125,7 +125,7 @@ rubyforge_project: fluent-plugin-grepcounter
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Fluentd plugin to count the number of matched messages, and emit if exeeds
+summary: Fluentd plugin to count the number of matched messages, and emit if exceeds
   the threshold
 test_files:
 - spec/out_grepcounter_spec.rb