fluent-plugin-grep 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08a91d586b4f1b69b5859a4b504d6f20a2dcb885
-  data.tar.gz: 8b1e714a1fcc6121d1ea8b5cdbefb88b76866a67
+  metadata.gz: f8ed5698594f518f8856725be943ebe18632086e
+  data.tar.gz: c52945cd2644ff09ec8ca4ed71d3d4196fa76768
 SHA512:
-  metadata.gz: 0abf3dd5a6c4638eb2d27d36435844a164c74f0fc94faf551aa24d8cbccc8b29fdfcb5c4bdec3d3aca71f959fa701b7224cbd2200ca9572e8ef1ad67c8dc1ca9
-  data.tar.gz: c59f53e395fc5b0b14082c14452a977ac49e0ee925cfa32e3c99554c1e4d8a3c89d36c827d7c2e3e2ef08ef44302bcf8d0022522321494738227b02692d472fd
+  metadata.gz: e00ac4165583c2647cf00c1704b8bdc3d0913008ec7f0d2edc2f904b553b8b613770373df37b4575cfb9aeddfae467ac8f032b76d855bb96f2134df1804089e5
+  data.tar.gz: d45ed519f94552d0d84b76da994ef378021566065052e62f46932bc13223bb42b7c896938974c5fa95730b6a9f16fcf9ea570d4134e6226f4a5fd06ee8a900f0

data/.travis.yml

@@ -4,3 +4,4 @@ rvm:
   - 2.0.0
 gemfile:
   - Gemfile
+  - Gemfile.fluentd.lt.0.10.43

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.2 (2014/02/04)
+
+Enhancement:
+
+- Support `log_level` option of Fleuntd v0.10.43
+
 ## 0.3.1 (2013/12/16)
 
 Changes:

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
-gem 'simplecov', git: 'https://github.com/colszowka/simplecov.git'
 gemspec

data/Gemfile.fluentd.lt.0.10.43

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem 'fluentd', '= 0.10.42'
+gemspec

data/README.md

@@ -4,10 +4,13 @@ Fluentd plugin to grep messages.
 
 ## Configuration
 
+### Example 1:
+
     <match foo.bar.**>
       type grep
-      regexp1 message WARN
-      exclude1 message favicon
+      input_key message
+      regexp WARN
+      exclude favicon
       add_tag_prefix greped
     </source>
 
@@ -23,8 +26,43 @@ then output bocomes as belows (like, | grep WARN | grep -v favicon):
     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"}
 
+### Example 2:
+
+Now, `regexpN` and `excludeN` options are available to specify grep conditions for *multiple* fields. 
+
+    <match foo.bar.**>
+      type grep
+      regexp1 message WARN
+      regexp2 foo ^awesome$
+      exclude1 message favicon
+      add_tag_prefix greped
+    </source>
+
+Assuming following inputs are coming:
+
+    foo.bar: {"foo":"bar","message":"2013/01/13T07:02:11.124202 INFO GET /ping"}
+    foo.bar: {"foo":"awesome","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"}
+
+then output bocomes as belows:
+
+    greped.foo.bar: {"foo":"awesome","message":"2013/01/13T07:02:13.232645 WARN POST /auth"}
+
 ## Parameters
 
+- input\_key *field\_key*
+
+    The target field key to grep out. Use with regexp or exclude. 
+
+- regexp *regexp*
+
+    The filtering regular expression
+
+- exclude *regexp*
+
+    The excluding regular expression like grep -v
+
 - regexp[1-20] *field\_key* *regexp*
 
     The target field key and the filtering regular expression to grep out. 
@@ -49,18 +87,6 @@ then output bocomes as belows (like, | grep WARN | grep -v favicon):
 
     Replace invalid byte sequence in UTF-8 with '?' character if `true`
 
-- input\_key *field\_key* (obsolete)
-
-    The target field key to grep out. Use with regexp or exclude. 
-
-- regexp *regexp* (obsolete)
-
-    The filtering regular expression
-
-- exclude *regexp* (obsolete)
-
-    The excluding regular expression like grep -v
-
 ## ChangeLog
 
 See [CHANGELOG.md](CHANGELOG.md) for details.

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.3.1"
+  s.version     = "0.3.2"
   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

@@ -17,6 +17,11 @@ class Fluent::GrepOutput < Fluent::Output
   attr_reader :regexps
   attr_reader :excludes
 
+  # To support log_level option implemented by Fluentd v0.10.43
+  unless method_defined?(:log)
+    define_method("log") { $log }
+  end
+
   def configure(conf)
     super
 
@@ -77,8 +82,8 @@ class Fluent::GrepOutput < Fluent::Output
 
     chain.next
   rescue => e
-    $log.warn e.message
-    $log.warn e.backtrace.join(', ')
+    log.warn e.message
+    log.warn e.backtrace.join(', ')
   end
 
   private

data/spec/out_grep_spec.rb

@@ -236,4 +236,36 @@ describe Fluent::GrepOutput do
       it { emit }
     end
   end
+
+  describe 'test log' do
+    let(:log) { driver.instance.log }
+
+    def capture_log(log)
+      tmp = log.instance_variable_get(:@out)
+      out = StringIO.new
+      log.instance_variable_set(:@out, out)
+      yield log
+      return out.string
+    ensure
+      log.instance_variable_set(:@out, tmp)
+    end
+
+    if Fluent::VERSION >= "0.10.43"
+      context "log_level info" do
+        let(:config) { CONFIG + %[log_level info] }
+
+        it "should not contain debug level" do
+          capture_log(log) {|log| log.debug "foobar" }.should == ""
+        end
+      end
+    end
+
+    context "log" do
+      let(:config) { CONFIG }
+      it "should work" do
+        capture_log(log) {|log| log.info "foobar" }.should include("foobar")
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grep
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -108,6 +108,7 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Gemfile.fluentd.lt.0.10.43
 - LICENSE
 - README.md
 - Rakefile