logstash-input-kinesis 2.1.1-java → 2.1.2-java

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b8c14600f1931833d133e6e14955d966f5012813c318ae6668aaaa79f8fc98a2
4
- data.tar.gz: c17f6b3b4a208c9b3473263a22618ebf5abd9bb36040aea454437b5b94d9b310
3
+ metadata.gz: 245ff794a871cf62045b673be84a549cda2ccba7ff84bb1c07f946e7a4d7ee81
4
+ data.tar.gz: ddf9cc491568333d6b69cd155f68d27ec22a27229dfcbd1b138c697cf496028d
5
5
  SHA512:
6
- metadata.gz: cc398fd2652af451220734e2566b749056fc03bd3038c8ffc15ed0f6934f62227865cf9176ab6b0e15898179868eb60590797062091eab983d004b50b8eab6e4
7
- data.tar.gz: e4bd8494ff44fe1bdb0fbf07530736c56b7b162bc82a4f0817f828c1d155a7834bbfbc53c22e5c83ea0038ce3bd1fbcf80c8dc1631d7b29c8d5b517e780e47b0
6
+ metadata.gz: f264b7d24dbfaa1dde8a601f26bc54aed3654ff204fe1e74874599b8b013bfab29a9bf754d3f3a9cea8fe0b8807ad8095b1cbf964309ddb5f1646537dd2e465d
7
+ data.tar.gz: d60dd23223e523c4edde978fcb6e5a264bf09e4ad3c1e5a4aa6c882d869af07dc2cee7963f93fd4b3eb039385842441e774b82f251e9fc3ec9787d6874ab1804
@@ -1,3 +1,6 @@
1
+ ## 2.1.2
2
+ - Fixed logging level setup to use JUL and JCL loggers backend [#87](https://github.com/logstash-plugins/logstash-input-kinesis/issue/87)
3
+
1
4
  ## 2.1.1
2
5
  - Added helpful content from readme to doc file for publishing [#63](https://github.com/logstash-plugins/logstash-input-kinesis/pull/63)
3
6
 
data/LICENSE ADDED
@@ -0,0 +1,202 @@
1
+
2
+ Apache License
3
+ Version 2.0, January 2004
4
+ http://www.apache.org/licenses/
5
+
6
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7
+
8
+ 1. Definitions.
9
+
10
+ "License" shall mean the terms and conditions for use, reproduction,
11
+ and distribution as defined by Sections 1 through 9 of this document.
12
+
13
+ "Licensor" shall mean the copyright owner or entity authorized by
14
+ the copyright owner that is granting the License.
15
+
16
+ "Legal Entity" shall mean the union of the acting entity and all
17
+ other entities that control, are controlled by, or are under common
18
+ control with that entity. For the purposes of this definition,
19
+ "control" means (i) the power, direct or indirect, to cause the
20
+ direction or management of such entity, whether by contract or
21
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
+ outstanding shares, or (iii) beneficial ownership of such entity.
23
+
24
+ "You" (or "Your") shall mean an individual or Legal Entity
25
+ exercising permissions granted by this License.
26
+
27
+ "Source" form shall mean the preferred form for making modifications,
28
+ including but not limited to software source code, documentation
29
+ source, and configuration files.
30
+
31
+ "Object" form shall mean any form resulting from mechanical
32
+ transformation or translation of a Source form, including but
33
+ not limited to compiled object code, generated documentation,
34
+ and conversions to other media types.
35
+
36
+ "Work" shall mean the work of authorship, whether in Source or
37
+ Object form, made available under the License, as indicated by a
38
+ copyright notice that is included in or attached to the work
39
+ (an example is provided in the Appendix below).
40
+
41
+ "Derivative Works" shall mean any work, whether in Source or Object
42
+ form, that is based on (or derived from) the Work and for which the
43
+ editorial revisions, annotations, elaborations, or other modifications
44
+ represent, as a whole, an original work of authorship. For the purposes
45
+ of this License, Derivative Works shall not include works that remain
46
+ separable from, or merely link (or bind by name) to the interfaces of,
47
+ the Work and Derivative Works thereof.
48
+
49
+ "Contribution" shall mean any work of authorship, including
50
+ the original version of the Work and any modifications or additions
51
+ to that Work or Derivative Works thereof, that is intentionally
52
+ submitted to Licensor for inclusion in the Work by the copyright owner
53
+ or by an individual or Legal Entity authorized to submit on behalf of
54
+ the copyright owner. For the purposes of this definition, "submitted"
55
+ means any form of electronic, verbal, or written communication sent
56
+ to the Licensor or its representatives, including but not limited to
57
+ communication on electronic mailing lists, source code control systems,
58
+ and issue tracking systems that are managed by, or on behalf of, the
59
+ Licensor for the purpose of discussing and improving the Work, but
60
+ excluding communication that is conspicuously marked or otherwise
61
+ designated in writing by the copyright owner as "Not a Contribution."
62
+
63
+ "Contributor" shall mean Licensor and any individual or Legal Entity
64
+ on behalf of whom a Contribution has been received by Licensor and
65
+ subsequently incorporated within the Work.
66
+
67
+ 2. Grant of Copyright License. Subject to the terms and conditions of
68
+ this License, each Contributor hereby grants to You a perpetual,
69
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
+ copyright license to reproduce, prepare Derivative Works of,
71
+ publicly display, publicly perform, sublicense, and distribute the
72
+ Work and such Derivative Works in Source or Object form.
73
+
74
+ 3. Grant of Patent License. Subject to the terms and conditions of
75
+ this License, each Contributor hereby grants to You a perpetual,
76
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
+ (except as stated in this section) patent license to make, have made,
78
+ use, offer to sell, sell, import, and otherwise transfer the Work,
79
+ where such license applies only to those patent claims licensable
80
+ by such Contributor that are necessarily infringed by their
81
+ Contribution(s) alone or by combination of their Contribution(s)
82
+ with the Work to which such Contribution(s) was submitted. If You
83
+ institute patent litigation against any entity (including a
84
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
85
+ or a Contribution incorporated within the Work constitutes direct
86
+ or contributory patent infringement, then any patent licenses
87
+ granted to You under this License for that Work shall terminate
88
+ as of the date such litigation is filed.
89
+
90
+ 4. Redistribution. You may reproduce and distribute copies of the
91
+ Work or Derivative Works thereof in any medium, with or without
92
+ modifications, and in Source or Object form, provided that You
93
+ meet the following conditions:
94
+
95
+ (a) You must give any other recipients of the Work or
96
+ Derivative Works a copy of this License; and
97
+
98
+ (b) You must cause any modified files to carry prominent notices
99
+ stating that You changed the files; and
100
+
101
+ (c) You must retain, in the Source form of any Derivative Works
102
+ that You distribute, all copyright, patent, trademark, and
103
+ attribution notices from the Source form of the Work,
104
+ excluding those notices that do not pertain to any part of
105
+ the Derivative Works; and
106
+
107
+ (d) If the Work includes a "NOTICE" text file as part of its
108
+ distribution, then any Derivative Works that You distribute must
109
+ include a readable copy of the attribution notices contained
110
+ within such NOTICE file, excluding those notices that do not
111
+ pertain to any part of the Derivative Works, in at least one
112
+ of the following places: within a NOTICE text file distributed
113
+ as part of the Derivative Works; within the Source form or
114
+ documentation, if provided along with the Derivative Works; or,
115
+ within a display generated by the Derivative Works, if and
116
+ wherever such third-party notices normally appear. The contents
117
+ of the NOTICE file are for informational purposes only and
118
+ do not modify the License. You may add Your own attribution
119
+ notices within Derivative Works that You distribute, alongside
120
+ or as an addendum to the NOTICE text from the Work, provided
121
+ that such additional attribution notices cannot be construed
122
+ as modifying the License.
123
+
124
+ You may add Your own copyright statement to Your modifications and
125
+ may provide additional or different license terms and conditions
126
+ for use, reproduction, or distribution of Your modifications, or
127
+ for any such Derivative Works as a whole, provided Your use,
128
+ reproduction, and distribution of the Work otherwise complies with
129
+ the conditions stated in this License.
130
+
131
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
132
+ any Contribution intentionally submitted for inclusion in the Work
133
+ by You to the Licensor shall be under the terms and conditions of
134
+ this License, without any additional terms or conditions.
135
+ Notwithstanding the above, nothing herein shall supersede or modify
136
+ the terms of any separate license agreement you may have executed
137
+ with Licensor regarding such Contributions.
138
+
139
+ 6. Trademarks. This License does not grant permission to use the trade
140
+ names, trademarks, service marks, or product names of the Licensor,
141
+ except as required for reasonable and customary use in describing the
142
+ origin of the Work and reproducing the content of the NOTICE file.
143
+
144
+ 7. Disclaimer of Warranty. Unless required by applicable law or
145
+ agreed to in writing, Licensor provides the Work (and each
146
+ Contributor provides its Contributions) on an "AS IS" BASIS,
147
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
+ implied, including, without limitation, any warranties or conditions
149
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
+ PARTICULAR PURPOSE. You are solely responsible for determining the
151
+ appropriateness of using or redistributing the Work and assume any
152
+ risks associated with Your exercise of permissions under this License.
153
+
154
+ 8. Limitation of Liability. In no event and under no legal theory,
155
+ whether in tort (including negligence), contract, or otherwise,
156
+ unless required by applicable law (such as deliberate and grossly
157
+ negligent acts) or agreed to in writing, shall any Contributor be
158
+ liable to You for damages, including any direct, indirect, special,
159
+ incidental, or consequential damages of any character arising as a
160
+ result of this License or out of the use or inability to use the
161
+ Work (including but not limited to damages for loss of goodwill,
162
+ work stoppage, computer failure or malfunction, or any and all
163
+ other commercial damages or losses), even if such Contributor
164
+ has been advised of the possibility of such damages.
165
+
166
+ 9. Accepting Warranty or Additional Liability. While redistributing
167
+ the Work or Derivative Works thereof, You may choose to offer,
168
+ and charge a fee for, acceptance of support, warranty, indemnity,
169
+ or other liability obligations and/or rights consistent with this
170
+ License. However, in accepting such obligations, You may act only
171
+ on Your own behalf and on Your sole responsibility, not on behalf
172
+ of any other Contributor, and only if You agree to indemnify,
173
+ defend, and hold each Contributor harmless for any liability
174
+ incurred by, or claims asserted against, such Contributor by reason
175
+ of your accepting any such warranty or additional liability.
176
+
177
+ END OF TERMS AND CONDITIONS
178
+
179
+ APPENDIX: How to apply the Apache License to your work.
180
+
181
+ To apply the Apache License to your work, attach the following
182
+ boilerplate notice, with the fields enclosed by brackets "[]"
183
+ replaced with your own identifying information. (Don't include
184
+ the brackets!) The text should be enclosed in the appropriate
185
+ comment syntax for the file format. We also recommend that a
186
+ file or class name and description of purpose be included on the
187
+ same "printed page" as the copyright notice for easier
188
+ identification within third-party archives.
189
+
190
+ Copyright 2020 Elastic and contributors
191
+
192
+ Licensed under the Apache License, Version 2.0 (the "License");
193
+ you may not use this file except in compliance with the License.
194
+ You may obtain a copy of the License at
195
+
196
+ http://www.apache.org/licenses/LICENSE-2.0
197
+
198
+ Unless required by applicable law or agreed to in writing, software
199
+ distributed under the License is distributed on an "AS IS" BASIS,
200
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
+ See the License for the specific language governing permissions and
202
+ limitations under the License.
data/README.md CHANGED
@@ -88,3 +88,12 @@ Look at the [documentation](https://docs.aws.amazon.com/AWSJavaSDK/latest/javado
88
88
  3. Commit your changes (`git commit -am 'Add some feature'`)
89
89
  4. Push to the branch (`git push origin my-new-feature`)
90
90
  5. Create a new Pull Request
91
+
92
+
93
+ ## Development
94
+
95
+ To download all jars:
96
+ `bundler exec rake install_jars`
97
+
98
+ To run all specs:
99
+ `bundler exec rspec`
@@ -7,7 +7,6 @@ require "logstash/environment"
7
7
  require "logstash/namespace"
8
8
 
9
9
  require 'logstash-input-kinesis_jars'
10
- require "logstash/inputs/kinesis/version"
11
10
 
12
11
 
13
12
  # Receive events through an AWS Kinesis stream.
@@ -75,11 +74,20 @@ class LogStash::Inputs::Kinesis < LogStash::Inputs::Base
75
74
 
76
75
  def register
77
76
  # the INFO log level is extremely noisy in KCL
78
- kinesis_logger = org.apache.commons.logging::LogFactory.getLog("com.amazonaws.services.kinesis").logger
79
- if kinesis_logger.java_kind_of?(java.util.logging::Logger)
80
- kinesis_logger.setLevel(java.util.logging::Level::WARNING)
77
+ lg = org.apache.commons.logging::LogFactory.getLog("com.amazonaws.services.kinesis")
78
+ if lg.java_kind_of?(org.apache.commons.logging.impl::Jdk14Logger)
79
+ kinesis_logger = lg.logger
80
+ if kinesis_logger.java_kind_of?(java.util.logging::Logger)
81
+ kinesis_logger.setLevel(java.util.logging::Level::WARNING)
82
+ else
83
+ kinesis_logger.setLevel(org.apache.log4j::Level::WARN)
84
+ end
85
+ elsif lg.java_kind_of?(org.apache.logging.log4jJcl::Log4jLog)
86
+ logContext = org.apache.logging.log4j::LogManager.getContext(false)
87
+ config = logContext.getConfiguration()
88
+ config.getLoggerConfig("com.amazonaws.services.kinesis").setLevel(org.apache.logging.log4j::Level::WARN)
81
89
  else
82
- kinesis_logger.setLevel(org.apache.log4j::Level::WARN)
90
+ raise "Can't configure WARN log level for logger wrapper class #{lg.class}"
83
91
  end
84
92
 
85
93
  hostname = Socket.gethostname
@@ -1,11 +1,9 @@
1
1
  # coding: utf-8
2
- lib = File.expand_path('../lib', __FILE__)
3
- $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
- require 'logstash/inputs/kinesis/version'
2
+ version = File.read(File.expand_path(File.join(File.dirname(__FILE__), "VERSION"))).strip
5
3
 
6
4
  Gem::Specification.new do |spec|
7
5
  spec.name = "logstash-input-kinesis"
8
- spec.version = Logstash::Input::Kinesis::VERSION
6
+ spec.version = version
9
7
  spec.authors = ["Brian Palmer"]
10
8
  spec.email = ["brian@codekitchen.net"]
11
9
  spec.summary = "Receives events through an AWS Kinesis stream"
@@ -29,6 +27,6 @@ Gem::Specification.new do |spec|
29
27
  spec.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
30
28
 
31
29
  spec.add_development_dependency 'logstash-devutils'
32
- spec.add_development_dependency 'jar-dependencies', '~> 0.3.4'
30
+ spec.add_development_dependency 'jar-dependencies', '~> 0.4'
33
31
  spec.add_development_dependency "logstash-codec-json"
34
32
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-input-kinesis
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.1
4
+ version: 2.1.2
5
5
  platform: java
6
6
  authors:
7
7
  - Brian Palmer
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-02-16 00:00:00.000000000 Z
11
+ date: 2020-09-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
49
49
  requirements:
50
50
  - - "~>"
51
51
  - !ruby/object:Gem::Version
52
- version: 0.3.4
52
+ version: '0.4'
53
53
  name: jar-dependencies
54
54
  prerelease: false
55
55
  type: :development
@@ -57,7 +57,7 @@ dependencies:
57
57
  requirements:
58
58
  - - "~>"
59
59
  - !ruby/object:Gem::Version
60
- version: 0.3.4
60
+ version: '0.4'
61
61
  - !ruby/object:Gem::Dependency
62
62
  requirement: !ruby/object:Gem::Requirement
63
63
  requirements:
@@ -84,9 +84,9 @@ files:
84
84
  - CHANGELOG.md
85
85
  - CONTRIBUTORS
86
86
  - Gemfile
87
+ - LICENSE
87
88
  - README.md
88
89
  - lib/logstash/inputs/kinesis.rb
89
- - lib/logstash/inputs/kinesis/version.rb
90
90
  - lib/logstash/inputs/kinesis/worker.rb
91
91
  - logstash-input-kinesis.gemspec
92
92
  - spec/inputs/kinesis/worker_spec.rb
@@ -1,8 +0,0 @@
1
- # encoding: utf-8
2
- module Logstash
3
- module Input
4
- module Kinesis
5
- VERSION = "2.1.1"
6
- end
7
- end
8
- end