fluent-plugin-grep 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01c08ca3372864d443be685dbe0ef91252644612
-  data.tar.gz: 6f7ec217ec20b890536a09de99a7fc28261c69e5
+  metadata.gz: 7499ce546c2a6ac26dc827f92d09132e7c31d3c6
+  data.tar.gz: 28fc3c637fa0827a1d89c446b657c21a28bf787c
 SHA512:
-  metadata.gz: 7b9b72ba0eb1ae64d472f18f8c57afb53ec0f7383f20d5a2c68bd7face9eac46761376542d79b40206fe2acdfb36e786dd8008020153c7021a911c0300d1f24b
-  data.tar.gz: 444709c11deead3423c8b5601744ecf6b420f1f95277b4fb2ff10627875a5172b52023425d5da8fd11a7619139b0fb69961f0c7a344e2bf25dbfb3b0e79185f0
+  metadata.gz: db775624601c8d159c1c9fd20844b2cc6439057e973a7adf6bb29229e4d3a9bcb25371bccf9b9d7a8fbba7344a347edcf7f89b80ca0c31041cb10ef5822a6f79
+  data.tar.gz: d873314ee6ff2b8689de0680961d2171cd65a22a6313de4d42554fff998d7fa1c814c150fce94f3a9f33e6f8ead0ffdced273e7a226a5113465a703a871430e3

data/CHANGELOG.md

@@ -1,9 +1,19 @@
-## 0.0.2
+## 0.0.3 (2013/05/14)
+
+Features:
+
+- Support to grep non-string jsonable values as a string
+
+Changes:
+
+- Default tag prefix from `grep` to `greped`. 
+
+## 0.0.2 (2013/05/02)
 
 Features:
 
 - Add `replace_invalid_sequence` option
 
-## 0.0.1
+## 0.0.1 (2013/05/02)
 
 First version

data/README.md

@@ -4,30 +4,48 @@ Fluentd plugin to grep messages.
 
 ## Configuration
 
-Assume inputs from another plugin are as belows:
-
-    syslog.host1: {"foo":"bar","message":"2013/01/13T07:02:11.124202 INFO GET /ping"}
-    syslog.host1: {"foo":"bar","message":"2013/01/13T07:02:13.232645 WARN POST /auth"}
-    syslog.host1: {"foo":"bar","message":"2013/01/13T07:02:21.542145 WARN GET /favicon.ico"}
-    syslog.host1: {"foo":"bar","message":"2013/01/13T07:02:43.632145 WARN POST /login"}
-
-An example of grep configuration:
-
     <match syslog.**>
       type grep
       input_key message
       regexp WARN
       exclude favicon.ico
-      add_tag_prefix grep
+      add_tag_prefix greped
     </source>
 
-Then, output bocomes as belows:
+Assuming following inputs are coming:
+
+    foo.bar: {"foo":"bar","message":"2013/01/13T07:02:11.124202 INFO GET /ping"}
+    foo.bar: {"foo":"bar","message":"2013/01/13T07:02:13.232645 WARN POST /auth"}
+    foo.bar: {"foo":"bar","message":"2013/01/13T07:02:21.542145 WARN GET /favicon.ico"}
+    foo.bar: {"foo":"bar","message":"2013/01/13T07:02:43.632145 WARN POST /login"}
 
-    grep.syslog.host1: {"foo":"bar","message":"2013/01/13T07:02:13.232645 WARN POST /auth"}
-    grep.syslog.host1: {"foo":"bar","message":"2013/01/13T07:02:43.632145 WARN POST /login"}
+then output bocomes as belows (like, | grep WARN | grep -v favicon.ico):
+
+    greped.foo.bar: {"foo":"bar","message":"2013/01/13T07:02:13.232645 WARN POST /auth"}
+    greped.foo.bar: {"foo":"bar","message":"2013/01/13T07:02:43.632145 WARN POST /login"}
 
 ## Parameters
 
+- input_key
+
+    The target field key to grep out
+
+- regexp
+
+    The filtering regular expression
+
+- exclude
+
+    The excluding regular expression like grep -v
+
+- tag
+
+    The output tag name
+
+- add_tag_prefix
+
+    Add tag prefix for output message
+
 - replace_invalid_sequence
 
     Replace invalid byte sequence in UTF-8 with '?' character if `true`

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.0.2"
+  s.version     = "0.0.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

@@ -5,7 +5,7 @@ class Fluent::GrepOutput < Fluent::Output
   config_param :regexp, :string, :default => nil
   config_param :exclude, :string, :default => nil
   config_param :tag, :string, :default => nil
