logstash-input-udp 3.3.4 → 3.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/LICENSE +199 -10
- data/README.md +1 -1
- data/docs/index.asciidoc +53 -9
- data/lib/logstash/inputs/udp.rb +15 -2
- data/logstash-input-udp.gemspec +2 -1
- data/spec/inputs/udp_spec.rb +50 -0
- metadata +16 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7a0fb9a937142e05b98fc060e13c1c6dd02088c45585698a630368babe7b24c9
|
|
4
|
+
data.tar.gz: 4b81d1e42dc10ef2a18d351312f7e922203b56c491eeaef3200ca03992b2b0f6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c7e2011e1a7ffc850c20382636dd6f3c93596a1db20106fe1e13aab52494860cf9beb6a6ad5f8af563b39555a0791b52df6d0d333ab2b649c5869168a71ea93d
|
|
7
|
+
data.tar.gz: 90cb4afce18de5c517893565a907a64f770eeca401756a50eaa2885342cac702f344be120d6425d868b187c0529c7aee973d0d6ec574ae5f322f1c3517787a78
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
## 3.4.0
|
|
2
|
+
- Added ECS compatibility mode (`disabled` and `v1`) to rename ip source address in a ECS compliant name [#50](https://github.com/logstash-plugins/logstash-input-udp/pull/50)
|
|
3
|
+
- Fixed integration tests for IPv6 downgrading Docker to version 2.4 [#51](https://github.com/logstash-plugins/logstash-input-udp/pull/51)
|
|
4
|
+
|
|
1
5
|
## 3.3.4
|
|
2
6
|
- Fixed input workers exception handling and shutdown handling [#44](https://github.com/logstash-plugins/logstash-input-udp/pull/44)
|
|
3
7
|
|
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-udp)
|
|
4
4
|
|
|
5
5
|
This is a plugin for [Logstash](https://github.com/elastic/logstash).
|
|
6
6
|
|
data/docs/index.asciidoc
CHANGED
|
@@ -26,6 +26,18 @@ configuration item is `port`, which specifies the udp port logstash
|
|
|
26
26
|
will listen on for event streams.
|
|
27
27
|
|
|
28
28
|
|
|
29
|
+
[id="plugins-{type}s-{plugin}-ecs_metadata"]
|
|
30
|
+
===== Event Metadata and the Elastic Common Schema (ECS)
|
|
31
|
+
|
|
32
|
+
This plugin adds a field containing the source IP address of the UDP packet.
|
|
33
|
+
By default, the IP address is stored in the host field.
|
|
34
|
+
When ECS is enabled (in <<plugins-{type}s-{plugin}-ecs_compatibility>>), the
|
|
35
|
+
source IP address is stored in the [host][ip] field.
|
|
36
|
+
|
|
37
|
+
You can customize the field name using the <<plugins-{type}s-{plugin}-source_ip_fieldname>>.
|
|
38
|
+
See <<plugins-{type}s-{plugin}-ecs_compatibility>> for more information.
|
|
39
|
+
|
|
40
|
+
|
|
29
41
|
[id="plugins-{type}s-{plugin}-options"]
|
|
30
42
|
==== Udp Input Configuration Options
|
|
31
43
|
|
|
@@ -35,12 +47,13 @@ This plugin supports the following configuration options plus the <<plugins-{typ
|
|
|
35
47
|
|=======================================================================
|
|
36
48
|
|Setting |Input type|Required
|
|
37
49
|
| <<plugins-{type}s-{plugin}-buffer_size>> |<<number,number>>|No
|
|
50
|
+
| <<plugins-{type}s-{plugin}-ecs_compatibility>> | <<string,string>>|No
|
|
38
51
|
| <<plugins-{type}s-{plugin}-host>> |<<string,string>>|No
|
|
39
52
|
| <<plugins-{type}s-{plugin}-port>> |<<number,number>>|Yes
|
|
40
53
|
| <<plugins-{type}s-{plugin}-queue_size>> |<<number,number>>|No
|
|
41
54
|
| <<plugins-{type}s-{plugin}-receive_buffer_bytes>> |<<number,number>>|No
|
|
42
|
-
| <<plugins-{type}s-{plugin}-workers>> |<<number,number>>|No
|
|
43
55
|
| <<plugins-{type}s-{plugin}-source_ip_fieldname>> |<<string,string>>|No
|
|
56
|
+
| <<plugins-{type}s-{plugin}-workers>> |<<number,number>>|No
|
|
44
57
|
|=======================================================================
|
|
45
58
|
|
|
46
59
|
Also see <<plugins-{type}s-{plugin}-common-options>> for a list of options supported by all
|
|
@@ -56,6 +69,28 @@ input plugins.
|
|
|
56
69
|
|
|
57
70
|
The maximum packet size to read from the network
|
|
58
71
|
|
|
72
|
+
[id="plugins-{type}s-{plugin}-ecs_compatibility"]
|
|
73
|
+
===== `ecs_compatibility`
|
|
74
|
+
|
|
75
|
+
* Value type is <<string,string>>
|
|
76
|
+
* Supported values are:
|
|
77
|
+
** `disabled`: unstructured connection metadata added at root level
|
|
78
|
+
** `v1`: structured connection metadata added under ECS compliant namespaces
|
|
79
|
+
* Default value depends on which version of Logstash is running:
|
|
80
|
+
** When Logstash provides a `pipeline.ecs_compatibility` setting, its value is used as the default
|
|
81
|
+
** Otherwise, the default value is `disabled`.
|
|
82
|
+
|
|
83
|
+
Controls this plugin's compatibility with the https://www.elastic.co/guide/en/ecs/current/index.html[Elastic Common Schema (ECS)].
|
|
84
|
+
The value of this setting affects the placement of a TCP connection's metadata on events.
|
|
85
|
+
|
|
86
|
+
.Metadata Location by `ecs_compatibility` value
|
|
87
|
+
[cols="<l,<l,e,<e"]
|
|
88
|
+
|=======================================================================
|
|
89
|
+
|`disabled` |`v1` |Availability |Description
|
|
90
|
+
|
|
91
|
+
|host |[host][ip] |Always |Source IP of UDP packet
|
|
92
|
+
|=======================================================================
|
|
93
|
+
|
|
59
94
|
[id="plugins-{type}s-{plugin}-host"]
|
|
60
95
|
===== `host`
|
|
61
96
|
|
|
@@ -94,6 +129,23 @@ If option is not set, the operating system default is used.
|
|
|
94
129
|
The operating system will use the max allowed value if receive_buffer_bytes is larger than allowed.
|
|
95
130
|
Consult your operating system documentation if you need to increase this max allowed value.
|
|
96
131
|
|
|
132
|
+
[id="plugins-{type}s-{plugin}-source_ip_fieldname"]
|
|
133
|
+
===== `source_ip_fieldname`
|
|
134
|
+
|
|
135
|
+
* Value type is <<string,string>>
|
|
136
|
+
* Default value could be `"host"` or `[host][ip]` depending on the value of <<plugins-{type}s-{plugin}-ecs_compatibility>>
|
|
137
|
+
|
|
138
|
+
The name of the field where the source IP address will be stored.
|
|
139
|
+
See <<plugins-{type}s-{plugin}-ecs_metadata>> for more information on how ECS compatibility settings affect these defaults.
|
|
140
|
+
|
|
141
|
+
Example:
|
|
142
|
+
[source,ruby]
|
|
143
|
+
input {
|
|
144
|
+
udp {
|
|
145
|
+
source_ip_fieldname => "[appliace][monitoring][ip]"
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
|
|
97
149
|
[id="plugins-{type}s-{plugin}-workers"]
|
|
98
150
|
===== `workers`
|
|
99
151
|
|
|
@@ -102,14 +154,6 @@ Consult your operating system documentation if you need to increase this max all
|
|
|
102
154
|
|
|
103
155
|
Number of threads processing packets
|
|
104
156
|
|
|
105
|
-
[id="plugins-{type}s-{plugin}-source_ip_fieldname"]
|
|
106
|
-
===== `source_ip_fieldname`
|
|
107
|
-
|
|
108
|
-
* Value type is <<string,string>>
|
|
109
|
-
* Default value is `"host"`
|
|
110
|
-
|
|
111
|
-
The name of the field where the source IP address will be stored.
|
|
112
|
-
|
|
113
157
|
[id="plugins-{type}s-{plugin}-common-options"]
|
|
114
158
|
include::{include_path}/{type}.asciidoc[]
|
|
115
159
|
|
data/lib/logstash/inputs/udp.rb
CHANGED
|
@@ -5,12 +5,16 @@ require "logstash/namespace"
|
|
|
5
5
|
require "socket"
|
|
6
6
|
require "stud/interval"
|
|
7
7
|
require "ipaddr"
|
|
8
|
+
require "logstash/plugin_mixins/ecs_compatibility_support"
|
|
8
9
|
|
|
9
10
|
# Read messages as events over the network via udp. The only required
|
|
10
11
|
# configuration item is `port`, which specifies the udp port logstash
|
|
11
12
|
# will listen on for event streams.
|
|
12
13
|
#
|
|
13
14
|
class LogStash::Inputs::Udp < LogStash::Inputs::Base
|
|
15
|
+
# adds ecs_compatibility config which could be :disabled or :v1
|
|
16
|
+
include LogStash::PluginMixins::ECSCompatibilitySupport(:disabled,:v1)
|
|
17
|
+
|
|
14
18
|
config_name "udp"
|
|
15
19
|
|
|
16
20
|
default :codec, "plain"
|
|
@@ -39,7 +43,7 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
|
|
|
39
43
|
config :queue_size, :validate => :number, :default => 2000
|
|
40
44
|
|
|
41
45
|
# The name of the field where the source IP address will be stored
|
|
42
|
-
config :source_ip_fieldname, :validate => :string
|
|
46
|
+
config :source_ip_fieldname, :validate => :string
|
|
43
47
|
|
|
44
48
|
def initialize(params)
|
|
45
49
|
super
|
|
@@ -49,6 +53,15 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
|
|
|
49
53
|
def register
|
|
50
54
|
@udp = nil
|
|
51
55
|
@metric_errors = metric.namespace(:errors)
|
|
56
|
+
if source_ip_fieldname.nil?
|
|
57
|
+
# define ecs name mapping
|
|
58
|
+
@field_source_ip = ecs_select[disabled: "host", v1: "[host][ip]"]
|
|
59
|
+
else
|
|
60
|
+
@field_source_ip = source_ip_fieldname
|
|
61
|
+
if (ecs_compatibility != :disabled)
|
|
62
|
+
@logger.warn("'source_ip_fieldname' is user customized, please check is has an ECS compatible name ")
|
|
63
|
+
end
|
|
64
|
+
end
|
|
52
65
|
end # def register
|
|
53
66
|
|
|
54
67
|
def run(output_queue)
|
|
@@ -174,7 +187,7 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
|
|
|
174
187
|
|
|
175
188
|
def push_decoded_event(ip_address, event)
|
|
176
189
|
decorate(event)
|
|
177
|
-
event.set(
|
|
190
|
+
event.set(@field_source_ip, ip_address) if event.get(@field_source_ip).nil?
|
|
178
191
|
@output_queue.push(event)
|
|
179
192
|
metric.increment(:events)
|
|
180
193
|
end
|
data/logstash-input-udp.gemspec
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
Gem::Specification.new do |s|
|
|
2
2
|
|
|
3
3
|
s.name = 'logstash-input-udp'
|
|
4
|
-
s.version = '3.
|
|
4
|
+
s.version = '3.4.0'
|
|
5
5
|
s.licenses = ['Apache License (2.0)']
|
|
6
6
|
s.summary = "Reads events over UDP"
|
|
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"
|
|
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
|
|
|
24
24
|
|
|
25
25
|
s.add_runtime_dependency 'logstash-codec-plain'
|
|
26
26
|
s.add_runtime_dependency 'stud', '~> 0.0.22'
|
|
27
|
+
s.add_runtime_dependency 'logstash-mixin-ecs_compatibility_support', '~>1.1'
|
|
27
28
|
s.add_development_dependency 'logstash-codec-line'
|
|
28
29
|
s.add_development_dependency 'logstash-devutils'
|
|
29
30
|
end
|
data/spec/inputs/udp_spec.rb
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
# encoding: utf-8
|
|
2
2
|
require_relative "../spec_helper"
|
|
3
|
+
require "logstash/devutils/rspec/shared_examples"
|
|
3
4
|
require_relative "../support/client"
|
|
4
5
|
require "logstash/codecs/base"
|
|
5
6
|
|
|
@@ -71,6 +72,55 @@ describe LogStash::Inputs::Udp do
|
|
|
71
72
|
end
|
|
72
73
|
end
|
|
73
74
|
|
|
75
|
+
shared_examples "use hostname field with ECS" do |ecs_compatibility, field_name|
|
|
76
|
+
let(:config) { { "port" => port, "workers" => 1, "ecs_compatibility" => ecs_compatibility} }
|
|
77
|
+
let(:localhost) { "127.0.0.1" }
|
|
78
|
+
let(:client) { LogStash::Inputs::Test::UDPClient.new(port, localhost) }
|
|
79
|
+
|
|
80
|
+
let(:events) do
|
|
81
|
+
helper.input(subject, 1) do
|
|
82
|
+
client.send("line1")
|
|
83
|
+
end
|
|
84
|
+
end
|
|
85
|
+
|
|
86
|
+
before(:each) do
|
|
87
|
+
subject.register
|
|
88
|
+
end
|
|
89
|
+
|
|
90
|
+
it "should receive event with source_ip_fieldname as '#{field_name}' when ecs #{ecs_compatibility}" do
|
|
91
|
+
expect(events.size).to be(1)
|
|
92
|
+
message = events.last
|
|
93
|
+
expect(message.get(field_name)).to eq(client.host)
|
|
94
|
+
end
|
|
95
|
+
end
|
|
96
|
+
|
|
97
|
+
it_behaves_like "use hostname field with ECS", :disabled, "host"
|
|
98
|
+
it_behaves_like "use hostname field with ECS", :v1, "[host][ip]"
|
|
99
|
+
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
describe "uses custom hostname field when ECS is enabled" do
|
|
103
|
+
let(:config) { { "port" => port, "workers" => 1, "ecs_compatibility" => :v1, "source_ip_fieldname" => "custom_host_field"} }
|
|
104
|
+
let(:localhost) { "127.0.0.1" }
|
|
105
|
+
let(:client) { LogStash::Inputs::Test::UDPClient.new(port, localhost) }
|
|
106
|
+
|
|
107
|
+
let(:events) do
|
|
108
|
+
helper.input(subject, 1) do
|
|
109
|
+
client.send("line1")
|
|
110
|
+
end
|
|
111
|
+
end
|
|
112
|
+
|
|
113
|
+
before(:each) do
|
|
114
|
+
subject.register
|
|
115
|
+
end
|
|
116
|
+
|
|
117
|
+
it "should receive event with user defined source_ip_fieldname" do
|
|
118
|
+
expect(events.size).to be(1)
|
|
119
|
+
message = events.last
|
|
120
|
+
expect(message.get(config['source_ip_fieldname'])).to eq(client.host)
|
|
121
|
+
end
|
|
122
|
+
end
|
|
123
|
+
|
|
74
124
|
describe "multiple lines per datagram using line codec" do
|
|
75
125
|
# 3 workers for 3 datagrams send below
|
|
76
126
|
let(:config) { { "port" => port, "workers" => 3, "codec" => "line" } }
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: logstash-input-udp
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.
|
|
4
|
+
version: 3.4.0
|
|
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-02-08 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -58,6 +58,20 @@ dependencies:
|
|
|
58
58
|
- - "~>"
|
|
59
59
|
- !ruby/object:Gem::Version
|
|
60
60
|
version: 0.0.22
|
|
61
|
+
- !ruby/object:Gem::Dependency
|
|
62
|
+
requirement: !ruby/object:Gem::Requirement
|
|
63
|
+
requirements:
|
|
64
|
+
- - "~>"
|
|
65
|
+
- !ruby/object:Gem::Version
|
|
66
|
+
version: '1.1'
|
|
67
|
+
name: logstash-mixin-ecs_compatibility_support
|
|
68
|
+
prerelease: false
|
|
69
|
+
type: :runtime
|
|
70
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
71
|
+
requirements:
|
|
72
|
+
- - "~>"
|
|
73
|
+
- !ruby/object:Gem::Version
|
|
74
|
+
version: '1.1'
|
|
61
75
|
- !ruby/object:Gem::Dependency
|
|
62
76
|
requirement: !ruby/object:Gem::Requirement
|
|
63
77
|
requirements:
|