fluent-plugin-light-core 0.1.9 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2433cbe7616d4740d7722d4438d18c91aa599db380962943e368af9277b3cd2c
-  data.tar.gz: f8cb6f8a1f512b55b4d6340101363ad88c536f8983c9cbe7a644ab1cbc25f325
+  metadata.gz: a553d56fc47ba8c7ae49428e3d60a5180bb90a9d3b355ebec22b6983265249a9
+  data.tar.gz: b27775457e6b5cea4f80a6d83095460ef2d59087648ef683331615a90e4a2fce
 SHA512:
-  metadata.gz: '08df5f1170b4f9f23e24c05883154af18d74146afaa8f3eca8e96b5d462d241a2115c6ea3fd424cf4da070d86e4bf4ff64d0bf1c637c3d4f20a691c81793fbe1'
-  data.tar.gz: 69bbf8f5dc12be010404a76214576324febb1ae1cba9781279641f0b29e9362e7f3abc0a19daeb2876c30d84bb86f76305a7f3b0a983765831c3e386de6b7791
+  metadata.gz: 69e2cf2089fb5be1cc62fcdbe86498b1711c0e5bea39767044d9b3e2e853026ec9a0f122609c05b79e57e58f6d74f7fc924563e56526d9ecdde61ec4631dde27
+  data.tar.gz: e384dadbc0567ac19f7013209aa43441981c0aedb85bfa9381b86118422956b839d218b6a2b8083dc5ae9af93ed503d8ecc181afae6de952e148fff1d640bf4c

data/Gemfile

@@ -1,3 +1,5 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "sentry-ruby"

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.9"
+  spec.version = "0.2.3"
   spec.authors = ["LIN LI"]
   spec.email   = ["l.li@alphabets.cn"]
 
@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "test-unit", "~> 3.0"
   spec.add_runtime_dependency "fluentd", [">= 0.14.10", "< 2"]
+  spec.add_runtime_dependency "sentry-ruby", [">= 4.1.5", "< 5"]
 end

data/lib/fluent/plugin/filter_light_core.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 require 'fluent/plugin/filter'
-require 'socket'
 require 'json'
+require 'sentry-ruby'
 
 module Fluent
   module Plugin
@@ -23,9 +23,8 @@ module Fluent
       Fluent::Plugin.register_filter('light_core', self)
 
       # 通知相关配置
-      config_param :notice, :bool,    default: false
-      config_param :port,   :integer, default: 7000
-      config_param :host,   :string,  default: '255.255.255.255'
+      config_param :sentry,     :bool,   default: false
+      config_param :sentry_dsn, :string, default: ''
 
       # Application 异常 settings 
       config_param :app_stream,  :string, default: 'stderr'
@@ -35,32 +34,36 @@ module Fluent
 
       # Nginx 异常 settings 
       config_param :lb_stream,  :string, default: 'stderr'
-      config_param :lb_code,    :array,  default: ['500'], value_type: :string
-      config_param :lb_elapsed, :float,  default: 3000
+      config_param :lb_code,    :array,  default: ['400', '500'], value_type: :string
+      config_param :lb_elapsed, :float,  default: 3
+      config_param :lb_ignore,  :array,  default: [], value_type: :string
 
       # MongoDB 异常 settings 
       config_param :mongo_severity,  :array, default: ['F', 'E'], value_type: :string
       config_param :mongo_querytime, :float, default: 100
 
-      # 初始化UDP实例
+      # 初始化 Sentry
       def start
         super
 
-        if @notice
-          log.info('init udp connection')
-          @udp = UDPSocket.open()
-          @udp.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, 1)
+        if @sentry
+          log.info('init sentry')
+          Sentry.init do |config|
+            config.dsn = @sentry_dsn
+          
+            # To activate performance monitoring, set one of these options.
+            # We recommend adjusting the value in production:
+            config.traces_sample_rate = 1
+
+            # config.background_worker_threads = 2
+            config.transport.timeout = 10
+            config.transport.open_timeout = 10
+          end
         end
       end
 
-      # 清理UDP连接
+      # 清理
       def shutdown
-
-        if @notice
-          log.info('close udp connection')
-          @udp.close if @udp
-        end
-
         super
       end
 
