mirror of
https://github.com/elastic/logstash.git
synced 2025-04-24 06:37:19 -04:00
Release 5.6.10 - 2nd PR Create Gemfile.jruby-1.9.lock.release (#9637)
* Release 5.6.10 2nd PR Create Gemfile.jruby-1.9.lock.release * pin gems dotenv, elasticsearch, logstash-input-file, logstash-input-http dotenv (~> 2.2.2) elasticsearch (= 5.0.4) logstash-input-file (~> 4.0.0) logstash-input-http (~> 3.0.0)
This commit is contained in:
parent
fcf5f07521
commit
44e6bdba28
3 changed files with 232 additions and 24 deletions
|
@ -40,13 +40,13 @@ GEM
|
|||
avl_tree (1.2.1)
|
||||
atomic (~> 1.1)
|
||||
awesome_print (1.8.0)
|
||||
aws-sdk (2.11.33)
|
||||
aws-sdk-resources (= 2.11.33)
|
||||
aws-sdk-core (2.11.33)
|
||||
aws-sdk (2.11.56)
|
||||
aws-sdk-resources (= 2.11.56)
|
||||
aws-sdk-core (2.11.56)
|
||||
aws-sigv4 (~> 1.0)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-resources (2.11.33)
|
||||
aws-sdk-core (= 2.11.33)
|
||||
aws-sdk-resources (2.11.56)
|
||||
aws-sdk-core (= 2.11.56)
|
||||
aws-sdk-v1 (1.67.0)
|
||||
json (~> 1.4)
|
||||
nokogiri (~> 1)
|
||||
|
@ -71,11 +71,11 @@ GEM
|
|||
coderay (1.1.2)
|
||||
concurrent-ruby (1.0.5-java)
|
||||
diff-lcs (1.3)
|
||||
docile (1.3.0)
|
||||
docile (1.3.1)
|
||||
docker-api (1.31.0)
|
||||
excon (>= 0.38.0)
|
||||
json
|
||||
domain_name (0.5.20170404)
|
||||
domain_name (0.5.20180417)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
dotenv (2.2.2)
|
||||
edn (1.1.1)
|
||||
|
@ -122,7 +122,7 @@ GEM
|
|||
i18n (0.6.9)
|
||||
insist (1.0.0)
|
||||
jar-dependencies (0.3.12)
|
||||
jls-grok (0.11.4)
|
||||
jls-grok (0.11.5)
|
||||
cabin (>= 0.6.0)
|
||||
jls-lumberjack (0.0.26)
|
||||
concurrent-ruby
|
||||
|
@ -168,7 +168,7 @@ GEM
|
|||
jls-grok (~> 0.11.1)
|
||||
logstash-core-plugin-api (>= 1.60, <= 2.99)
|
||||
logstash-patterns-core
|
||||
logstash-codec-netflow (3.11.4)
|
||||
logstash-codec-netflow (3.14.1)
|
||||
bindata (>= 1.5.0)
|
||||
logstash-core-plugin-api (~> 2.0)
|
||||
logstash-codec-plain (3.0.6)
|
||||
|
@ -198,7 +198,7 @@ GEM
|
|||
logstash-filter-dissect (1.1.4)
|
||||
jar-dependencies
|
||||
logstash-core-plugin-api (>= 2.1.1, <= 2.99)
|
||||
logstash-filter-dns (3.0.9)
|
||||
logstash-filter-dns (3.0.10)
|
||||
logstash-core-plugin-api (>= 1.60, <= 2.99)
|
||||
lru_redux (~> 1.1.0)
|
||||
logstash-filter-drop (3.0.5)
|
||||
|
@ -216,13 +216,13 @@ GEM
|
|||
stud (~> 0.0.22)
|
||||
logstash-filter-json (3.0.5)
|
||||
logstash-core-plugin-api (>= 1.60, <= 2.99)
|
||||
logstash-filter-kv (4.1.1)
|
||||
logstash-filter-kv (4.1.2)
|
||||
logstash-core-plugin-api (>= 1.60, <= 2.99)
|
||||
logstash-filter-metrics (4.0.5)
|
||||
logstash-core-plugin-api (>= 1.60, <= 2.99)
|
||||
metriks
|
||||
thread_safe
|
||||
logstash-filter-mutate (3.3.1)
|
||||
logstash-filter-mutate (3.3.2)
|
||||
logstash-core-plugin-api (>= 1.60, <= 2.99)
|
||||
logstash-filter-ruby (3.1.4)
|
||||
logstash-core-plugin-api (>= 1.60, <= 2.99)
|
||||
|
@ -359,7 +359,7 @@ GEM
|
|||
logstash-codec-json
|
||||
logstash-core-plugin-api (>= 1.60, <= 2.99)
|
||||
redis (~> 3)
|
||||
logstash-input-s3 (3.3.2)
|
||||
logstash-input-s3 (3.3.5)
|
||||
logstash-core-plugin-api (>= 2.1.12, <= 2.99)
|
||||
logstash-mixin-aws (>= 4.3.0)
|
||||
stud (~> 0.0.18)
|
||||
|
@ -396,7 +396,7 @@ GEM
|
|||
public_suffix (<= 1.4.6)
|
||||
stud (>= 0.0.22, < 0.1)
|
||||
twitter (= 5.15.0)
|
||||
logstash-input-udp (3.3.1)
|
||||
logstash-input-udp (3.3.3)
|
||||
logstash-codec-plain
|
||||
logstash-core-plugin-api (>= 1.60, <= 2.99)
|
||||
stud (~> 0.0.22)
|
||||
|
@ -428,7 +428,7 @@ GEM
|
|||
logstash-filter-json
|
||||
logstash-input-generator
|
||||
logstash-output-file
|
||||
logstash-output-elasticsearch (7.4.2-java)
|
||||
logstash-output-elasticsearch (7.4.3-java)
|
||||
cabin (~> 0.6)
|
||||
logstash-core-plugin-api (>= 1.60, <= 2.99)
|
||||
manticore (>= 0.5.4, < 1.0.0)
|
||||
|
@ -469,7 +469,7 @@ GEM
|
|||
logstash-core-plugin-api (>= 1.60, <= 2.99)
|
||||
redis
|
||||
stud
|
||||
logstash-output-s3 (4.1.1)
|
||||
logstash-output-s3 (4.1.2)
|
||||
concurrent-ruby
|
||||
logstash-core-plugin-api (>= 1.60, <= 2.99)
|
||||
logstash-mixin-aws (>= 4.3.0)
|
||||
|
@ -579,7 +579,7 @@ GEM
|
|||
sawyer (0.6.0)
|
||||
addressable (~> 2.3.5)
|
||||
faraday (~> 0.8, < 0.10)
|
||||
sequel (5.7.1)
|
||||
sequel (5.8.0)
|
||||
simple_oauth (0.3.1)
|
||||
simplecov (0.16.1)
|
||||
docile (~> 1.1)
|
||||
|
@ -620,7 +620,7 @@ GEM
|
|||
simple_oauth (~> 0.3.0)
|
||||
tzinfo (1.2.5)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo-data (1.2018.4)
|
||||
tzinfo-data (1.2018.5)
|
||||
tzinfo (>= 1.0.0)
|
||||
unf (0.1.4-java)
|
||||
webhdfs (0.8.0)
|
||||
|
@ -639,6 +639,8 @@ DEPENDENCIES
|
|||
builder (~> 3.2.2)
|
||||
ci_reporter_rspec (= 1.0.0)
|
||||
docker-api (= 1.31.0)
|
||||
dotenv (~> 2.2.2)
|
||||
elasticsearch (= 5.0.4)
|
||||
file-dependencies (= 0.1.6)
|
||||
flores (~> 0.0.6)
|
||||
fpm (~> 1.3.3)
|
||||
|
@ -691,13 +693,13 @@ DEPENDENCIES
|
|||
logstash-input-dead_letter_queue
|
||||
logstash-input-elasticsearch
|
||||
logstash-input-exec
|
||||
logstash-input-file
|
||||
logstash-input-file (~> 4.0.0)
|
||||
logstash-input-ganglia
|
||||
logstash-input-gelf
|
||||
logstash-input-generator
|
||||
logstash-input-graphite
|
||||
logstash-input-heartbeat
|
||||
logstash-input-http
|
||||
logstash-input-http (~> 3.0.0)
|
||||
logstash-input-http_poller (~> 3)
|
||||
logstash-input-imap
|
||||
logstash-input-irc
|
||||
|
|
|
@ -33,6 +33,8 @@ gem "docker-api", "1.31.0", :group => :development
|
|||
gem "rest-client", "1.8.0", :group => :development
|
||||
gem "pleaserun", "~>0.0.28"
|
||||
gem 'webrick', '~> 1.3.1', :group => :development
|
||||
gem 'dotenv', '~> 2.2.2'
|
||||
gem 'elasticsearch', '= 5.0.4'
|
||||
gem "logstash-input-heartbeat"
|
||||
gem "logstash-codec-collectd"
|
||||
gem "logstash-output-xmpp"
|
||||
|
@ -77,12 +79,12 @@ gem "logstash-filter-xml"
|
|||
gem "logstash-input-couchdb_changes"
|
||||
gem "logstash-input-elasticsearch"
|
||||
gem "logstash-input-exec"
|
||||
gem "logstash-input-file"
|
||||
gem "logstash-input-file", "~> 4.0.0"
|
||||
gem "logstash-input-ganglia"
|
||||
gem "logstash-input-gelf"
|
||||
gem "logstash-input-generator"
|
||||
gem "logstash-input-graphite"
|
||||
gem "logstash-input-http"
|
||||
gem "logstash-input-http", "~> 3.0.0"
|
||||
gem "logstash-input-http_poller", "~> 3"
|
||||
gem "logstash-input-imap"
|
||||
gem "logstash-input-irc"
|
||||
|
|
208
NOTICE.TXT
208
NOTICE.TXT
|
@ -31,6 +31,210 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
==========================================================================
|
||||
RubyGem: jls-grok Version: 0.11.5
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
==========================================================================
|
||||
RubyGem: awesome_print Version: 1.8.0
|
||||
Copyright (c) 2010-2013 Michael Dvorkin
|
||||
|
@ -98,7 +302,7 @@ RubyGem: elasticsearch Version: 5.0.4
|
|||
limitations under the License.
|
||||
|
||||
==========================================================================
|
||||
RubyGem: sequel Version: 5.7.1
|
||||
RubyGem: sequel Version: 5.8.0
|
||||
Copyright (c) 2007-2008 Sharon Rosner
|
||||
Copyright (c) 2008-2018 Jeremy Evans
|
||||
|
||||
|
@ -142,7 +346,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|||
THE SOFTWARE.
|
||||
|
||||
==========================================================================
|
||||
RubyGem: tzinfo-data Version: 1.2018.4
|
||||
RubyGem: tzinfo-data Version: 1.2018.5
|
||||
Copyright (c) 2005-2018 Philip Ross
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue