fluent-plugin-fortigate-log-parser 0.1.1 → 0.2.0

data/fluent-plugin-fortigate-log-parser.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-fortigate-log-parser"
-  spec.version       = "0.1.1"
+  spec.version       = "0.2.0"
   spec.authors       = ["Yoshinori TERAOKA"]
   spec.email         = ["jyobijyoba@gmail.com"]
   spec.summary       = %q{fluentd plugin for parse FortiGate log}

data/lib/fluent/plugin/out_fortigate_log_parser.rb

@@ -99,14 +99,18 @@ module Fluent
         end
       end
 
+      # rsyslog workaround (remove the unnecessary white space)
+      # rsyslog insert a space (0x20) after first semi-colon
+      # (eg. time=12:34:56 -> time=12: 34:56)
+      record['time'].gsub!(' ', '')
+
       time_str = record['date'] + ' ' + record['time']
       time = nil
 
       if @prev_time && time_str == @prev_time_str
         time = @prev_time
       else
-        # XXX FortiGate BUG (time format)
-        time = Time.strptime(time_str, '%Y-%m-%d %H: %M:%S').to_i
+        time = Time.strptime(time_str, '%Y-%m-%d %H:%M:%S').to_i
         @prev_time = time
         @prev_time_str = time_str
       end

data/test/plugin/test_out_fortigate_log_parser.rb

@@ -57,17 +57,17 @@ class FortigateSyslogParserOutputTest < Test::Unit::TestCase
   def test_emit
     d1 = create_driver(CONFIG)
     d1.run do
-      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23: 59:59,devname=TEST_NAME,devid=TEST_ID,logid=0000000001'})
+      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23:59:59,devname=TEST_NAME,devid=TEST_ID,logid=0000000001'})
     end
     emits = d1.emits
     assert_equal 1, emits.length
     assert_equal '0000000001', emits[0][2]['logid']
   end
 
-  def test_emit_rewrite_tag
+  def test_emit_uri_escape
     d1 = create_driver(CONFIG)
     d1.run do
-      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23: 59:59,file=あああ,filename=いいい'})
+      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23:59:59,file=あああ,filename=いいい'})
     end
     emits = d1.emits
     assert_equal 1, emits.length
@@ -78,7 +78,7 @@ class FortigateSyslogParserOutputTest < Test::Unit::TestCase
   def test_emit_rewrite_tag
     d1 = create_driver(CONFIG_REWRITE_TAG, 'before.test')
     d1.run do
-      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23: 59:59'})
+      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23:59:59'})
     end
     emits = d1.emits
     assert_equal 1, emits.length
@@ -88,7 +88,7 @@ class FortigateSyslogParserOutputTest < Test::Unit::TestCase
   def test_emit_message_key
     d1 = create_driver(CONFIG_MESSAGE_KEY)
     d1.run do
-      d1.emit({'mykey' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23: 59:59,key1=value1,key2=value2'})
+      d1.emit({'mykey' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23:59:59,key1=value1,key2=value2'})
     end
     emits = d1.emits
     assert_equal 1, emits.length
@@ -97,6 +97,16 @@ class FortigateSyslogParserOutputTest < Test::Unit::TestCase
   end
 
   def test_emit_date_parse
+    d1 = create_driver()
+    d1.run do
+      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23:59:59'})
+    end
+    emits = d1.emits
+    assert_equal 1, emits.length
+    assert_equal 1408201199, emits[0][1]
+  end
+
+  def test_rsync_workaround
     d1 = create_driver()
     d1.run do
       d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23: 59:59'})
@@ -109,7 +119,7 @@ class FortigateSyslogParserOutputTest < Test::Unit::TestCase
   def test_emit_country_map
     d1 = create_driver(CONFIG_COUNTRY_MAP)
     d1.run do
-      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23: 59:59,srccountry=Japan,dstcountry=United States'})
+      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23:59:59,srccountry=Japan,dstcountry=United States'})
     end
     emits = d1.emits
     assert_equal 1, emits.length
@@ -122,7 +132,7 @@ class FortigateSyslogParserOutputTest < Test::Unit::TestCase
   def test_emit_os_version4
     d1 = create_driver(CONFIG_OS_VERSION4)
     d1.run do
-      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23: 59:59,src_country=Japan,dst_country=United States'})
+      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23:59:59,src_country=Japan,dst_country=United States'})
     end
     emits = d1.emits
     assert_equal 1, emits.length
@@ -135,7 +145,7 @@ class FortigateSyslogParserOutputTest < Test::Unit::TestCase
   def test_emit_keys
     d1 = create_driver(CONFIG_KEYS)
     d1.run do
-      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23: 59:59,a=A,b=B,c=C,x=X,y=Y,z=Z'})
+      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23:59:59,a=A,b=B,c=C,x=X,y=Y,z=Z'})
     end
     expected = {'a' => 'A', 'b' => 'B', 'c' => 'C'}
     emits = d1.emits
@@ -146,7 +156,7 @@ class FortigateSyslogParserOutputTest < Test::Unit::TestCase
   def test_emit_remove_keys
     d1 = create_driver(CONFIG_REMOVE_KEYS)
     d1.run do
-      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23: 59:59,a=A,b=B,c=C,x=X,y=Y,z=Z'})
+      d1.emit({'message' => 'Aug 17 00:00:00 fortigate date=2014-08-16,time=23:59:59,a=A,b=B,c=C,x=X,y=Y,z=Z'})
     end
     expected = {'x' => 'X', 'y' => 'Y', 'z' => 'Z'}
     emits = d1.emits

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-fortigate-log-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Yoshinori TERAOKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -74,26 +81,27 @@ files:
 homepage: https://github.com/yteraoka/fluent-plugin-fortigate-log-parser
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: fluentd plugin for parse FortiGate log
 test_files:
 - test/helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c33c6ce6da8275fca39ff791e778d17585e2a357
-  data.tar.gz: c91268bdff674aeb2f50fe2d6274211e2fa62a94
-SHA512:
-  metadata.gz: f3c4a395b9f7f71243382e93a875c0e7bb3404382b4e51a79cbd2d790cf99014bac3f805fc74199308f19036b64bfa37ea776487f8ba5d0a67174b335bc7f95e
-  data.tar.gz: a15d3d154bc6ed865b5c3e1a44fc35471491bcc335e134e4296cbb3e2f5374e67afb8d3e4c30d8174f44b09406253e4edcf6a7e2ee64e0bdd0529263da06910b