-  config_param :add_tag_prefix, :string, :default => 'grep'
+  config_param :add_tag_prefix, :string, :default => 'greped'
   config_param :replace_invalid_sequence, :bool, :default => false
 
   def configure(conf)
@@ -21,11 +21,14 @@ class Fluent::GrepOutput < Fluent::Output
 
     es.each do |time,record|
       value = record[@input_key]
-      next unless match(value)
+      next unless match(value.to_s)
       Fluent::Engine.emit(emit_tag, time, record)
     end
 
     chain.next
+  rescue => e
+    $log.warn e.message
+    $log.warn e.backtrace.join(', ')
   end
 
   private

data/spec/out_grep_spec.rb

@@ -26,7 +26,7 @@ describe Fluent::GrepOutput do
         its(:regexp) { should be_nil }
         its(:exclude) { should be_nil }
         its(:tag) { should be_nil }
-        its(:add_tag_prefix) { should == 'grep' }
+        its(:add_tag_prefix) { should == 'greped' }
       end
     end
   end
@@ -49,10 +49,10 @@ describe Fluent::GrepOutput do
       let(:config) { CONFIG }
       before do
         Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("grep.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
-        Fluent::Engine.should_receive(:emit).with("grep.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:13.232645 WARN POST /auth"})
-        Fluent::Engine.should_receive(:emit).with("grep.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:21.542145 WARN GET /favicon.ico"})
-        Fluent::Engine.should_receive(:emit).with("grep.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:43.632145 WARN POST /login"})
+        Fluent::Engine.should_receive(:emit).with("greped.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
+        Fluent::Engine.should_receive(:emit).with("greped.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:13.232645 WARN POST /auth"})
+        Fluent::Engine.should_receive(:emit).with("greped.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:21.542145 WARN GET /favicon.ico"})
+        Fluent::Engine.should_receive(:emit).with("greped.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:43.632145 WARN POST /login"})
       end
       it { emit }
     end
@@ -65,9 +65,9 @@ describe Fluent::GrepOutput do
       end
       before do
         Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("grep.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:13.232645 WARN POST /auth"})
-        Fluent::Engine.should_receive(:emit).with("grep.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:21.542145 WARN GET /favicon.ico"})
-        Fluent::Engine.should_receive(:emit).with("grep.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:43.632145 WARN POST /login"})
+        Fluent::Engine.should_receive(:emit).with("greped.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:13.232645 WARN POST /auth"})
+        Fluent::Engine.should_receive(:emit).with("greped.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:21.542145 WARN GET /favicon.ico"})
+        Fluent::Engine.should_receive(:emit).with("greped.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:43.632145 WARN POST /login"})
       end
       it { emit }
     end
@@ -80,9 +80,9 @@ describe Fluent::GrepOutput do
       end
       before do
         Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("grep.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
-        Fluent::Engine.should_receive(:emit).with("grep.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:13.232645 WARN POST /auth"})
-        Fluent::Engine.should_receive(:emit).with("grep.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:43.632145 WARN POST /login"})
+        Fluent::Engine.should_receive(:emit).with("greped.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
+        Fluent::Engine.should_receive(:emit).with("greped.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:13.232645 WARN POST /auth"})
+        Fluent::Engine.should_receive(:emit).with("greped.#{tag}", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:43.632145 WARN POST /login"})
       end
       it { emit }
     end
@@ -134,7 +134,40 @@ describe Fluent::GrepOutput do
     end
   end
 
-end
+  describe 'grep non-string jsonable values' do
+    let(:config) { CONFIG + %[regexp 0] }
+    let(:message) { 0 }
+    let(:time) { Time.now.to_i }
+    let(:emit) { driver.run { driver.emit({'foo'=>'bar', 'message' => message}, time) } }
+    before do
+      Fluent::Engine.stub(:now).and_return(time)
+      Fluent::Engine.should_receive(:emit).with("greped.#{tag}", time, {'foo'=>'bar', 'message'=>message})
+    end
 
+    context "array" do
+      let(:message) { ["0"] }
+      it { emit }
+    end
 
+    context "hash" do
+      let(:message) { ["0"=>"0"] }
+      it { emit }
+    end
 
+    context "integer" do
+      let(:message) { 0 }
+      it { emit }
+    end
+
+    context "float" do
+      let(:message) { 0.1 }
+      it { emit }
+    end
+
+    context "boolean" do
+      let(:config) { CONFIG + %[regexp true] }
+      let(:message) { true }
+      it { emit }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grep
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Naotoshi SEO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd