logstash-input-syslog 3.4.0 → 3.4.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +18 -0
- data/LICENSE +199 -10
- data/README.md +1 -1
- data/docs/index.asciidoc +18 -4
- data/lib/logstash/inputs/syslog.rb +17 -23
- data/logstash-input-syslog.gemspec +1 -2
- data/spec/inputs/syslog_spec.rb +35 -31
- metadata +2 -16
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 78d3ae407146832319799963b5ca4a436fda4936a75e1985261c8b4439acedec
|
|
4
|
+
data.tar.gz: a59e5ea7f49ced6e7a9c75d4f30154733e4ad9413a1be01e309848e5802b7fac
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3e9d73ad662d26e0a1a49b6700e8da99050982da9c36766473eb21742279e8117091fbfa1b6ab7d11958d6e015754eb7a4547c2795782fcd9081557510ca8097
|
|
7
|
+
data.tar.gz: 2cf5e512229804e7dc0f99cded9070cf48d5f2d4ac73c107e60c242b453b55fce8832b6b71ee1766778d61719da39687806bd57c913d784556684c98f32a144f
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
## 3.4.5
|
|
2
|
+
- Added support for listening on IPv6 addresses
|
|
3
|
+
|
|
4
|
+
## 3.4.4
|
|
5
|
+
- Refactor: avoid global side-effect + cleanup [#62](https://github.com/logstash-plugins/logstash-input-syslog/pull/62)
|
|
6
|
+
* avoid setting `BasicSocket.do_not_reverse_lookup` as it has side effects for others
|
|
7
|
+
|
|
8
|
+
## 3.4.3
|
|
9
|
+
- [DOC] Added expanded descriptions and requirements for facility_labels and severity_labels. [#52](https://github.com/logstash-plugins/logstash-input-syslog/pull/52)
|
|
10
|
+
|
|
11
|
+
## 3.4.2
|
|
12
|
+
- Remove (deprecated) dependency on thread_safe gem.
|
|
13
|
+
- CI: upgrade testing [#58](https://github.com/logstash-plugins/logstash-input-syslog/pull/58)
|
|
14
|
+
- [DOC] Correct example for `timezone` option [#53](https://github.com/logstash-plugins/logstash-input-syslog/pull/53)
|
|
15
|
+
|
|
16
|
+
## 3.4.1
|
|
17
|
+
- Docs: Set the default_codec doc attribute.
|
|
18
|
+
|
|
1
19
|
## 3.4.0
|
|
2
20
|
- Allow the syslog field to be a configurable option. This is useful for when codecs change
|
|
3
21
|
the field containing the syslog data (e.g. the CEF codec).
|
data/LICENSE
CHANGED
|
@@ -1,13 +1,202 @@
|
|
|
1
|
-
Copyright (c) 2012-2018 Elasticsearch <http://www.elastic.co>
|
|
2
1
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
Apache License
|
|
3
|
+
Version 2.0, January 2004
|
|
4
|
+
http://www.apache.org/licenses/
|
|
6
5
|
|
|
7
|
-
|
|
6
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
8
7
|
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
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
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Logstash Plugin
|
|
2
2
|
|
|
3
|
-
[](https://travis-ci.com/logstash-plugins/logstash-input-syslog)
|
|
4
4
|
|
|
5
5
|
This is a plugin for [Logstash](https://github.com/elastic/logstash).
|
|
6
6
|
|
data/docs/index.asciidoc
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
:plugin: syslog
|
|
2
2
|
:type: input
|
|
3
|
+
:default_codec: plain
|
|
3
4
|
|
|
4
5
|
///////////////////////////////////////////
|
|
5
6
|
START - GENERATED VARIABLES, DO NOT EDIT!
|
|
@@ -69,7 +70,14 @@ input plugins.
|
|
|
69
70
|
* Value type is <<array,array>>
|
|
70
71
|
* Default value is `["kernel", "user-level", "mail", "system", "security/authorization", "syslogd", "line printer", "network news", "UUCP", "clock", "security/authorization", "FTP", "NTP", "log audit", "log alert", "clock", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7"]`
|
|
71
72
|
|
|
72
|
-
Labels for facility levels
|
|
73
|
+
Labels for facility levels defined in RFC3164.
|
|
74
|
+
|
|
75
|
+
You can use this option to override the integer->label mapping for syslog inputs
|
|
76
|
+
that behave differently than the RFCs.
|
|
77
|
+
|
|
78
|
+
Provide a zero-indexed array with all of your facility labels _in order_.
|
|
79
|
+
If a log message contains a facility number with no corresponding entry,
|
|
80
|
+
the facility_label is not added to the event.
|
|
73
81
|
|
|
74
82
|
[id="plugins-{type}s-{plugin}-grok_pattern"]
|
|
75
83
|
===== `grok_pattern`
|
|
@@ -135,7 +143,11 @@ http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt
|
|
|
135
143
|
* Value type is <<array,array>>
|
|
136
144
|
* Default value is `["Emergency", "Alert", "Critical", "Error", "Warning", "Notice", "Informational", "Debug"]`
|
|
137
145
|
|
|
138
|
-
Labels for severity levels
|
|
146
|
+
Labels for severity levels defined in RFC3164.
|
|
147
|
+
|
|
148
|
+
Provide a zero-indexed array with all of your severity labels _in order_.
|
|
149
|
+
If a log message contains a severity label with no corresponding entry,
|
|
150
|
+
the severity_label is not added to the event.
|
|
139
151
|
|
|
140
152
|
[id="plugins-{type}s-{plugin}-syslog_field"]
|
|
141
153
|
===== `syslog_field`
|
|
@@ -171,8 +183,8 @@ The valid IDs are listed on the [Joda.org available time zones page](http://joda
|
|
|
171
183
|
This is useful in case the time zone cannot be extracted from the value,
|
|
172
184
|
and is not the platform default.
|
|
173
185
|
If this is not specified the platform default will be used.
|
|
174
|
-
Canonical ID is good as it takes care of daylight saving time for you
|
|
175
|
-
For example, `America/Los_Angeles` or `Europe/
|
|
186
|
+
Canonical ID is good as it takes care of daylight saving time for you.
|
|
187
|
+
For example, `America/Los_Angeles` or `Europe/Paris` are valid IDs.
|
|
176
188
|
|
|
177
189
|
[id="plugins-{type}s-{plugin}-use_labels"]
|
|
178
190
|
===== `use_labels`
|
|
@@ -186,3 +198,5 @@ Use label parsing for severity and facility levels.
|
|
|
186
198
|
|
|
187
199
|
[id="plugins-{type}s-{plugin}-common-options"]
|
|
188
200
|
include::{include_path}/{type}.asciidoc[]
|
|
201
|
+
|
|
202
|
+
:default_codec!:
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
# encoding: utf-8
|
|
2
2
|
require "date"
|
|
3
3
|
require "socket"
|
|
4
|
-
require "concurrent"
|
|
4
|
+
require "concurrent/array"
|
|
5
5
|
require "logstash/filters/grok"
|
|
6
6
|
require "logstash/filters/date"
|
|
7
7
|
require "logstash/inputs/base"
|
|
@@ -59,8 +59,7 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
|
|
|
59
59
|
|
|
60
60
|
# Specify a time zone canonical ID to be used for date parsing.
|
|
61
61
|
# The valid IDs are listed on the [Joda.org available time zones page](http://joda-time.sourceforge.net/timezones.html).
|
|
62
|
-
# This is useful in case the time zone cannot be extracted from the value,
|
|
63
|
-
# and is not the platform default.
|
|
62
|
+
# This is useful in case the time zone cannot be extracted from the value, and is not the platform default.
|
|
64
63
|
# If this is not specified the platform default will be used.
|
|
65
64
|
# Canonical ID is good as it takes care of daylight saving time for you
|
|
66
65
|
# For example, `America/Los_Angeles` or `Europe/France` are valid IDs.
|
|
@@ -75,16 +74,10 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
|
|
|
75
74
|
#
|
|
76
75
|
config :locale, :validate => :string
|
|
77
76
|
|
|
78
|
-
public
|
|
79
|
-
def initialize(params)
|
|
80
|
-
super
|
|
81
|
-
BasicSocket.do_not_reverse_lookup = true
|
|
82
|
-
end # def initialize
|
|
83
|
-
|
|
84
77
|
public
|
|
85
78
|
def register
|
|
86
79
|
@metric_errors = metric.namespace(:errors)
|
|
87
|
-
|
|
80
|
+
|
|
88
81
|
@grok_filter = LogStash::Filters::Grok.new(
|
|
89
82
|
"overwrite" => @syslog_field,
|
|
90
83
|
"match" => { @syslog_field => @grok_pattern },
|
|
@@ -100,7 +93,7 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
|
|
|
100
93
|
@grok_filter.register
|
|
101
94
|
@date_filter.register
|
|
102
95
|
|
|
103
|
-
@tcp_sockets =
|
|
96
|
+
@tcp_sockets = Concurrent::Array.new
|
|
104
97
|
@tcp = @udp = nil
|
|
105
98
|
end # def register
|
|
106
99
|
|
|
@@ -145,7 +138,8 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
|
|
|
145
138
|
@logger.info("Starting syslog udp listener", :address => "#{@host}:#{@port}")
|
|
146
139
|
|
|
147
140
|
@udp.close if @udp
|
|
148
|
-
@udp = UDPSocket.new(Socket::AF_INET
|
|
141
|
+
@udp = UDPSocket.new (IPAddr.new(@host).ipv6? rescue nil) ? Socket::AF_INET6 : Socket::AF_INET
|
|
142
|
+
@udp.do_not_reverse_lookup = true
|
|
149
143
|
@udp.bind(@host, @port)
|
|
150
144
|
|
|
151
145
|
while !stop?
|
|
@@ -165,6 +159,7 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
|
|
|
165
159
|
def tcp_listener(output_queue)
|
|
166
160
|
@logger.info("Starting syslog tcp listener", :address => "#{@host}:#{@port}")
|
|
167
161
|
@tcp = TCPServer.new(@host, @port)
|
|
162
|
+
@tcp.do_not_reverse_lookup = true
|
|
168
163
|
|
|
169
164
|
while !stop?
|
|
170
165
|
socket = @tcp.accept
|
|
@@ -217,7 +212,7 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
|
|
|
217
212
|
logger.info("connection error: #{ioerror.message}")
|
|
218
213
|
ensure
|
|
219
214
|
@tcp_sockets.delete(socket)
|
|
220
|
-
socket.close rescue log_and_squash
|
|
215
|
+
socket.close rescue log_and_squash(:close_tcp_receiver_socket)
|
|
221
216
|
end
|
|
222
217
|
|
|
223
218
|
private
|
|
@@ -231,7 +226,7 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
|
|
|
231
226
|
end
|
|
232
227
|
rescue => e
|
|
233
228
|
# swallow and log all decoding exceptions, these will never be socket related
|
|
234
|
-
@logger.error("Error decoding data", :data => data.inspect, :exception => e, :backtrace => e.backtrace)
|
|
229
|
+
@logger.error("Error decoding data", :data => data.inspect, :exception => e.class, :message => e.message, :backtrace => e.backtrace)
|
|
235
230
|
@metric_errors.increment(:decoding)
|
|
236
231
|
end
|
|
237
232
|
|
|
@@ -244,16 +239,15 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
|
|
|
244
239
|
private
|
|
245
240
|
def close_udp
|
|
246
241
|
if @udp
|
|
247
|
-
@udp.close_read rescue log_and_squash
|
|
248
|
-
@udp.close_write rescue log_and_squash
|
|
242
|
+
@udp.close_read rescue log_and_squash(:close_udp_read)
|
|
243
|
+
@udp.close_write rescue log_and_squash(:close_udp_write)
|
|
249
244
|
end
|
|
250
245
|
@udp = nil
|
|
251
246
|
end
|
|
252
247
|
|
|
253
248
|
private
|
|
254
249
|
|
|
255
|
-
# Helper for inline rescues, which logs the
|
|
256
|
-
# and returns nil.
|
|
250
|
+
# Helper for inline rescues, which logs the exception at "DEBUG" level and returns nil.
|
|
257
251
|
#
|
|
258
252
|
# Instead of:
|
|
259
253
|
# ~~~ ruby
|
|
@@ -261,19 +255,19 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
|
|
|
261
255
|
# ~~~
|
|
262
256
|
# Do:
|
|
263
257
|
# ~~~ ruby
|
|
264
|
-
#. foo rescue log_and_squash
|
|
258
|
+
#. foo rescue log_and_squash(:foo)
|
|
265
259
|
# ~~~
|
|
266
|
-
def log_and_squash
|
|
267
|
-
$! && logger.
|
|
260
|
+
def log_and_squash(label)
|
|
261
|
+
$! && logger.debug("#{label} failed:", :exception => $!.class, :message => $!.message)
|
|
268
262
|
nil
|
|
269
263
|
end
|
|
270
264
|
|
|
271
265
|
def close_tcp
|
|
272
266
|
# If we somehow have this left open, close it.
|
|
273
267
|
@tcp_sockets.each do |socket|
|
|
274
|
-
socket.close rescue log_and_squash
|
|
268
|
+
socket.close rescue log_and_squash(:close_tcp_socket)
|
|
275
269
|
end
|
|
276
|
-
@tcp.close if @tcp rescue log_and_squash
|
|
270
|
+
@tcp.close if @tcp rescue log_and_squash(:close_tcp)
|
|
277
271
|
@tcp = nil
|
|
278
272
|
end
|
|
279
273
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
Gem::Specification.new do |s|
|
|
2
2
|
|
|
3
3
|
s.name = 'logstash-input-syslog'
|
|
4
|
-
s.version = '3.4.
|
|
4
|
+
s.version = '3.4.5'
|
|
5
5
|
s.licenses = ['Apache License (2.0)']
|
|
6
6
|
s.summary = "Reads syslog messages as events"
|
|
7
7
|
s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
|
|
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
|
|
|
23
23
|
s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
|
|
24
24
|
|
|
25
25
|
s.add_runtime_dependency 'concurrent-ruby'
|
|
26
|
-
s.add_runtime_dependency 'thread_safe'
|
|
27
26
|
s.add_runtime_dependency 'stud', '>= 0.0.22', '< 0.1.0'
|
|
28
27
|
|
|
29
28
|
s.add_runtime_dependency 'logstash-codec-plain'
|
data/spec/inputs/syslog_spec.rb
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
# encoding: utf-8
|
|
2
2
|
require "logstash/devutils/rspec/spec_helper"
|
|
3
|
+
require "logstash/devutils/rspec/shared_examples"
|
|
3
4
|
|
|
4
5
|
# running the grok code outside a logstash package means
|
|
5
6
|
# LOGSTASH_HOME will not be defined, so let's set it here
|
|
@@ -31,6 +32,7 @@ describe LogStash::Inputs::Syslog do
|
|
|
31
32
|
SYSLOG_LINE = "<164>Oct 26 15:19:25 1.2.3.4 %ASA-4-106023: Deny udp src DRAC:10.1.2.3/43434 dst outside:192.168.0.1/53 by access-group \"acl_drac\" [0x0, 0x0]"
|
|
32
33
|
|
|
33
34
|
it "should properly handle priority, severity and facilities" do
|
|
35
|
+
skip 'elastic/logstash#11196 known LS 7.5 issue' if ENV['ELASTIC_STACK_VERSION'] && JRUBY_VERSION.eql?('9.2.8.0')
|
|
34
36
|
port = 5511
|
|
35
37
|
event_count = 10
|
|
36
38
|
conf = <<-CONFIG
|
|
@@ -52,15 +54,16 @@ describe LogStash::Inputs::Syslog do
|
|
|
52
54
|
event_count.times.collect { queue.pop }
|
|
53
55
|
end
|
|
54
56
|
|
|
55
|
-
|
|
57
|
+
expect( events.length ).to eql event_count
|
|
56
58
|
events.each do |event|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
59
|
+
expect( event.get("priority") ).to eql 164
|
|
60
|
+
expect( event.get("severity") ).to eql 4
|
|
61
|
+
expect( event.get("facility") ).to eql 20
|
|
60
62
|
end
|
|
61
63
|
end
|
|
62
64
|
|
|
63
65
|
it "should properly PROXY protocol v1" do
|
|
66
|
+
skip 'elastic/logstash#11196 known LS 7.5 issue' if ENV['ELASTIC_STACK_VERSION'] && JRUBY_VERSION.eql?('9.2.8.0')
|
|
64
67
|
port = 5511
|
|
65
68
|
event_count = 10
|
|
66
69
|
conf = <<-CONFIG
|
|
@@ -85,16 +88,17 @@ describe LogStash::Inputs::Syslog do
|
|
|
85
88
|
event_count.times.collect { queue.pop }
|
|
86
89
|
end
|
|
87
90
|
|
|
88
|
-
|
|
91
|
+
expect( events.length ).to eql event_count
|
|
89
92
|
events.each do |event|
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
93
|
+
expect( event.get("priority") ).to eql 164
|
|
94
|
+
expect( event.get("severity") ).to eql 4
|
|
95
|
+
expect( event.get("facility") ).to eql 20
|
|
96
|
+
expect( event.get("host") ).to eql "1.2.3.4"
|
|
94
97
|
end
|
|
95
98
|
end
|
|
96
99
|
|
|
97
100
|
it "should add unique tag when grok parsing fails with live syslog input" do
|
|
101
|
+
skip 'elastic/logstash#11196 known LS 7.5 issue' if ENV['ELASTIC_STACK_VERSION'] && JRUBY_VERSION.eql?('9.2.8.0')
|
|
98
102
|
port = 5511
|
|
99
103
|
event_count = 10
|
|
100
104
|
conf = <<-CONFIG
|
|
@@ -116,9 +120,9 @@ describe LogStash::Inputs::Syslog do
|
|
|
116
120
|
event_count.times.collect { queue.pop }
|
|
117
121
|
end
|
|
118
122
|
|
|
119
|
-
|
|
123
|
+
expect( events.length ).to eql event_count
|
|
120
124
|
event_count.times do |i|
|
|
121
|
-
|
|
125
|
+
expect( events[i].get("tags") ).to eql ["_grokparsefailure_sysloginput"]
|
|
122
126
|
end
|
|
123
127
|
end
|
|
124
128
|
|
|
@@ -147,9 +151,9 @@ describe LogStash::Inputs::Syslog do
|
|
|
147
151
|
event_count.times.collect { queue.pop }
|
|
148
152
|
end
|
|
149
153
|
|
|
150
|
-
|
|
154
|
+
expect( events.length ).to eql event_count
|
|
151
155
|
events.each do |event|
|
|
152
|
-
|
|
156
|
+
expect( event.get("@timestamp").to_iso8601 ).to eql "#{Time.now.year}-10-26T15:19:25.000Z"
|
|
153
157
|
end
|
|
154
158
|
end
|
|
155
159
|
|
|
@@ -174,7 +178,7 @@ describe LogStash::Inputs::Syslog do
|
|
|
174
178
|
end
|
|
175
179
|
|
|
176
180
|
# chances platform timezone is not UTC so ignore the hours
|
|
177
|
-
|
|
181
|
+
expect( event.get("@timestamp").to_iso8601 ).to match /#{Time.now.year}-10-26T\d\d:19:25.000Z/
|
|
178
182
|
end
|
|
179
183
|
|
|
180
184
|
it "should support non UTC timezone" do
|
|
@@ -185,7 +189,7 @@ describe LogStash::Inputs::Syslog do
|
|
|
185
189
|
|
|
186
190
|
syslog_event = LogStash::Event.new({ "message" => "<164>Oct 26 15:19:25 1.2.3.4 %ASA-4-106023: Deny udp src DRAC:10.1.2.3/43434" })
|
|
187
191
|
input.syslog_relay(syslog_event)
|
|
188
|
-
|
|
192
|
+
expect( syslog_event.get("@timestamp").to_iso8601 ).to eql "#{Time.now.year}-10-26T20:19:25.000Z"
|
|
189
193
|
|
|
190
194
|
input.close
|
|
191
195
|
end
|
|
@@ -197,13 +201,13 @@ describe LogStash::Inputs::Syslog do
|
|
|
197
201
|
# event which is not syslog should have a new tag
|
|
198
202
|
event = LogStash::Event.new({ "message" => "hello world, this is not syslog RFC3164" })
|
|
199
203
|
input.syslog_relay(event)
|
|
200
|
-
|
|
204
|
+
expect( event.get("tags") ).to eql ["_grokparsefailure_sysloginput"]
|
|
201
205
|
|
|
202
206
|
syslog_event = LogStash::Event.new({ "message" => "<164>Oct 26 15:19:25 1.2.3.4 %ASA-4-106023: Deny udp src DRAC:10.1.2.3/43434" })
|
|
203
207
|
input.syslog_relay(syslog_event)
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
208
|
+
expect( syslog_event.get("priority") ).to eql 164
|
|
209
|
+
expect( syslog_event.get("severity") ).to eql 4
|
|
210
|
+
expect( syslog_event.get("tags") ).to be nil
|
|
207
211
|
|
|
208
212
|
input.close
|
|
209
213
|
end
|
|
@@ -240,13 +244,13 @@ describe LogStash::Inputs::Syslog do
|
|
|
240
244
|
event_count.times.collect { queue.pop }
|
|
241
245
|
end
|
|
242
246
|
|
|
243
|
-
|
|
247
|
+
expect( events.length ).to eql event_count
|
|
244
248
|
events.each do |event|
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
249
|
+
expect( event.get("priority") ).to eql 164
|
|
250
|
+
expect( event.get("severity") ).to eql 4
|
|
251
|
+
expect( event.get("facility") ).to eql 20
|
|
252
|
+
expect( event.get("message") ).to eql "#{message_field}\n"
|
|
253
|
+
expect( event.get("timestamp") ).to eql timestamp
|
|
250
254
|
end
|
|
251
255
|
end
|
|
252
256
|
|
|
@@ -279,13 +283,13 @@ describe LogStash::Inputs::Syslog do
|
|
|
279
283
|
event_count.times.collect { queue.pop }
|
|
280
284
|
end
|
|
281
285
|
|
|
282
|
-
|
|
286
|
+
expect( events.length ).to eql event_count
|
|
283
287
|
events.each do |event|
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
288
|
+
expect( event.get("priority") ).to eql 134
|
|
289
|
+
expect( event.get("severity") ).to eql 6
|
|
290
|
+
expect( event.get("facility") ).to eql 16
|
|
291
|
+
expect( event.get("message") ).to eql message_field
|
|
292
|
+
expect( event.get("timestamp") ).to eql timestamp
|
|
289
293
|
end
|
|
290
294
|
end
|
|
291
295
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: logstash-input-syslog
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.4.
|
|
4
|
+
version: 3.4.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Elastic
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2021-01-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -44,20 +44,6 @@ dependencies:
|
|
|
44
44
|
- - ">="
|
|
45
45
|
- !ruby/object:Gem::Version
|
|
46
46
|
version: '0'
|
|
47
|
-
- !ruby/object:Gem::Dependency
|
|
48
|
-
requirement: !ruby/object:Gem::Requirement
|
|
49
|
-
requirements:
|
|
50
|
-
- - ">="
|
|
51
|
-
- !ruby/object:Gem::Version
|
|
52
|
-
version: '0'
|
|
53
|
-
name: thread_safe
|
|
54
|
-
prerelease: false
|
|
55
|
-
type: :runtime
|
|
56
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
57
|
-
requirements:
|
|
58
|
-
- - ">="
|
|
59
|
-
- !ruby/object:Gem::Version
|
|
60
|
-
version: '0'
|
|
61
47
|
- !ruby/object:Gem::Dependency
|
|
62
48
|
requirement: !ruby/object:Gem::Requirement
|
|
63
49
|
requirements:
|