Skip to content

Commit c35c5c9

Browse files
authored
Merge branch 'master' into doc-threads
2 parents ca917ab + 27bad62 commit c35c5c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1235
-692
lines changed

.ci/Dockerfile

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
ARG ELASTIC_STACK_VERSION
2+
FROM docker.elastic.co/logstash/logstash:$ELASTIC_STACK_VERSION
3+
USER root
4+
RUN yum install -y openssl
5+
USER logstash
6+
COPY --chown=logstash:logstash Gemfile /usr/share/plugins/plugin/Gemfile
7+
COPY --chown=logstash:logstash *.gemspec VERSION* version* /usr/share/plugins/plugin/
8+
RUN cp /usr/share/logstash/logstash-core/versions-gem-copy.yml /usr/share/logstash/versions.yml
9+
ENV PATH="${PATH}:/usr/share/logstash/vendor/jruby/bin:/usr/share/logstash/jdk/bin"
10+
ENV LOGSTASH_SOURCE="1"
11+
ENV ELASTIC_STACK_VERSION=$ELASTIC_STACK_VERSION
12+
# DISTRIBUTION="default" (by default) or "oss"
13+
ARG DISTRIBUTION
14+
ENV DISTRIBUTION=$DISTRIBUTION
15+
# INTEGRATION="true" while integration testing (false-y by default)
16+
ARG INTEGRATION
17+
ENV INTEGRATION=$INTEGRATION
18+
RUN gem install bundler -v '< 2'
19+
WORKDIR /usr/share/plugins/plugin
20+
RUN bundle install --with test ci
21+
COPY --chown=logstash:logstash . /usr/share/plugins/plugin
22+
RUN bundle exec rake vendor
23+
RUN .ci/setup.sh
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#!/bin/bash
2-
32
# This is intended to be run inside the docker container as the command of the docker-compose.
3+
4+
env
5+
46
set -ex
57

68
bundle exec rspec spec
79
bundle exec rake test:integration:setup
8-
bundle exec rspec spec --tag integration
10+
bundle exec rspec spec --tag integration -fd

.travis.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,2 @@
1-
---
2-
sudo: required
3-
services: docker
4-
addons:
5-
apt:
6-
packages:
7-
- docker-ce
8-
matrix:
9-
include:
10-
- env: SNAPSHOT=true ELASTIC_STACK_VERSION=8.x
11-
- env: SNAPSHOT=true ELASTIC_STACK_VERSION=7.x
12-
- env: ELASTIC_STACK_VERSION=7.x
13-
- env: SNAPSHOT=true ELASTIC_STACK_VERSION=6.x
14-
- env: ELASTIC_STACK_VERSION=6.x
15-
- env: ELASTIC_STACK_VERSION=5.x
16-
fast_finish: true
17-
install: ci/unit/docker-setup.sh
18-
script: ci/unit/docker-run.sh
1+
import:
2+
- logstash-plugins/.ci:travis/[email protected]

