fluent-plugin-light-core 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 262f7c2b69259e409b93285c4138386a24d7ee2d12d81f120ef1306875d0d701
-  data.tar.gz: 19ecb1abd1e754ffe2da66f72c8cb211fe81aa5a4e3543c742f63d6ee121a474
+  metadata.gz: f402d3e7add5f4132e862aad254907c08f73068b8e92b4cf82f12c7e64fc01d7
+  data.tar.gz: a03cc3f47b6061a4567f7467d2786dac007e28deede646d511a5de7a58040796
 SHA512:
-  metadata.gz: a39111482eb7fcd051f14f92d4a6f062df5f9673f0a474c2c26ea5c73ba25074a2e13237ae3dc9c67e9ec2743009c4cc59a63476dd20a98883151fb691e62090
-  data.tar.gz: de9645e74a662f9b5be93e4bdfb7141f8e473c27dff352755f7dca683ced2d505a2a7188270ef5a0a540e1a15f1bce8f5fcb15eaa963efeca89994397eb56abb
+  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.3"
+  spec.version = "0.1.8"
   spec.authors = ["LIN LI"]
   spec.email   = ["l.li@alphabets.cn"]
 

data/lib/fluent/plugin/filter_light_core.rb

@@ -67,7 +67,7 @@ module Fluent
       # 主处理
       def filter(tag, time, record)
 
-        if tag == 'app'
+        if ['app', 'service'].include? tag
           record = filter_app(tag, time, record)
           return notice('app', record)
         end
@@ -88,11 +88,12 @@ module Fluent
 
       # Parse the application log
       def filter_app(tag, time, record)
-        file = record['file'].split('/').last.split('_')          # Parse log file name
-        log = record['log']                                       # Get detailed log content
+        file = record['file'].split('/').last.split('_')           # Parse log file name
+        log = record['log']                                        # Get detailed log content
 
         # Set common items
-        record['environment'] = Socket.gethostname.split('-')[0]  # dev | prd
+        # record['environment'] = Socket.gethostname.split('-')[0] # dev | prd
+        record['environment'] = ENV['FLUENTD_ENV']                 # dev | prd
         record['cid'] = file[0]                                    # container id
         record['cname'] = file[0].split('-')[1]                    # container name
         record['ctime'] = record['time']                           # container time
@@ -127,9 +128,9 @@ module Fluent
           record['method'] = item[:method]
           record['url'] = item[:url]
           record['status'] = item[:status]
-          record['size'] = item[:size]
+          record['size'] = format_str(item[:size])
           record['uid'] = item[:uid]
-          record['elapsed'] = item[:elapsed]
+          record['elapsed'] = format_str(item[:elapsed])
           record['addr'] = item[:addr].gsub(/\n$/, '')
 
           return record
@@ -146,7 +147,7 @@ module Fluent
         file = record['file'].split('/').last.split('_')
         log = record['log']
 
-        record['environment'] = Socket.gethostname.split('-')[0]
+        record['environment'] = ENV['FLUENTD_ENV']
         record['cid'] = file[0]
         record['cname'] = tag
         record['ctime'] = record['time']
@@ -157,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]
@@ -166,11 +167,12 @@ module Fluent
           record['method'] = item[:method]
           record['path'] = item[:path]
           record['code'] = item[:code]
-          record['size'] = item[:size]
+          record['size'] = format_str(item[:size])
           record['referer'] = item[:referer]
           record['agent'] = item[:agent]
-          record['forwarder'] = item[:forwarder]
-          record['elapsed'] = item[:elapsed]
+          record['elapsed'] = format_str(item[:elapsed])
+          record['requestid'] = item[:requestid]
+          record['sessionid'] = item[:sessionid]
 
           return record
         end
@@ -211,7 +213,7 @@ module Fluent
         file = record['file'].split('/').last.split('_')
         log = record['log']
 
-        record['environment'] = Socket.gethostname.split('-')[0]
+        record['environment'] = ENV['FLUENTD_ENV']
         record['cid'] = file[0]
         record['cname'] = tag
         record['ctime'] = record['time']
@@ -235,13 +237,16 @@ module Fluent
           end
 
           if item[:querytime]
-            record['querytime'] = item[:querytime]
+            record['querytime'] = format_str(item[:querytime])
           end
 
           if item[:query]
+            record['command'] = item[:query]
             query = /^command\s* (?<collection>[^ ]*) (?<command>.*)$/.match(item[:query])
-            record['collection'] = query[:collection]
-            record['command'] = query[:command]
+            unless query.nil?
+              record['collection'] = query[:collection]
+              record['command'] = query[:command]
+            end
           end
           
           return record
@@ -328,6 +333,13 @@ module Fluent
         @udp.send(data.to_json, 0, Socket.pack_sockaddr_in(@port, @host))
       end
 
+      # 转数字
+      def format_str(str)
+        return str.to_i if (str =~ /^\d+$/)
+        return str.to_f if (str =~ /^\d+\.\d+$/)
+        str
+      end
+
     end
   end
 end

data/sample/README.md

@@ -21,7 +21,10 @@ Initialized empty Git repository in /Users/lilin/developer/light/fluent-plugin-l
 	% gem signin
 	
 - 发布
-	rake release
+  1. 删除pkg目录下的所有内容
+  2. 修改 fluent-plugin-light-core.gemspec 中的 spec.version
+  3. 提交所有的修改
+	4. 执行打包发布 $ rake release
 
 
 ## 调试

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.3
+  version: 0.1.8
 platform: ruby
 authors:
 - LIN LI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler