fluent-plugin-grepcounter 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 905021d7ccf6788eb182017c59884b5071bd9e87
-  data.tar.gz: 25501e79fe3b478a3cbc3a2b5fa96beae5bbbe6b
+  metadata.gz: 325a34b1806a1a3513714f45dcda6108b12557cf
+  data.tar.gz: 91bd55d9a23ed982b33374d85e0c82dac847f950
 SHA512:
-  metadata.gz: 084d066b3dbce3bb8686955ad34822332c963f57239ac6459761b04605de0c3bfa61288cfbe5b8c1b725a777cafc007f7ee044e9214c5c55a05796143e7e0a20
-  data.tar.gz: 8351db08a7cdde4d550ca1303f3352c003c24d0dd1ca304a258fd999be2253535434de78d6554e7977965b85647d811421d07f45183d5fdca98f651af3b4af29
+  metadata.gz: 47b1bb4b4fddc06f4ee13740dee2e3b4a930c96221946fc9d36b68b2efb3c77b9dce7571b0cc678621cbb60f5f4e45382de848fcf23db51b020d68c078aa7eb7
+  data.tar.gz: b627c1fccda47489e1f59f9a84c35c65b8370af1930eaf71fbf40b63e0332c7ce13265d2c92406a69a98c450b61a87f73389a33d7243ebaa95429917bf34f348

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.1 (2013/12/28)
+
+Changes
+
+  - No `message` output in the case of `regexpN` or `excludeN` option
+
 ## 0.5.0 (2013/12/17)
 
 Features

data/README.md

@@ -77,42 +77,33 @@ Then, output bocomes as belows (indented). You can see the `message` field is jo
 
 - regexp[1-20] *field\_key* *regexp* (experimental)
 
-    The target field key and the filtering regular expression to grep out. 
+    The target field key and the filtering regular expression to grep out. No `message` is outputted in this case.
 
 - exclude[1-20] *field_key* *regexp* (experimental)
 
-    The target field key and the excluding regular expression like grep -v
+    The target field key and the excluding regular expression like grep -v. No `message` is outputted in this case.
 
 - threshold
 
     The threshold number to emit. Emit if `count` value >= specified value.
 
-- comparator (obsolete)
-
-    The comparation operator for the threshold (either of `>=` or `<=`). Default is `>=`, i.e., emit if count >= threshold. 
-    NOTE: 0 count message will not be emitted even if `<=` is specified because standby nodes receive no message usually.
-
-- greater\_equal (from 0.2.0)
+- greater\_equal
 
     This is same with `threshold` option. Emit if `count` value is greater than or equal to (>=) specified value. 
     
-- greater\_than (from 0.2.0)
+- greater\_than
 
     Emit if `count` value is greater than (>) specified value. 
     
-- less\_than (from 0.2.0)
+- less\_than
 
     Emit if `count` value is less than (<) specified value. 
 
-- less\_equal (from 0.2.0)
+- less\_equal
 
     Emit if `count` value is less than or equal to (<=) specified value. 
 
-- output\_tag (obsolete from 0.4.0)
-
-    The output tag. Required for aggregate `all`. 
-
-- tag (from 0.4.0)
+- tag
 
     The output tag. Required for aggregate `all`. 
 
@@ -120,15 +111,11 @@ 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
 
     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.
-
-- delimiter (from 0.4.0)
+- 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.0"
+  s.version     = "0.5.1"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-grepcounter"
@@ -23,5 +23,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "pry"
   s.add_development_dependency "pry-nav"
-  # s.add_development_dependency "delorean"
 end

data/lib/fluent/plugin/out_grepcounter.rb

@@ -231,8 +231,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
     if @input_key
       output['message'] = @delimiter ? matches.join(@delimiter) : matches
     else
-      # I will think of good format later...
-      output['message'] = @delimiter ? matches.map{|hash| hash.to_hash}.join(@delimiter) : matches
+      # no 'message' field in the case of regexpN and excludeN
     end
     if tag
       output['input_tag'] = tag

data/spec/out_grepcounter_spec.rb

@@ -8,6 +8,12 @@ class Fluent::Test::OutputTestDriver
   end
 end
 
+class Hash
+  def delete!(key)
+    self.tap {|h| h.delete(key) }
+  end
+end
+
 describe Fluent::GrepCounterOutput do
   before { Fluent::Test.setup }
   CONFIG = %[
@@ -115,12 +121,7 @@ describe Fluent::GrepCounterOutput do
         Fluent::Engine.stub(:now).and_return(time)
         Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected.merge({
           "count"=>3,
-          "message"=>[
-            {"message"=>"2013/01/13T07:02:13.232645 WARN POST /auth"},
-            {"message"=>"2013/01/13T07:02:21.542145 WARN GET /favicon.ico"},
-            {"message"=>"2013/01/13T07:02:43.632145 WARN POST /login"},
-          ],
-        }))
+        }).delete!('message'))
       end
       it { emit }
     end
@@ -146,11 +147,7 @@ describe Fluent::GrepCounterOutput do
         Fluent::Engine.stub(:now).and_return(time)
         Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected.merge({
           "count"=>2,
-          "message"=>[
-            {"message"=>"2013/01/13T07:02:13.232645 WARN POST /auth"},
-            {"message"=>"2013/01/13T07:02:43.632145 WARN POST /login"},
-          ],
-        }))
+        }).delete!('message'))
       end
       it { emit }
     end
@@ -332,7 +329,7 @@ describe Fluent::GrepCounterOutput do
       it { emit }
     end
 
-    context 'delimiter for old style (input_key)' do
+    context 'delimiter' do
       # \\n shall be \n in config file
       let(:config) { CONFIG + %[delimiter \\n] }
       before do
@@ -343,18 +340,6 @@ describe Fluent::GrepCounterOutput do
       it { emit }
     end
 
-    context 'delimiter for new style (regexpN or excludeN)' do
-      # \\n shall be \n in config file
-      let(:config) { %[regexp1 message .\ndelimiter \\n] }
-      before do
-        Fluent::Engine.stub(:now).and_return(time)
-        # I will think of good format later ...
-        message = "{\"message\"=>\"2013/01/13T07:02:11.124202 INFO GET /ping\"}\\n{\"message\"=>\"2013/01/13T07:02:13.232645 WARN POST /auth\"}\\n{\"message\"=>\"2013/01/13T07:02:21.542145 WARN GET /favicon.ico\"}\\n{\"message\"=>\"2013/01/13T07:02:43.632145 WARN POST /login\"}"
-        Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, expected.merge("message" => message))
-      end
-      it { emit }
-    end
-
     context 'aggregate all' do
       let(:messages) { ['foobar', 'foobar'] }
       let(:emit) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grepcounter
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd