logstash-output-thinkingdata 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d03c9bd2f5bfd3a753641b13e92cc69607c2490ec79638fe647c3d50fbc84a39
-  data.tar.gz: 1563128b58ad6911ff6e31e3620163d6dbdc13d5b1d12fccf2a5206463ad006b
+  metadata.gz: a59cb189b3b65b95a23f1c54039948220adc9701d61425441c21e6ae13f0a207
+  data.tar.gz: bffcdc6a7f831a884cef5dfb94d9da423f356c86994fa9e17da2350d7a552002
 SHA512:
-  metadata.gz: 487f7a87e25265510a05e15266ceae5cecc3e1d184afc128b17fff18ef6d66d6ce1621164eb51eedbb678fc6d40da0c0c02059cf3ffee2cef79c2136e54c1efa
-  data.tar.gz: a8626d2c8a7f289081c50905ce09cd9b97e4eba4152c364cfc00403e70d9f1324c274cb2f505c0f9e78aef185eb52e92474ff15324cf26848fa3c0eed9978468
+  metadata.gz: '048904134164411ec9b61e60719a264b43c2d4dc7faa4220eb47a88d52077090b6c4ca5b0259cba32c3707d1bc67564bedd3aeb82ed84ddd9dbdea5a1e042956'
+  data.tar.gz: 7f7ff7da269b11ac1ce317c3562ac8371bb92a92d6338c9a13a55902a9112e05f6f3d5b90d5a561bcc894021f327762ee88340c6b102f799c149864403a3e87a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+**v1.2.0** (2023-04-25)
+  - 支持message中传多条数据
+
+**v1.1.1** (2021-07-10)
+  - 增加json格式校验
+
 **v1.1.0** (2021-01-27)
   - 增加支持数据中的#app_id的格式
 

data/lib/logstash/outputs/thinkingdata.rb

@@ -6,7 +6,6 @@ require "stud/buffer"
 require "zlib"
 require "json"
 
-
 # An thinkingdata output that does nothing.
 class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
 
@@ -42,7 +41,7 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
   # 是否检测appid
   config :appid_check, :validate => :boolean, :default => false
 
-  PLUGIN_VERSION = "1.1.0"
+  PLUGIN_VERSION = "1.2.0"
 
   public
 
@@ -67,9 +66,9 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
     @last_report_count = 0
     @total_send_count = 0
     buffer_config = {
-        :max_items => @flush_batch_size.to_i,
-        :max_interval => @flush_interval_sec.to_i,
-        :logger => @logger
+      :max_items => @flush_batch_size.to_i,
+      :max_interval => @flush_interval_sec.to_i,
+      :logger => @logger
     }
     buffer_initialize(buffer_config)
     @filebeat_status = {} if @is_filebeat_status_record
@@ -99,6 +98,20 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
     end
   end
 
+  def send_content(content, event)
+    content['#uuid'] = SecureRandom.uuid if @uuid
+    if is_filebeat_input?(event) #filebeat input 记录
+      host = event.get("[host][name]")
+      file = event.get("[log][file][path]")
+      file = event.get("[source]") if file.nil?
+      offset = event.get("[log][offset]")
+      offset = event.get("[offset]") if offset.nil?
+      log_detail = "host: #{host}, file: #{file}"
+      record_filebeat_status(log_detail, offset) if @is_filebeat_status_record
+    end
+    buffer_receive(content)
+  end
+
   public
 
   def multi_receive(events)
@@ -106,18 +119,20 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
     @receive_count += events.length
     events.each do |event|
       begin
-        content = JSON.parse(event.get("message"))
-        content['#uuid'] = SecureRandom.uuid if @uuid
-        if is_filebeat_input?(event) #filebeat input 记录
-          host = event.get("[host][name]")
-          file = event.get("[log][file][path]")
-          file = event.get("[source]") if file.nil?
-          offset = event.get("[log][offset]")
-          offset = event.get("[offset]") if offset.nil?
-          log_detail = "host: #{host}, file: #{file}"
-          record_filebeat_status(log_detail, offset) if @is_filebeat_status_record
+        message = event.get("message")
+        # 判断 message 中的数据是否为json array
+        if message[0, 1] == "["
+          contents = JSON.parse(message)
+          contents.each do |content|
+            begin
+              send_content(content, event)
+            end
+          end
+        else
+          content = JSON.parse(message)
+          send_content(content, event)
         end
-        buffer_receive(content)
+
       rescue => e
         @logger.error("Could not process content", :content => event.to_s, :Exception => e)
         @parse_error_count += 1
@@ -140,26 +155,27 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
   public
 
   def flush(events, final)
+    events = data_valid(events)
+    data = events.to_json
     if @compress == 0
-      data = events.to_json
       compress_type = 'none'
     else
       gz = StringIO.new("w")
       gz.set_encoding("BINARY")
       z = Zlib::GzipWriter.new(gz)
-      z.write(events.to_json)
+      z.write(data)
       z.close
       data = gz.string
       compress_type = 'gzip'
     end
     if @appid.nil? || @appid.empty?
-      headers = {'custom_appid' => 'true', 'version' => PLUGIN_VERSION, 'user-agent' => 'logstash_' + PLUGIN_VERSION,
-                 'compress' => compress_type, 'TA-Integration-Type' => 'logstash',
-                 'TA-Integration-Version' => PLUGIN_VERSION, 'TA-Integration-Count' => events.length.to_s}
+      headers = { 'custom_appid' => 'true', 'version' => PLUGIN_VERSION, 'user-agent' => 'logstash_' + PLUGIN_VERSION,
+                  'compress' => compress_type, 'TA-Integration-Type' => 'logstash',
+                  'TA-Integration-Version' => PLUGIN_VERSION, 'TA-Integration-Count' => events.length.to_s }
     else
-      headers = {'appid' => @appid, 'version' => PLUGIN_VERSION, 'user-agent' => 'logstash_' + PLUGIN_VERSION,
-                 'compress' => compress_type, 'TA-Integration-Type' => 'logstash',
-                 'TA-Integration-Version' => PLUGIN_VERSION, 'TA-Integration-Count' => events.length.to_s}
+      headers = { 'appid' => @appid, 'version' => PLUGIN_VERSION, 'user-agent' => 'logstash_' + PLUGIN_VERSION,
+                  'compress' => compress_type, 'TA-Integration-Type' => 'logstash',
+                  'TA-Integration-Version' => PLUGIN_VERSION, 'TA-Integration-Count' => events.length.to_s }
     end
 
     until do_send(data, headers)
@@ -201,7 +217,7 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
   def record_filebeat_status(log_detail, offset)
     status = @filebeat_status[log_detail]
     if status.nil?
-      status = {:receive_time => Time.now, :offset => offset}
+      status = { :receive_time => Time.now, :offset => offset }
       @filebeat_status[log_detail] = status
     else
       status[:offset] = offset
@@ -233,6 +249,22 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
     result
   end
 
+  private
+
+  def data_valid(events)
+    result = []
+    events.each do |event|
+      begin
+        event.to_json
+        result << event
+      rescue => e
+        @logger.error("Could not parse events", :content => event.to_s, :Exception => e)
+        @parse_error_count += 1
+      end
+    end
+    return result
+  end
+
 end
 
 # class LogStash::Outputs::Thinkingdata

data/logstash-output-thinkingdata.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-thinkingdata'
-  s.version       = '1.1.0'
+  s.version       = '1.2.0'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Output plugin for Thinkingdata Analytics'
   s.description   = 'This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-thinkingdata
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - sdk
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api
@@ -144,7 +144,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: output
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -159,8 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Output plugin for Thinkingdata Analytics
 test_files: