fluent-plugin-light-core 0.1.8 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f402d3e7add5f4132e862aad254907c08f73068b8e92b4cf82f12c7e64fc01d7
-  data.tar.gz: a03cc3f47b6061a4567f7467d2786dac007e28deede646d511a5de7a58040796
+  metadata.gz: de6963e9c755b56d0c56eb2efe8d5144b66ea1463dd826c90ab71f5b65a72f37
+  data.tar.gz: f37743b84fc9a68940c488e06903a71725ffbb14a0a7a02c2203a19074f22940
 SHA512:
-  metadata.gz: 3ffb7670974e375d66d460237f94de74e2f10d308e72d4b9e2cf62c7fc9113da24e957fad8a17a9af81f8f9b2ac32b93775e3ea24cfa7e4c820e14ccda1347b0
-  data.tar.gz: 5ca326bae0e725610ddf20775db3cb254217497544d60ffbe3f5f4a5d0ecd6176e2b5c3595a65e2abfdd670cd269ec590196c346eb38a6fac7ab658a6ae4eccd
+  metadata.gz: 2d3fb8390aaf781220b4e288819c1f14c063a50c58ea850ef8b55ae63005ed3db03653b7e81f6cf349cfac04ca5259c2a4e2c73ec83003ed8290fefe9e187c1b
+  data.tar.gz: b89a10c9a2581a781536e06f4b7285c066ef1ec73f4a033bd646c7c2759e9de00a2a5227a5afa98ec406737390fd37c2212086a4cf33ccd7cab3addac4ec4787

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.8"
+  spec.version = "0.2.2"
   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
 
@@ -222,6 +225,7 @@ 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)
@@ -249,6 +253,30 @@ module Fluent
             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
         end
 
@@ -258,15 +286,18 @@ module Fluent
       # 确认是否发送通知
       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
           end
 
+          # 未使用
           if @app_message.length > 0 && record['message']
             @app_message.each do |pattern|
               if pattern.match(record['message'])
@@ -277,27 +308,36 @@ module Fluent
           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
@@ -305,11 +345,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
@@ -320,17 +363,9 @@ 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
 
       # 转数字

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.8
+  version: 0.2.2
 platform: ruby
 authors:
 - LIN LI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-11-12 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