@@ -128,9 +131,9 @@ module Fluent
           record['method'] = item[:method]
           record['url'] = item[:url]
           record['status'] = item[:status]
-          record['size'] = format_str(item[:size])
+          record['size'] = str_to_num(item[:size])
           record['uid'] = item[:uid]
-          record['elapsed'] = format_str(item[:elapsed])
+          record['elapsed'] = str_to_num(item[:elapsed])
           record['addr'] = item[:addr].gsub(/\n$/, '')
 
           return record
@@ -167,10 +170,10 @@ module Fluent
           record['method'] = item[:method]
           record['path'] = item[:path]
           record['code'] = item[:code]
-          record['size'] = format_str(item[:size])
+          record['size'] = str_to_num(item[:size])
           record['referer'] = item[:referer]
           record['agent'] = item[:agent]
-          record['elapsed'] = format_str(item[:elapsed])
+          record['elapsed'] = str_to_num(item[:elapsed])
           record['requestid'] = item[:requestid]
           record['sessionid'] = item[:sessionid]
 
@@ -181,7 +184,7 @@ 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['time'] = record['ctime']
           record['level'] = item[:level]
           record['message'] = item[:message]
           record['process'] = item[:pid]     # process id
@@ -222,107 +225,82 @@ module Fluent
         record.delete('file')
         record.delete('time')
 
-        # 旧版本日志格式解析
-        if /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}\+\d{4} [A-Z]/.match(log)
-
-          item = /^(?<time>[^ ]*) (?<severity>[A-Z])\s* (?<component>(-|([^ ]*)))\s* \[(?<context>[^\]]*)\]\s* ((?<query>.*) protocol:op_query (?<querytime>[\d\.]+(?=ms))|(?<message>.*))/.match(log)
-
-          record['time'] = item[:time]
-          record['severity'] = item[:severity]
-          record['component'] = item[:component]
-          record['context'] = item[:context]
-
-          if item[:message]
-            record['message'] = item[:message]
-            return record
-          end
-
-          if item[:querytime]
-            record['querytime'] = format_str(item[:querytime])
-          end
-
-          if item[:query]
-            record['command'] = item[:query]
-            query = /^command\s* (?<collection>[^ ]*) (?<command>.*)$/.match(item[:query])
-            unless query.nil?
-              record['collection'] = query[:collection]
-              record['command'] = query[:command]
-            end
-          end
-          
-          return record
-        else
-
-          # 版本4.4开始，默认日志为json格式
-          item = JSON.parse(log)
-          record['time'] = item['t']['$date']
-          record['severity'] = item['s']
-          record['component'] = item['c']
-          record['context'] = item['ctx']
-          record['identifier'] = item['id']
-          record['message'] = item['msg']
-
-          attributes = item['attr']
-          if attributes
-            record['querytime'] = attributes['durationMillis']
-            record['collection'] = attributes['ns']
-            record['command'] = attributes['command']
-            record['attr'] = attributes
-          end
-
-          record['tags'] = item['tags']
-          record['truncated'] = item['truncated']
-          record['size'] = item['size']
-        
-          return record
+        # 版本4.4开始，默认日志为json格式
+        item = JSON.parse(log)
+        record['time'] = item['t']['$date']
+        record['severity'] = item['s']
+        record['component'] = item['c']
+        record['context'] = item['ctx']
+        record['identifier'] = item['id']
+        record['message'] = item['msg']
+
+        attributes = item['attr']
+        if attributes
+          record['querytime'] = attributes['durationMillis']
+          record['collection'] = attributes['ns']
+          record['command'] = attributes['command']
+          record['attr'] = attributes
         end
 
+        record['tags'] = item['tags']
+        record['truncated'] = item['truncated']
+        record['size'] = item['size']
         record
       end
 
       # 确认是否发送通知
       def notice(tag, record)
 
-        unless @notice
+        unless @sentry
           return record
         end
 
         if tag == 'app'
+
           if @app_stream && record['stream']
-            send(record) if record['stream'] == @app_stream
+            send(tag, record['message'], record) if record['stream'] == @app_stream
           end
 
           if @app_message.length > 0 && record['message']
             @app_message.each do |pattern|
               if pattern.match(record['message'])
-                send(record)
+                send(tag, record['message'], record)
                 break
               end
             end
           end
 
           if @app_status.length > 0 && record['status']
-            send(record) if @app_status.include?(record['status'])
+            message = 'Status code abnormal : ' + record['url']
+            send(tag, message, record) if @app_status.include?(record['status'])
           end
 
           if @app_elapsed > 0 && record['elapsed']
-            send(record) if record['elapsed'].to_f > @app_elapsed
+            message = 'Slow process : ' + record['url']
+            send(tag, message, record) if record['elapsed'].to_f >= @app_elapsed
           end
 
           return record
         end
 
         if tag == 'lb'
+
+          if @lb_ignore && record['path'] && @lb_ignore.include?(record['path'])
+            return record
+          end
+
           if @lb_stream && record['stream']
-            send(record) if record['stream'] == @lb_stream
+            send(tag, 'Stderror', record) if record['stream'] == @lb_stream
           end
 
           if @lb_code.length > 0 && record['code']
-            send(record) if @lb_code.include?(record['code'])
+            message = 'Status code abnormal : ' + record['path']
+            send(tag, message, record) if @lb_code.include?(record['code'])
           end
 
           if @lb_elapsed > 0 && record['elapsed']
-            send(record) if record['elapsed'].to_f > @lb_elapsed
+            message = 'Slow request : ' + record['path']
+            send(tag, message, record) if record['elapsed'].to_f >= @lb_elapsed
           end
     
           return record
@@ -330,11 +308,14 @@ module Fluent
 
         if tag == 'mongo'
           if @mongo_severity.length > 0 && record['severity']
-            send(record) if @mongo_severity.include?(record['severity'])
+            message = 'Severity level abnormal : ' + record['severity']
+            send(tag, message, record) if @mongo_severity.include?(record['severity'])
           end
 
           if @mongo_querytime > 0 && record['querytime']
-            send(record) if record['querytime'].to_f > @mongo_querytime
+            message = 'Slow query'
+            message = message + ' : ' + record['collection'] if record['collection']
+            send(tag, message, record) if record['querytime'].to_f >= @mongo_querytime
           end
 
           return record
@@ -345,21 +326,14 @@ module Fluent
       end
 
       # 发送UDP请求
-      def send(record)
-
-        log.info('send udp notice', record)
-
-        data = {
-          :query => '/api/log/notice',
-          :params => {
-            :data => record
-          }
-        }
-        @udp.send(data.to_json, 0, Socket.pack_sockaddr_in(@port, @host))
+      def send(tag, message, record)
+        log.debug('send udp notice')
+        Sentry.capture_message(message, :extra => record, :tags => {'log' => tag})
       end
 
       # 转数字
-      def format_str(str)
+      def str_to_num(str)
+        return 0 if (str == '-')
         return str.to_i if (str =~ /^\d+$/)
         return str.to_f if (str =~ /^\d+\.\d+$/)
         str

data/sample/README.md

@@ -32,3 +32,13 @@ Initialized empty Git repository in /Users/lilin/developer/light/fluent-plugin-l
 
   % rm -f sample/*.pos
   % fluentd -c sample/source.conf -p lib/fluent/plugin
+
+## 添加 sentry 依赖
+
+- 编辑Gemfile
+
+  gem "sentry-ruby"
+
+- 安装依赖
+
+  gem install sentry-ruby

data/sample/source.conf

@@ -79,6 +79,16 @@
 
 <filter **>
   @type            light_core
+  sentry           true
+  sentry_dsn       https://4447403a2a86437491d307ceb72898e5@sentry.zf.link/4
+  mongo_querytime  300
+  mongo_severity   F,E
+  lb_stream        stderr
+  lb_code          400,500
+  lb_elapsed       5
+  lb_ignore        /api/environment/list,/api/certificate/list?condition%5Bkind%5D=SSL
+  app_status       500
+  app_elapsed      5
 </filter>
 
 # <match app>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-light-core
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.3
 platform: ruby
 authors:
 - LIN LI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: sentry-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 description: light core fluent plugin. support mongodb, nginx and application
 email:
 - l.li@alphabets.cn