logstash-output-logservice 0.5.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 804c987d65c639a68b36ca186811f6eac075563295250a42de676bd652365e05
-  data.tar.gz: c49f0db8cdf6cb89cce86228fd3faebdf11c9f576d8822c770c4b7460421824f
+  metadata.gz: 2e3dd64f4643c30d3894829f9b16ba64fac3c129aee80d9c7a26cc9d52db1f7c
+  data.tar.gz: a3189eefcebf3620b76d99507a209f4d7272989516f1bab78941f9f74e9d2d03
 SHA512:
-  metadata.gz: 90731a2e27e28d29b175dd8b2d12f4809789cb185dd87d66004d6a2f1aa606161869b5d8240e5be883e19e033b82f235d6183938660ddead735a2d7ef246d44d
-  data.tar.gz: 30277a627aef8e73331e6508e2f02c4b4becf83a7907bdf1a82c3f71b2edd8205691ac2cd95222571b2d7fb88b7127cb938bb403084e54c9986b244d0ae9bd38
+  metadata.gz: 666969ca00264a276c0ddc167f0e572e657474956b0e61e119463b0c3feccce0b938a0b060e18d72d2b9eb223de8e61deb19a3ce670397c7f251956220629538
+  data.tar.gz: 53d04839f415791222c0ca91f124e00ae0c459fa61536856766e9ee34a11c2ce558b4f229727f819b62d36a4b0708b3e4c927320efef7ecf9ebf62737f69cd1f

data/README.md

@@ -1,6 +1,6 @@
 # Latest Release 
 
-* RubyGems: [logstash-output-logservice 0.4.0](https://rubygems.org/gems/logstash-output-logservice)
+* RubyGems: [logstash-output-logservice 0.6.0](https://rubygems.org/gems/logstash-output-logservice)
 * Tested on: Logstash 6.4.3
 * OS supported: mac 10.14.1, windows 7, Linux (CentOS 7)
 

data/lib/logstash/outputs/logservice.rb

@@ -5,6 +5,7 @@ require "logstash/environment"
 require "stud/buffer"
 require 'socket'
 require "java"
+require 'json'
 
 import "java.util.ArrayList"
 
@@ -41,6 +42,9 @@ class LogStash::Outputs::LogService < LogStash::Outputs::Base
   # sleep default 200 milliseconds before retry next send
   config :send_retry_interval, :validate=> :number, :required=> false, :default=> 200
 
+  config :to_json, :validate=> :boolean, :required=> false, :default=> true
+  config :time_key, :validate=> :string, :required=> false, :default=> "@timestamp"
+
   Log = com.aliyun.openservices.log
   LogException = com.aliyun.openservices.log.exception.LogException
   LogCommon = com.aliyun.openservices.log.common
@@ -113,10 +117,19 @@ class LogStash::Outputs::LogService < LogStash::Outputs::Base
         end
         @logitem = LogCommon.LogItem.new
         #@timestamp like 2016-02-18T03:23:11.053Z
-        @logitem.SetTime(Time.parse(@event_map['@timestamp'].to_s).to_i)
+        time_value = @event_map[@time_key]
+        if time_value.nil? || time_value.empty?
+           time_value = @event_map['@timestamp']
+           @logger.warn("The time_key is nil or empty, use @timestamp")
+        end
+        @logitem.SetTime(Time.parse(time_value.to_s).to_i)
         @event_map.each do | key, value |
           @key_str = key.to_s
-          @value_str = value.to_s
+          if @to_json
+            @value_str = value.to_json
+          else
+            @value_str = value.to_s
+          end
           @byte_size += @key_str.length + @value_str.length
           @logitem.PushBack(@key_str, @value_str)
         end

data/logstash-output-logservice.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-output-logservice'
-  s.version = "0.5.0"
+  s.version = "0.9.0"
   s.licenses = ['Apache-2.0']
   s.summary = "post data into logservice."
   s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-logservice
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.9.0
 platform: ruby
 authors:
 - tangkai
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -19,9 +20,8 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
-  name: logstash-core-plugin-api
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,42 +31,42 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.22
-  name: stud
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.22
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -84,7 +84,7 @@ files:
 - LICENSE
 - README.md
 - lib/logstash/outputs/logservice.rb
-- lib/logstash/vendor/jar-dependencies/runtime-jars/aliyun-log-0.6.34.jar
+- lib/logstash/vendor/jar-dependencies/runtime-jars/aliyun-log-0.6.35.jar
 - lib/logstash/vendor/jar-dependencies/runtime-jars/commons-beanutils-1.8.3.jar
 - lib/logstash/vendor/jar-dependencies/runtime-jars/commons-codec-1.4.jar
 - lib/logstash/vendor/jar-dependencies/runtime-jars/commons-collections-3.2.1.jar
@@ -109,7 +109,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: output
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -124,9 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: post data into logservice.
 test_files: