fluent-plugin-grepcounter 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55fb88fa0e4693f083e614072f4e4b39a977e4dc
-  data.tar.gz: 6a34586f73d49333d97fddd3ce51c33c2033c40b
+  metadata.gz: cceea9a84d43542c30eda8ae0b2d3127d3a8ee8a
+  data.tar.gz: ed10007f880499d164493b9c42a5edaefb0525c4
 SHA512:
-  metadata.gz: 01453ec71582eaed4d7a0d505dbcbfd93e3708debf9766ecb6c820679d5e85c4a1db0d8290981db628abc1fd6fc0d3ace701d097ee72ad57f722c178f1f1d65e
-  data.tar.gz: d3634e8a26b8dd3dbb04031248bc695c920d1987b7e2b62491cf36a5acd039d2ac683a19169025c7e795a360ca78d93890ffcccd15b9ccb7574cf7eda1ca15d7
+  metadata.gz: 66b848914ad05a5f45ddc55cdd3e3e0c01dbd5046879cd1bef6a910f194e23cf6b3ce631a9b008b03d0ce5fc27747e64b049ed10d08ce7768334250c637014b3
+  data.tar.gz: f5f6c761d747e58dc7ed9f14e94383221e7476376bf1764e22ac777e14c42aa86d54f538fe77a35ce1e2ad01748ce70164543e44a1faf0e42677b7c441c55b80

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.3 (20130617)
+
+Features
+
+  - comparison
+
 ## 0.1.2 (2013/05/16)
 
 Features

data/README.md

