logstash-output-thinkingdata 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca56f25a56609a0ba791c30b03f9f3f2cff37d09c7ae7f708e16c43550b00f68
-  data.tar.gz: 3fda7fe64d91e3d9d889802d9fea3badc1c604bcbccb6c47c021cfd5d802ae5e
+  metadata.gz: d03c9bd2f5bfd3a753641b13e92cc69607c2490ec79638fe647c3d50fbc84a39
+  data.tar.gz: 1563128b58ad6911ff6e31e3620163d6dbdc13d5b1d12fccf2a5206463ad006b
 SHA512:
-  metadata.gz: fe27486b4018eb88f8213bd652d19820bbdaf2d1dbfeecb6341a03537a421b666c4efff7dad8bec194067174150f56f385deec77c2cb00c3f82721c6fd5fc531
-  data.tar.gz: 2e574076f997d2d0af39222558930956443acc742929b4f142547192bb9d4f51f3707debba8d6530cb6115bd736c1930d8d641af8c783b9d0fb5f3ce36fe8266
+  metadata.gz: 487f7a87e25265510a05e15266ceae5cecc3e1d184afc128b17fff18ef6d66d6ce1621164eb51eedbb678fc6d40da0c0c02059cf3ffee2cef79c2136e54c1efa
+  data.tar.gz: a8626d2c8a7f289081c50905ce09cd9b97e4eba4152c364cfc00403e70d9f1324c274cb2f505c0f9e78aef185eb52e92474ff15324cf26848fa3c0eed9978468

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+**v1.1.0** (2021-01-27)
+  - 增加支持数据中的#app_id的格式
+
 **v1.0.1** (2020-12-21)
   - 修复浮点数转化为科学计数法的问题
 

data/lib/logstash/outputs/thinkingdata.rb

@@ -24,9 +24,6 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
   # 数据的项目appid
   config :appid, :validate => :string
 
-  # 是否将appid封装于数据中
-  config :is_sync_data, :validate => :boolean, :default => false
-
   # 触发 flush 间隔时间
   config :flush_interval_sec, :validate => :number, :default => 2
 
@@ -45,7 +42,7 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
   # 是否检测appid
   config :appid_check, :validate => :boolean, :default => false
 
-  PLUGIN_VERSION = "1.0.1"
+  PLUGIN_VERSION = "1.1.0"
 
   public
 
@@ -53,7 +50,6 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
     @logger.info("Registering thinkingdata Output",
                  :url => @url,
                  :appid => @appid,
-                 :is_sync_data => @is_sync_data,
                  :flush_interval_sec => @flush_interval_sec,
                  :flush_batch_size => @flush_batch_size,
                  :compress => @compress,
@@ -65,7 +61,7 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
     http_client_config = client_config
     http_client_config[:user_agent] = "thinkingdata_logstash_output_plugin_" + PLUGIN_VERSION
     @client = Manticore::Client.new(http_client_config)
-    ta_appid_check if @appid_check
+    ta_appid_check if @appid_check && !@appid.nil? && !@appid.empty?
     @receive_count = 0
     @parse_error_count = 0
     @last_report_count = 0
@@ -156,8 +152,16 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
       data = gz.string
       compress_type = 'gzip'
     end
-    headers = {'appid' => @appid, 'version' => PLUGIN_VERSION, 'user-agent' => 'logstash_' + PLUGIN_VERSION,
-               'compress' => compress_type}
+    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}
+    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}
+    end
+
     until do_send(data, headers)
       sleep 5
     end

data/logstash-output-thinkingdata.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-thinkingdata'
-  s.version       = '1.0.1'
+  s.version       = '1.1.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.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - sdk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-21 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api