fluent-plugin-filter-kv-parser 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17b0a7a0a397bf519d5a7d7688e6a56a7ce775ae1e4a67e13ecd52b1cc3a67d7
-  data.tar.gz: e7c98aada2fbd67bea7d25944df3dda9767147543bbc2dde01d43e778d386103
+  metadata.gz: 8932148ec7a3bfaa0a6241823bda594b85d5a91b24dca0156fb2e7497e4f5eef
+  data.tar.gz: 810626b5c05a84a382719b9bb40393ee3f901b7d3d9b8366114e1b8633e08621
 SHA512:
-  metadata.gz: 7f45b2af88c16bb14832dd974b57ac0bc4bbeaf74e876be73f9a00f1bc7a42026f2980cc6910cef59d6b3711f08ab971d47ead6ffaecc8b9ab6ba13403e64ebf
-  data.tar.gz: 14d852b72aaded4f57511cc2599df34fe21893aa45f52da09dba33a49b03cbb18e54892e520131cce2f381da94c0eaacbe9d6704845b53648b2d502ec0d81e85
+  metadata.gz: 89089861029085470ada61bb7d34bee99d33c46b3d089b56fc840c4f2881a479fab0a31a0f6ea663171d1c3bb5e7eface8cd5e92cd0c57b4769179e55c6ba610
+  data.tar.gz: 8bba97ee414b53f06222af5f6f8bad5ef89e4e2538896a8f9e0a3b5c239ef594f796a7da033843cac4e62f1207eb38591a42827147757c6adfc38f9fdb8cf3b4

data/README.md

@@ -27,6 +27,7 @@ gem install fluent-plugin-filter-kv-parser
   kv_delimiter_chart '='
   filtered_keys akey,bkey,ckey
   filtered_keys_regex /^sub_[a-zA-Z_0-9]+/
+  filter_out_lines_without_keys false
 </filter>
 
 <match **>

data/fluent-plugin-filter-kv-parser.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-filter-kv-parser"
-  s.version     = "0.0.5"
+  s.version     = "0.0.6"
   s.authors     = ["Al-waleed Shihadeh"]
   s.email       = ["wshihadeh.dev@gmail.com"]
   s.homepage    = "https://github.com/wshihadeh/fluent-plugin-filter-kv-parser.git"

data/lib/fluent/plugin/filter_key_value_parser.rb

@@ -7,6 +7,7 @@ module Fluent
 
     config_param :key, :string, default: 'log'
     config_param :remove_key, :bool, default: false
+    config_param :filter_out_lines_without_keys, :bool, default: false
     config_param :use_regex, :bool, default: false
     config_param :remove_prefix, :string, default: ''
     config_param :keys_delimiter, :string, default: '/\s+/'
@@ -39,9 +40,11 @@ module Fluent
     def filter(tag, time, record)
       return if record[@key].nil?
 
-      log_line = extract_log_line record[@key]
+      keys = extracted_keys(extract_log_line(record[@key]))
 
-      record.merge! extracted_keys(log_line)
+      return if @filter_out_lines_without_keys && keys.empty?
+
+      record.merge! keys
       record.tap { |r| r.delete(@key) if @remove_key }.compact
     end
 

data/test/test_filter_key_value_parser.rb

@@ -188,4 +188,28 @@ class KeyValueFilterTest < Test::Unit::TestCase
     assert_equal "0", filtered['sub_key']
     assert_equal false,  filtered.key?("log")
   end
+
+  test 'test_filter_out_lines_without_keys' do
+    d = create_driver(%[
+        key log
+        remove_key true
+        use_regex true
+        filtered_keys_regex /^sub_[a-zA-Z_0-9]+/
+        filter_out_lines_without_keys true
+      ])
+    msg = {
+      'time' => '2013-02-12 22:01:15 UTC',
+      'log'  => "akey=10 bkey=11 ckey=11",
+    }
+
+    msg2 = {
+      'time' => '2013-02-12 22:01:15 UTC',
+      'log'  => "Start Request to test lines without any keys",
+    }
+    filtered = filter(d, [msg, msg2])
+
+    assert_equal 1, filtered.count
+    assert_equal 4, filtered.first[2].count
+    assert_equal "10", filtered.first[2]['akey']
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter-kv-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Al-waleed Shihadeh