CHANGELOG.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,66 @@
1+
## 6.1.3
2+
- Fix: safe-guard byte buf allocation [#420](https://github.com/logstash-plugins/logstash-input-beats/pull/420)
3+
- Updated Jackson dependencies
4+
5+
## 6.1.2
6+
- [DOC] Added naming attribute to control plugin name that appears in docs, and set up framework to make attributes viable in code sample
7+
8+
## 6.1.1
9+
- [DOC] Enhanced ECS compatibility information for ease of use and readability
10+
[#413](https://github.com/logstash-plugins/logstash-input-beats/pull/413)
11+
12+
## 6.1.0
13+
- ECS compatibility enablement. Adds `ecs_compatibility` setting to declare the level of ECS compatibility (`disabled` or `v1`) at plugin level. When `disabled`, the plugin behaves like before, while `v1` does a rename of
14+
`host` and `@metadata.ip_address` event fields. [#404](https://github.com/logstash-plugins/logstash-input-beats/pull/404)
15+
16+
## 6.0.14
17+
- Feat: log + unwrap generic SSL context exceptions [#405](https://github.com/logstash-plugins/logstash-input-beats/pull/405)
18+
19+
## 6.0.13
20+
- [DOC] Update links to use shared attributes
21+
22+
## 6.0.12
23+
- Fix: log error when SSL context building fails [#402](https://github.com/logstash-plugins/logstash-input-beats/pull/402).
24+
We've also made sure to log messages on configuration errors as LS 7.8/7.9 only prints details when level set to debug.
25+
26+
## 6.0.11
27+
- Updated jackson databind and Netty dependencies. Additionally, this release removes the dependency on `tcnative` +
28+
`boringssl`, using JVM supplied ciphers instead. This may result in fewer ciphers being available if the JCE
29+
unlimited strength jurisdiction policy is not installed. (This policy is installed by default on versions of the
30+
JDK from u161 onwards)[#393](https://github.com/logstash-plugins/logstash-input-beats/pull/393)
31+
32+
## 6.0.10
33+
- Added error handling to detect if ssl certificate or key files can't be read [#394](https://github.com/logstash-plugins/logstash-input-beats/pull/394)
34+
35+
## 6.0.9
36+
- Fixed issue where calling `java_import` on `org.logstash.netty.SslContextBuilder` was causing the TCP input to pick up the wrong SslContextBuilder class
37+
potentially causing pipeline creation to fail [#388](https://github.com/logstash-plugins/logstash-input-beats/pull/388)
38+
39+
## 6.0.8
40+
- Fixed issue where an SslContext was unnecessarily being created for each connection [#383](https://github.com/logstash-plugins/logstash-input-beats/pull/383)
41+
- Fixed issue where `end` was not being called when an Inflater was closed [#383](https://github.com/logstash-plugins/logstash-input-beats/pull/383)
42+
43+
## 6.0.7
44+
- Reverted changes to netty and tcnative dependencies and removal of CBC ciphers to preserve compatibility with Lumberjack output [#381](https://github.com/logstash-plugins/logstash-input-beats/pull/381)
45+
46+
## 6.0.6
47+
- Downgraded netty to 4.1.34 due to an issue in IdleStateHandler [#380](https://github.com/logstash-plugins/logstash-input-beats/pull/380)
48+
49+
## 6.0.5
50+
- Security: update netty deps - avoid CBC ciphers [#376](https://github.com/logstash-plugins/logstash-input-beats/pull/376)
51+
52+
## 6.0.4
53+
- Updated Jackson dependencies
54+
55+
## 6.0.3
56+
- Fixed configuration example in doc [#371](https://github.com/logstash-plugins/logstash-input-beats/pull/371)
57+
58+
## 6.0.2
59+
- Improved handling of invalid compressed content [#368](https://github.com/logstash-plugins/logstash-input-beats/pull/368)
60+
61+
## 6.0.1
62+
- Updated Jackson dependencies [#366](https://github.com/logstash-plugins/logstash-input-beats/pull/366)
63+
164
## 6.0.0
265
- Removed obsolete setting congestion_threshold and target_field_for_codec
366
- Changed default value of `add_hostname` to false

LICENSE

Lines changed: 198 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,202 @@
1-
Copyright 2012-2018 Jordan Sissel, Elasticsearch and contributors.
21

3-
Licensed under the Apache License, Version 2.0 (the "License");
4-
you may not use this file except in compliance with the License.
5-
You may obtain a copy of the License at
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
65

7-
http://www.apache.org/licenses/LICENSE-2.0
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
87

9-
Unless required by applicable law or agreed to in writing, software
10-
distributed under the License is distributed on an "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
See the License for the specific language governing permissions and
13-
limitations under the License.
8+
1. Definitions.
149

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.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Logstash Plugin
22

3-
[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-beats.svg)](https://travis-ci.org/logstash-plugins/logstash-input-beats)
3+
[![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-input-beats.svg)](https://travis-ci.com/logstash-plugins/logstash-input-beats)
44

55
This is a plugin for [Logstash](https://github.com/elastic/logstash).
66

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.0.0
1+
6.1.3

build.gradle

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ description = "Beats/Lumberjack Netty implementation"
1313
sourceCompatibility = 1.8
1414
targetCompatibility = 1.8
1515

16+
String jacksonVersion = '2.9.10'
17+
String jacksonDatabindVersion = '2.9.10.8'
18+
1619
repositories {
1720
mavenCentral()
1821
}
@@ -21,14 +24,12 @@ dependencies {
2124
testCompile 'junit:junit:4.12'
2225
testCompile 'org.hamcrest:hamcrest-library:1.3'
2326
testCompile 'org.apache.logging.log4j:log4j-core:2.11.1'
24-
25-
compile 'io.netty:netty-all:4.1.30.Final'
26-
compile 'io.netty:netty-tcnative-boringssl-static:2.0.12.Final'
27+
compile 'io.netty:netty-all:4.1.49.Final'
2728
compile 'org.javassist:javassist:3.24.0-GA'
28-
compile 'com.fasterxml.jackson.core:jackson-core:2.9.7'
29-
compile 'com.fasterxml.jackson.core:jackson-annotations:2.9.7'
30-
compile 'com.fasterxml.jackson.core:jackson-databind:2.9.7'
31-
compile 'com.fasterxml.jackson.module:jackson-module-afterburner:2.9.7'
29+
compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
30+
compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
31+
compile "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
32+
compile "com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}"
3233
compile 'org.apache.logging.log4j:log4j-api:2.11.1'
3334

3435
}
@@ -94,8 +95,3 @@ publishing {
9495
}
9596
}
9697
}
97-
98-
task wrapper(type: Wrapper) {
99-
description = 'Install Gradle wrapper'
100-
gradleVersion = '2.14'
101-
}

0 commit comments

Comments
 (0)