@@ -45,7 +45,7 @@ Another example of grepcounter configuration to use `output_with_joined_delimite
       output_with_joined_delimiter \n
     </source>
 
-Then, output bocomes as belows (indented). You can use the `message` field is joined with \n.
+Then, output bocomes as belows (indented). You can see the `message` field is joined with \n.
 
     warn.count.syslog.host1: {
       "count":2,
@@ -56,14 +56,50 @@ Then, output bocomes as belows (indented). You can use the `message` field is jo
 
 ## Parameters
 
+- count\_interval
+
+    The interval time to count in seconds. Default is 60.
+
+- input\_key
+
+    The target field key to grep out
+
+- regexp
+
+    The filtering regular expression
+
+- exclude
+
+    The excluding regular expression like grep -v
+
+- threshold
+
+    The threshold number to emit
+
+- comparison
+
+    The comparison operator for the threshold (either of `>=` or `<=`). Default is `>=`, i.e., emit if count >= threshold. 
+
+- output\_with\_joined\_delimiter
+
+    Join the output message array field with the specified delimiter to make the output message be a string. 
+
 - aggregate
 
     Count by each `tag` or `all`. The default value is `tag`. 
 
-- output_tag
+- output\_tag
 
     The output tag. Required for aggregate `all`. 
 
+- add\_tag\_prefix
+
+    Add tag prefix for output message
+
+- replace\_invalid\_sequence
+
+    Replace invalid byte sequence in UTF-8 with '?' character if `true`
+
 ## ChaangeLog
 
 See [CHANGELOG.md](CHANGELOG.md) for details.

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.1.2"
+  s.version     = "0.1.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

@@ -7,6 +7,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
   config_param :count_interval, :time, :default => 5
   config_param :exclude, :string, :default => nil
   config_param :threshold, :integer, :default => 1
+  config_param :comparison, :string, :default => '>='
   config_param :output_tag, :string, :default => nil
   config_param :add_tag_prefix, :string, :default => 'count'
   config_param :output_with_joined_delimiter, :string, :default => nil
@@ -25,15 +26,19 @@ class Fluent::GrepCounterOutput < Fluent::Output
     @exclude = Regexp.compile(@exclude) if @exclude
     @threshold = @threshold.to_i
 
+    unless ['>=', '<='].include?(@comparison)
+      raise Fluent::ConfigError, "grepcounter: comparison allows >=, <="
+    end
+
     unless ['tag', 'all'].include?(@aggregate)
-      raise Fluent::ConfigError, "grepcounter aggregate allows tag/all"
+      raise Fluent::ConfigError, "grepcounter: aggregate allows tag/all"
     end
 
     case @aggregate
     when 'all'
-      raise Fluent::ConfigError, "output_tag must be specified with aggregate all" if @output_tag.nil?
+      raise Fluent::ConfigError, "grepcounter: output_tag must be specified with aggregate all" if @output_tag.nil?
     when 'tag'
-      # raise Fluent::ConfigError, "add_tag_prefix must be specified with aggregate tag" if @add_tag_prefix.nil?
+      # raise Fluent::ConfigError, "grepcounter: add_tag_prefix must be specified with aggregate tag" if @add_tag_prefix.nil?
     end
 
     @matches = {}
@@ -72,8 +77,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
 
     chain.next
   rescue => e
-    $log.warn e.message
-    $log.warn e.backtrace.join(', ')
+    $log.warn "grepcounter: #{e.class} #{e.message} #{e.backtrace.first}"
   end
 
   # thread callback
@@ -89,8 +93,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
           @last_checked = now
         end
       rescue => e
-        $log.warn e.message
-        $log.warn e.backtrace.join(", ")
+        $log.warn "grepcounter: #{e.class} #{e.message} #{e.backtrace.first}"
       end
     end
   end
@@ -121,7 +124,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
 
   def generate_output(count, matches, tag = nil)
     return nil if count.nil?
-    return nil if count < @threshold
+    return nil unless eval("#{count} #{@comparison} #{@threshold}")
     output = {}
     output['count'] = count
     output['message'] = @output_with_joined_delimiter.nil? ? matches : matches.join(@output_with_joined_delimiter)

data/spec/out_grepcounter_spec.rb

@@ -40,6 +40,15 @@ describe Fluent::GrepCounterOutput do
         end
         it { expect { driver }.to raise_error(Fluent::ConfigError) }
       end
+
+      context 'invalid comparison' do
+        let(:config) do
+          CONFIG + %[
+          comparison foo
+          ]
+        end
+        it { expect { driver }.to raise_error(Fluent::ConfigError) }
+      end
     end
 
     describe 'good configuration' do
@@ -52,6 +61,7 @@ describe Fluent::GrepCounterOutput do
         its(:regexp) { should be_nil }
         its(:exclude) { should be_nil }
         its(:threshold) { should == 1 }
+        its(:comparison) { should == '>=' }
         its(:output_tag) { should be_nil }
         its(:add_tag_prefix) { should == 'count' }
       end
@@ -121,7 +131,7 @@ describe Fluent::GrepCounterOutput do
       it { emit }
     end
 
-    context 'threshold (less than or equal to)' do
+    context 'threshold (hit)' do
       let(:config) do
         CONFIG + %[
           regexp WARN
@@ -139,7 +149,7 @@ describe Fluent::GrepCounterOutput do
       it { emit }
     end
 
-    context 'threshold (greater)' do
+    context 'threshold (miss)' do
       let(:config) do
         CONFIG + %[
           regexp WARN
@@ -248,6 +258,42 @@ describe Fluent::GrepCounterOutput do
       end
       it { expect { emit }.not_to raise_error(ArgumentError) }
     end
+
+    describe "comparison <=" do
+      context 'threshold (hit)' do
+        let(:config) do
+          CONFIG + %[
+          regexp WARN
+          threshold 3
+          comparison <=
+          ]
+        end
+        before do
+          Fluent::Engine.stub(:now).and_return(time)
+          Fluent::Engine.should_receive(:emit).with("count.#{tag}", time, {"count"=>3,
+            "message"=>["2013/01/13T07:02:13.232645 WARN POST /auth","2013/01/13T07:02:21.542145 WARN GET /favicon.ico","2013/01/13T07:02:43.632145 WARN POST /login"],
+            "input_tag" => tag,
+            "input_tag_last" => tag.split('.').last,
+          })
+        end
+        it { emit }
+      end
+
+      context 'threshold (miss)' do
+        let(:config) do
+          CONFIG + %[
+          regexp WARN
+          threshold 2
+          comparison <=
+          ]
+        end
+        before do
+          Fluent::Engine.stub(:now).and_return(time)
+          Fluent::Engine.should_not_receive(:emit)
+        end
+        it { emit }
+      end
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grepcounter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Naotoshi SEO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-grepcounter
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Count the number of matched messages