logstash-output-logservice 0.5.0 → 0.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 804c987d65c639a68b36ca186811f6eac075563295250a42de676bd652365e05
4
- data.tar.gz: c49f0db8cdf6cb89cce86228fd3faebdf11c9f576d8822c770c4b7460421824f
3
+ metadata.gz: 2e3dd64f4643c30d3894829f9b16ba64fac3c129aee80d9c7a26cc9d52db1f7c
4
+ data.tar.gz: a3189eefcebf3620b76d99507a209f4d7272989516f1bab78941f9f74e9d2d03
5
5
  SHA512:
6
- metadata.gz: 90731a2e27e28d29b175dd8b2d12f4809789cb185dd87d66004d6a2f1aa606161869b5d8240e5be883e19e033b82f235d6183938660ddead735a2d7ef246d44d
7
- data.tar.gz: 30277a627aef8e73331e6508e2f02c4b4becf83a7907bdf1a82c3f71b2edd8205691ac2cd95222571b2d7fb88b7127cb938bb403084e54c9986b244d0ae9bd38
6
+ metadata.gz: 666969ca00264a276c0ddc167f0e572e657474956b0e61e119463b0c3feccce0b938a0b060e18d72d2b9eb223de8e61deb19a3ce670397c7f251956220629538
7
+ data.tar.gz: 53d04839f415791222c0ca91f124e00ae0c459fa61536856766e9ee34a11c2ce558b4f229727f819b62d36a4b0708b3e4c927320efef7ecf9ebf62737f69cd1f
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # Latest Release
2
2
 
