fluent-plugin-light-core 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c4d041335b9467160fedaea9bce6fb75eff175f37de2038206d2440ecc1bfae
-  data.tar.gz: c14749f93a1ecdc0cb44cf73fd16623d506c772e0a2eb0a6189f0e0def12e4b9
+  metadata.gz: f402d3e7add5f4132e862aad254907c08f73068b8e92b4cf82f12c7e64fc01d7
+  data.tar.gz: a03cc3f47b6061a4567f7467d2786dac007e28deede646d511a5de7a58040796
 SHA512:
-  metadata.gz: fb375db84158ad07ba34fd4bf85e91e6ff40f1d279a54fa3d1b4ff2d2b3690161b6e829e194a7135cd7df3f82122b964ccefd1a9ceb5a70d35901a00bddf4bfa
-  data.tar.gz: 775c489403bcd59b1ac1d4591594a2fd3ad2585fa080a6c25403d9104c8f94c3e6725fb271574bfb2c185ca174f829cd5bf7f9d829a5c9891784f9c70f1b1338
+  metadata.gz: 3ffb7670974e375d66d460237f94de74e2f10d308e72d4b9e2cf62c7fc9113da24e957fad8a17a9af81f8f9b2ac32b93775e3ea24cfa7e4c820e14ccda1347b0
+  data.tar.gz: 5ca326bae0e725610ddf20775db3cb254217497544d60ffbe3f5f4a5d0ecd6176e2b5c3595a65e2abfdd670cd269ec590196c346eb38a6fac7ab658a6ae4eccd

data/fluent-plugin-light-core.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-light-core"
-  spec.version = "0.1.7"
+  spec.version = "0.1.8"
   spec.authors = ["LIN LI"]
   spec.email   = ["l.li@alphabets.cn"]
 

data/lib/fluent/plugin/filter_light_core.rb

@@ -158,7 +158,7 @@ module Fluent
         
         # access log
         if /^[^ ]+ [^ ]+ [^ ]+ \[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2}\]/.match(log)
-          item = /^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^ ]*) +\S*)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)" "(?<forwarder>[^\"]*)" "(?<elapsed>[^\"]*)")?/.match(log)
+          item = /^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^ ]*) +\S*)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)" "(?<elapsed>[^\"]*)" "(?<requestid>[^\"]*)" "(?<sessionid>[^\"]*)")?/.match(log)
 
           record['remote'] = item[:remote]
           record['host'] = item[:host]
@@ -170,8 +170,9 @@ module Fluent
           record['size'] = format_str(item[:size])
           record['referer'] = item[:referer]
           record['agent'] = item[:agent]
-          record['forwarder'] = item[:forwarder]
           record['elapsed'] = format_str(item[:elapsed])
+          record['requestid'] = item[:requestid]
+          record['sessionid'] = item[:sessionid]
 
           return record
         end

data/sample/source.conf

@@ -14,8 +14,8 @@
 
 <source>
   @type            tail
-  path             sample/lb*.log
-  pos_file         sample/source.lb.pos
+  path             sample/ingress-nginx*.log
+  pos_file         sample/source.ingress-nginx.pos
   tag              lb
   format           json
   read_from_head   true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-light-core
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - LIN LI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler