fluent-plugin-light-core 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c42d7ebbc40db04faa3683d2f19cc13b8faaad30f0a103dcd8284015cf41634
-  data.tar.gz: 7b1dc8dc732a0cdc15a8e9ac124a86a9981dd8a032488b73a6d2f00dc022b229
+  metadata.gz: 6f1224d40e14381a1b11835fcad72d2ae6ef35f8f926c002f4ec08c821090581
+  data.tar.gz: b9141a0a06ea58524df035041c08495434de34aff4991139e3d4f09659270f9d
 SHA512:
-  metadata.gz: 27d1c95d1b34923806055fc51e72f16e13af8c33d6c501aff6b2ad829c65817cfaacfce0ef687a373656738051035478cb4d06d6327666b8fa6adf872192a4d7
-  data.tar.gz: feb76078202bf213d7692ec0cd2a7faef62ce46219e4165ded55e13e9bc3eaaaf43f8de4eb49a5407c926ee6b091bd435fa7f4ce4f1aba5f2b12bc2507c517ad
+  metadata.gz: e4ffc86c4bfa5547ff4100da8f85064b4822d0d80e5e60a052366b13f7c7d92d4dd3d9beba7045d47bf3e2409b1f81cf7fa01c1ae048996d8cb19eb8af0690de
+  data.tar.gz: 652e52d0a38c28c26b4f3e7305a59d8301d53365cfeef0384fcc2abd59b78a6c4073dffb489d37329489e63fa7bb2b4569d45c7e7262d83069b402287c7d4785

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.1"
+  spec.version = "0.1.2"
   spec.authors = ["LIN LI"]
   spec.email   = ["l.li@alphabets.cn"]
 

data/lib/fluent/plugin/filter_light_core.rb

@@ -45,9 +45,9 @@ module Fluent
 
         # Set common items
         record['environment'] = Socket.gethostname.split('-')[0]  # dev | prd
-        record[:cid] = file[0]                                    # container id
-        record[:cname] = file[0].split('-')[1]                    # container name
-        record[:ctime] = record['time']                           # container time
+        record['cid'] = file[0]                                    # container id
+        record['cname'] = file[0].split('-')[1]                    # container name
+        record['ctime'] = record['time']                           # container time
 
         # Delete useless content
         record.delete('log')
@@ -59,12 +59,12 @@ module Fluent
 
           item = /^\[(?<time>[^\]]*)\] \[(?<component>[^\]]*)\] \[(?<levle>[^\]]*)\] (?<line>[^\ ]*) - - (?<uid>[^\ ]*) - (?<message>.*)$/.match(log)
 
-          record[:time] = item[:time]
-          record[:component] = item[:component]
-          record[:levle] = item[:levle]
-          record[:line] = item[:line]
-          record[:uid] = item[:uid]
-          record[:message] = item[:message]
+          record['time'] = item[:time]
+          record['component'] = item[:component]
+          record['levle'] = item[:levle]
+          record['line'] = item[:line]
+          record['uid'] = item[:uid]
+          record['message'] = item[:message]
 
           return record
         end
@@ -74,21 +74,21 @@ module Fluent
 
           item = /^\[(?<time>[^\]]*)\] \[(?<component>[^\]]*)\] \[(?<method>[^\]]*)\] (?<url>[^\ ]*) (?<status>[^\ ]*) (?<size>[^\ ]*) (?<uid>[^\ ]*) (?<elapsed>[^\ ]*) (?<addr>[^\ ]*)$/.match(log)
 
-          record[:time] = item[:time]
-          record[:component] = item[:component]
-          record[:method] = item[:method]
-          record[:url] = item[:url]
-          record[:status] = item[:status]
-          record[:size] = item[:size]
-          record[:uid] = item[:uid]
-          record[:elapsed] = item[:elapsed]
-          record[:addr] = item[:addr].gsub(/\n$/, '')
+          record['time'] = item[:time]
+          record['component'] = item[:component]
+          record['method'] = item[:method]
+          record['url'] = item[:url]
+          record['status'] = item[:status]
+          record['size'] = item[:size]
+          record['uid'] = item[:uid]
+          record['elapsed'] = item[:elapsed]
+          record['addr'] = item[:addr].gsub(/\n$/, '')
 
           return record
         end
 
         # Console log
-        record[:message] = log.gsub(/\n$/, '')
+        record['message'] = log.gsub(/\n$/, '')
         record
       end
 
@@ -99,9 +99,9 @@ module Fluent
         log = record['log']
 
         record['environment'] = Socket.gethostname.split('-')[0]
-        record[:cid] = file[0]
-        record[:cname] = tag
-        record[:ctime] = record['time']
+        record['cid'] = file[0]
+        record['cname'] = tag
+        record['ctime'] = record['time']
 
         record.delete('log')
         record.delete('file')
@@ -111,17 +111,17 @@ module Fluent
         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>[^\"]*)")?/.match(log)
 
-          record[:remote] = item[:remote]
-          record[:host] = item[:host]
-          record[:user] = item[:user]
-          record[:time] = item[:time]
-          record[:method] = item[:method]
-          record[:path] = item[:path]
-          record[:code] = item[:code]
-          record[:size] = item[:size]
-          record[:referer] = item[:referer]
-          record[:agent] = item[:agent]
-          record[:forwarder] = item[:forwarder]
+          record['remote'] = item[:remote]
+          record['host'] = item[:host]
+          record['user'] = item[:user]
+          record['time'] = item[:time]
+          record['method'] = item[:method]
+          record['path'] = item[:path]
+          record['code'] = item[:code]
+          record['size'] = item[:size]
+          record['referer'] = item[:referer]
+          record['agent'] = item[:agent]
+          record['forwarder'] = item[:forwarder]
 
           return record
         end
@@ -130,29 +130,29 @@ module Fluent
         if /^\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2} \[error\]/.match(log)
           item = /^(?<time>[^ ]+ [^ ]+) \[(?<level>.*)\] (?<pid>\d*)#(?<tid>[^:]*): \*(?<cid>\d*) (?<message>.*)$/.match(log)
 
-          record[:time] = item[:time]
-          record[:level] = item[:level]
-          record[:message] = item[:message]
-          record[:process] = item[:pid]     # process id
-          record[:thread] = item[:tid]      # thread id
-          record[:counter] = item[:cid]     # counter
+          record['time'] = item[:time]
+          record['level'] = item[:level]
+          record['message'] = item[:message]
+          record['process'] = item[:pid]     # process id
+          record['thread'] = item[:tid]      # thread id
+          record['counter'] = item[:cid]     # counter
 
           detail = /request: "(?<method>[^ ]*) (?<path>[^"]*)"/.match(item[:message])
           unless detail.nil?
-            record[:method] = detail[:method]
-            record[:path] = detail[:path]
+            record['method'] = detail[:method]
+            record['path'] = detail[:path]
           end
 
           detail = /referrer: "(?<referrer>[^"]*)"/.match(item[:message])
           unless detail.nil?
-            record[:referrer] = detail[:referrer]
+            record['referrer'] = detail[:referrer]
           end
 
           return record
         end
 
         # other log
-        record[:message] = log.gsub(/\n$/, '')
+        record['message'] = log.gsub(/\n$/, '')
         record
       end
 
@@ -163,9 +163,9 @@ module Fluent
         log = record['log']
 
         record['environment'] = Socket.gethostname.split('-')[0]
-        record[:cid] = file[0]
-        record[:cname] = tag
-        record[:ctime] = record['time']
+        record['cid'] = file[0]
+        record['cname'] = tag
+        record['ctime'] = record['time']
 
         record.delete('log')
         record.delete('file')
@@ -175,24 +175,24 @@ module Fluent
 
           item = /^(?<time>[^ ]*) (?<severity>[A-Z])\s* (?<component>(-|([^ ]*)))\s* \[(?<context>[^\]]*)\]\s* ((?<query>.*) (?<querytime>[\d\.]+(?=ms))|(?<message>.*))/.match(log)
 
-          record[:time] = item[:time]
-          record[:severity] = item[:severity]
-          record[:component] = item[:component]
-          record[:context] = item[:context]
+          record['time'] = item[:time]
+          record['severity'] = item[:severity]
+          record['component'] = item[:component]
+          record['context'] = item[:context]
 
           if item[:message]
-            record[:message] = item[:message]
+            record['message'] = item[:message]
             return record
           end
 
           if item[:querytime]
-            record[:querytime] = item[:querytime]
+            record['querytime'] = item[:querytime]
           end
 
           if item[:query]
             query = /^command\s* (?<collection>[^ ]*) (?<command>.*)$/.match(item[:query])
-            record[:collection] = query[:collection]
-            record[:command] = query[:command]
+            record['collection'] = query[:collection]
+            record['command'] = query[:command]
           end
           
           return record

data/sample/README.md

@@ -27,6 +27,4 @@ Initialized empty Git repository in /Users/lilin/developer/light/fluent-plugin-l
 ## 调试
 - 执行fluentd
 
-  % cd sample
-  % fluentd -c source.conf -p ../lib/fluent/plugin
-
+  % fluentd -c sample/source.conf -p lib/fluent/plugin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-light-core
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - LIN LI