3
- * RubyGems: [logstash-output-logservice 0.4.0](https://rubygems.org/gems/logstash-output-logservice)
3
+ * RubyGems: [logstash-output-logservice 0.6.0](https://rubygems.org/gems/logstash-output-logservice)
4
4
  * Tested on: Logstash 6.4.3
5
5
  * OS supported: mac 10.14.1, windows 7, Linux (CentOS 7)
6
6
 
@@ -5,6 +5,7 @@ require "logstash/environment"
5
5
  require "stud/buffer"
6
6
  require 'socket'
7
7
  require "java"
8
+ require 'json'
8
9
 
9
10
  import "java.util.ArrayList"
10
11
 
@@ -41,6 +42,9 @@ class LogStash::Outputs::LogService < LogStash::Outputs::Base
41
42
  # sleep default 200 milliseconds before retry next send
42
43
  config :send_retry_interval, :validate=> :number, :required=> false, :default=> 200
43
44
 
45
+ config :to_json, :validate=> :boolean, :required=> false, :default=> true
46
+ config :time_key, :validate=> :string, :required=> false, :default=> "@timestamp"
47
+
44
48
  Log = com.aliyun.openservices.log
45
49
  LogException = com.aliyun.openservices.log.exception.LogException
46
50
  LogCommon = com.aliyun.openservices.log.common
@@ -113,10 +117,19 @@ class LogStash::Outputs::LogService < LogStash::Outputs::Base
113
117
  end
114
118
  @logitem = LogCommon.LogItem.new
115
119
  #@timestamp like 2016-02-18T03:23:11.053Z
116
- @logitem.SetTime(Time.parse(@event_map['@timestamp'].to_s).to_i)
120
+ time_value = @event_map[@time_key]
121
+ if time_value.nil? || time_value.empty?
122
+ time_value = @event_map['@timestamp']
123
+ @logger.warn("The time_key is nil or empty, use @timestamp")
124
+ end
125
+ @logitem.SetTime(Time.parse(time_value.to_s).to_i)
117
126
  @event_map.each do | key, value |
118
127
  @key_str = key.to_s
119
- @value_str = value.to_s
128
+ if @to_json
129
+ @value_str = value.to_json
130
+ else
131
+ @value_str = value.to_s
132
+ end
120
133
  @byte_size += @key_str.length + @value_str.length
121
134
  @logitem.PushBack(@key_str, @value_str)
122
135
  end
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'logstash-output-logservice'
3
- s.version = "0.5.0"
3
+ s.version = "0.9.0"
4
4
  s.licenses = ['Apache-2.0']
5
5
  s.summary = "post data into logservice."
6
6
  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 CHANGED
@@ -1,16 +1,17 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-output-logservice
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.0
4
+ version: 0.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - tangkai
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-07-24 00:00:00.000000000 Z
11
+ date: 2021-12-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
+ name: logstash-core-plugin-api
14
15
  requirement: !ruby/object:Gem::Requirement
15
16
  requirements:
16
17
  - - ">="
@@ -19,9 +20,8 @@ dependencies:
19
20
  - - "<="
20
21
  - !ruby/object:Gem::Version
21
22
  version: '2.99'
22
- name: logstash-core-plugin-api
23
- prerelease: false
24
23
  type: :runtime
24
+ prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - ">="
@@ -31,42 +31,42 @@ dependencies:
31
31
  - !ruby/object:Gem::Version
32
32
  version: '2.99'
33
33
  - !ruby/object:Gem::Dependency
34
+ name: logstash-codec-plain
34
35
  requirement: !ruby/object:Gem::Requirement
35
36
  requirements:
36
37
  - - ">="
37
38
  - !ruby/object:Gem::Version
38
39
  version: '0'
39
- name: logstash-codec-plain
40
- prerelease: false
41
40
  type: :runtime
41
+ prerelease: false
42
42
  version_requirements: !ruby/object:Gem::Requirement
43
43
  requirements:
44
44
  - - ">="
45
45
  - !ruby/object:Gem::Version
46
46
  version: '0'
47
47
  - !ruby/object:Gem::Dependency
48
+ name: stud
48
49
  requirement: !ruby/object:Gem::Requirement
49
50
  requirements:
50
51
  - - ">="
51
52
  - !ruby/object:Gem::Version
52
53
  version: 0.0.22
53
- name: stud
54
- prerelease: false
55
54
  type: :runtime
55
+ prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
57
57
  requirements:
58
58
  - - ">="
59
59
  - !ruby/object:Gem::Version
60
60
  version: 0.0.22
61
61
  - !ruby/object:Gem::Dependency
62
+ name: logstash-devutils
62
63
  requirement: !ruby/object:Gem::Requirement
63
64
  requirements:
64
65
  - - ">="
65
66
  - !ruby/object:Gem::Version
66
67
  version: '0'
67
- name: logstash-devutils
68
- prerelease: false
69
68
  type: :development
69
+ prerelease: false
70
70
  version_requirements: !ruby/object:Gem::Requirement
71
71
  requirements:
72
72
  - - ">="
@@ -84,7 +84,7 @@ files:
84
84
  - LICENSE
85
85
  - README.md
86
86
  - lib/logstash/outputs/logservice.rb
87
- - lib/logstash/vendor/jar-dependencies/runtime-jars/aliyun-log-0.6.34.jar
87
+ - lib/logstash/vendor/jar-dependencies/runtime-jars/aliyun-log-0.6.35.jar
88
88
  - lib/logstash/vendor/jar-dependencies/runtime-jars/commons-beanutils-1.8.3.jar
89
89
  - lib/logstash/vendor/jar-dependencies/runtime-jars/commons-codec-1.4.jar
90
90
  - lib/logstash/vendor/jar-dependencies/runtime-jars/commons-collections-3.2.1.jar
@@ -109,7 +109,7 @@ licenses:
109
109
  metadata:
110
110
  logstash_plugin: 'true'
111
111
  logstash_group: output
112
- post_install_message:
112
+ post_install_message:
113
113
  rdoc_options: []
114
114
  require_paths:
115
115
  - lib
@@ -124,9 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
124
124
  - !ruby/object:Gem::Version
125
125
  version: '0'
126
126
  requirements: []
127
- rubyforge_project:
128
- rubygems_version: 2.7.6
129
- signing_key:
127
+ rubygems_version: 3.0.3
128
+ signing_key:
130
129
  specification_version: 4
131
130
  summary: post data into logservice.
132
131
  test_files: