logstash-filter-dns 3.1.4 → 3.2.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 +7 -0
- data/LICENSE +199 -10
- data/README.md +1 -1
- data/docs/index.asciidoc +11 -3
- data/lib/logstash/filters/dns.rb +18 -3
- data/logstash-filter-dns.gemspec +2 -1
- data/spec/filters/dns_spec.rb +149 -0
- metadata +17 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 53553697483fd03bdf2c112a17de6797e1433cfe9788c85a4503a748c0e4df3d
|
4
|
+
data.tar.gz: 8e4f0800c03f7d3d3894ea7d5aa9d7f74ea1f2caf1ac95fc828163fdd8676026
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3e706cb9f6424adba08d42ea7e686b4020f467557ffbcdc9420e211b10c0adeb6d4ea0db23d189bf81529916b86f326e94c149a69282f0340cc44f6df9ffbc6c
|
7
|
+
data.tar.gz: 92e0a9fec287c122d1ba68a3f15164988420e1174e89d1278e8d12c9bc9ddcdbc9016ef64fa76372ab8b2ee0f7e2db15601c00c5ac9dbfd14f5f93ae30533ffd
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,10 @@
|
|
1
|
+
## 3.2.0
|
2
|
+
- Support adding tag(s) on DNS lookup times out, defaults to `["_dnstimeout"]` [#67](https://github.com/logstash-plugins/logstash-filter-dns/pull/67)
|
3
|
+
- As timeouts can be received through tags now, DNS lookup timeouts are logged in debug logs only. [#67](https://github.com/logstash-plugins/logstash-filter-dns/pull/67)
|
4
|
+
|
5
|
+
## 3.1.5
|
6
|
+
- Fixed an issue where a non-string value existing in the resolve/reverse field could cause the plugin to crash [#65](https://github.com/logstash-plugins/logstash-filter-dns/pull/65)
|
7
|
+
|
1
8
|
## 3.1.4
|
2
9
|
- Replaced Timeout::timeout block with `Resolv::DNS::timeouts=` [#62](https://github.com/logstash-plugins/logstash-filter-dns/pull/62)
|
3
10
|
- Added restriction for ruby version > 2.0, effectively making Logstash 6.x+ a requirement [#62](https://github.com/logstash-plugins/logstash-filter-dns/pull/62)
|
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
|
-
[![Travis Build Status](https://travis-ci.
|
3
|
+
[![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-filter-dns.svg)](https://travis-ci.com/logstash-plugins/logstash-filter-dns)
|
4
4
|
|
5
5
|
This is a plugin for [Logstash](https://github.com/elastic/logstash).
|
6
6
|
|
data/docs/index.asciidoc
CHANGED
@@ -58,6 +58,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
|
|
58
58
|
| <<plugins-{type}s-{plugin}-nameserver>> |<<hash,hash>>|No
|
59
59
|
| <<plugins-{type}s-{plugin}-resolve>> |<<array,array>>|No
|
60
60
|
| <<plugins-{type}s-{plugin}-reverse>> |<<array,array>>|No
|
61
|
+
| <<plugins-{type}s-{plugin}-tag_on_timeout>> |<<array,array>>|No
|
61
62
|
| <<plugins-{type}s-{plugin}-timeout>> |<<number,number>>|No
|
62
63
|
|=======================================================================
|
63
64
|
|
@@ -79,7 +80,7 @@ specified under `reverse` and `resolve`.
|
|
79
80
|
===== `failed_cache_size`
|
80
81
|
|
81
82
|
* Value type is <<number,number>>
|
82
|
-
* Default value is `0`
|
83
|
+
* Default value is `0` (cache disabled)
|
83
84
|
|
84
85
|
cache size for failed requests
|
85
86
|
|
@@ -95,7 +96,7 @@ how long to cache failed requests (in seconds)
|
|
95
96
|
===== `hit_cache_size`
|
96
97
|
|
97
98
|
* Value type is <<number,number>>
|
98
|
-
* Default value is `0`
|
99
|
+
* Default value is `0` (cache disabled)
|
99
100
|
|
100
101
|
set the size of cache for successful requests
|
101
102
|
|
@@ -173,7 +174,14 @@ Reverse resolve one or more fields.
|
|
173
174
|
|
174
175
|
`resolv` calls will be wrapped in a timeout instance
|
175
176
|
|
177
|
+
[id="plugins-{type}s-{plugin}-tag_on_timeout"]
|
178
|
+
===== `tag_on_timeout`
|
179
|
+
|
180
|
+
* Value type is <<array,array>>
|
181
|
+
* Defaults to `["_dnstimeout"]`.
|
182
|
+
|
183
|
+
Add tag(s) on DNS lookup time out.
|
176
184
|
|
177
185
|
|
178
186
|
[id="plugins-{type}s-{plugin}-common-options"]
|
179
|
-
include::{include_path}/{type}.asciidoc[]
|
187
|
+
include::{include_path}/{type}.asciidoc[]
|
data/lib/logstash/filters/dns.rb
CHANGED
@@ -86,6 +86,9 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
|
|
86
86
|
# Use custom hosts file(s). For example: `["/var/db/my_custom_hosts"]`
|
87
87
|
config :hostsfile, :validate => :array
|
88
88
|
|
89
|
+
# Tag(s) to apply if a DNS lookup times out. Defaults to `["_dnstimeout"]`.
|
90
|
+
config :tag_on_timeout, :validate => :string, :list => true, :default => ["_dnstimeout"]
|
91
|
+
|
89
92
|
attr_reader :hit_cache
|
90
93
|
attr_reader :failed_cache
|
91
94
|
|
@@ -194,6 +197,11 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
|
|
194
197
|
raw = raw.first
|
195
198
|
end
|
196
199
|
|
200
|
+
if !raw.kind_of?(String)
|
201
|
+
@logger.warn("DNS: skipping resolve, can't deal with non-string values", :field => field, :value => raw)
|
202
|
+
return
|
203
|
+
end
|
204
|
+
|
197
205
|
begin
|
198
206
|
return if @failed_cache && @failed_cache[raw] # recently failed resolv, skip
|
199
207
|
if @hit_cache
|
@@ -214,8 +222,9 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
|
|
214
222
|
end
|
215
223
|
rescue Resolv::ResolvTimeout
|
216
224
|
@failed_cache[raw] = true if @failed_cache
|
217
|
-
@logger.
|
225
|
+
@logger.debug("DNS: timeout on resolving the hostname.",
|
218
226
|
:field => field, :value => raw)
|
227
|
+
@tag_on_timeout.each { |tag| event.tag(tag) }
|
219
228
|
return
|
220
229
|
rescue SocketError => e
|
221
230
|
@logger.error("DNS: Encountered SocketError.",
|
@@ -269,6 +278,11 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
|
|
269
278
|
end
|
270
279
|
raw = raw.first
|
271
280
|
end
|
281
|
+
|
282
|
+
if !raw.kind_of?(String)
|
283
|
+
@logger.warn("DNS: skipping reverse, can't deal with non-string values", :field => field, :value => raw)
|
284
|
+
return
|
285
|
+
end
|
272
286
|
|
273
287
|
if ! @ip_validator.match(raw)
|
274
288
|
@logger.debug("DNS: not an address",
|
@@ -295,8 +309,9 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
|
|
295
309
|
end
|
296
310
|
rescue Resolv::ResolvTimeout
|
297
311
|
@failed_cache[raw] = true if @failed_cache
|
298
|
-
@logger.
|
312
|
+
@logger.debug("DNS: timeout on resolving address.",
|
299
313
|
:field => field, :value => raw)
|
314
|
+
@tag_on_timeout.each { |tag| event.tag(tag) }
|
300
315
|
return
|
301
316
|
rescue SocketError => e
|
302
317
|
@logger.error("DNS: Encountered SocketError.",
|
@@ -335,7 +350,7 @@ class LogStash::Filters::DNS < LogStash::Filters::Base
|
|
335
350
|
tries = 0
|
336
351
|
begin
|
337
352
|
block.call
|
338
|
-
rescue Resolv::ResolvTimeout,
|
353
|
+
rescue Resolv::ResolvTimeout, SocketError
|
339
354
|
if tries < @max_retries
|
340
355
|
tries = tries + 1
|
341
356
|
retry
|
data/logstash-filter-dns.gemspec
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
Gem::Specification.new do |s|
|
2
2
|
|
3
3
|
s.name = 'logstash-filter-dns'
|
4
|
-
s.version = '3.
|
4
|
+
s.version = '3.2.0'
|
5
5
|
s.licenses = ['Apache License (2.0)']
|
6
6
|
s.summary = "Performs a standard or reverse DNS lookup"
|
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"
|
@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
|
|
27
27
|
s.add_runtime_dependency 'lru_redux', "~> 1.1.0"
|
28
28
|
|
29
29
|
s.add_development_dependency 'logstash-devutils'
|
30
|
+
s.add_development_dependency 'insist'
|
30
31
|
end
|
data/spec/filters/dns_spec.rb
CHANGED
@@ -1,11 +1,13 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
require "logstash/devutils/rspec/spec_helper"
|
3
|
+
require "insist"
|
3
4
|
require "logstash/filters/dns"
|
4
5
|
require "resolv"
|
5
6
|
require "logstash/filters/dns/resolv_patch"
|
6
7
|
|
7
8
|
|
8
9
|
describe LogStash::Filters::DNS do
|
10
|
+
|
9
11
|
describe "with stubbed Resolv" do
|
10
12
|
before(:each) do
|
11
13
|
# We use `Resolv#each_address` and `Resolv#each_name`, which have
|
@@ -71,6 +73,27 @@ describe LogStash::Filters::DNS do
|
|
71
73
|
insist { subject.get("foo")[1] } == "carrera.databits.net"
|
72
74
|
end
|
73
75
|
end
|
76
|
+
|
77
|
+
describe "dns reverse lookup, non-string field" do
|
78
|
+
let(:plugin) { ::LogStash::Filters::DNS.new("reverse" => "foo") }
|
79
|
+
let(:event) { ::LogStash::Event.new("foo" => {"ip" => "1.2.3.4"} ) }
|
80
|
+
|
81
|
+
before do
|
82
|
+
plugin.register
|
83
|
+
allow(plugin.logger).to receive(:warn).with(any_args)
|
84
|
+
end
|
85
|
+
|
86
|
+
it "does not throw an error when filtering" do
|
87
|
+
expect do
|
88
|
+
plugin.filter(event)
|
89
|
+
end.not_to raise_error
|
90
|
+
end
|
91
|
+
|
92
|
+
it "logs an informative warning" do
|
93
|
+
plugin.filter(event)
|
94
|
+
expect(plugin.logger).to have_received(:warn).with("DNS: skipping reverse, can't deal with non-string values", :field => "foo", value: {"ip" => "1.2.3.4"})
|
95
|
+
end
|
96
|
+
end
|
74
97
|
|
75
98
|
describe "dns reverse lookup, not an IP" do
|
76
99
|
config <<-CONFIG
|
@@ -210,6 +233,21 @@ describe LogStash::Filters::DNS do
|
|
210
233
|
end
|
211
234
|
end
|
212
235
|
|
236
|
+
describe "dns resolve lookup, skip non-string value" do
|
237
|
+
config <<-CONFIG
|
238
|
+
filter {
|
239
|
+
dns {
|
240
|
+
resolve => "foo"
|
241
|
+
action => "replace"
|
242
|
+
}
|
243
|
+
}
|
244
|
+
CONFIG
|
245
|
+
|
246
|
+
sample("foo" => { "hostname" => "carrera.databits.net" }) do
|
247
|
+
insist { subject.get("foo") } == { "hostname" => "carrera.databits.net" }
|
248
|
+
end
|
249
|
+
end
|
250
|
+
|
213
251
|
describe "dns resolve lookup, append" do
|
214
252
|
config <<-CONFIG
|
215
253
|
filter {
|
@@ -584,4 +622,115 @@ describe LogStash::Filters::DNS do
|
|
584
622
|
end
|
585
623
|
end
|
586
624
|
end
|
625
|
+
|
626
|
+
describe "dns forward timeout" do
|
627
|
+
|
628
|
+
let(:subject) { LogStash::Filters::DNS.new(config) }
|
629
|
+
|
630
|
+
before(:each) do
|
631
|
+
allow(subject).to receive(:getaddress).and_raise(Resolv::ResolvTimeout)
|
632
|
+
subject.register
|
633
|
+
subject.filter(event)
|
634
|
+
end
|
635
|
+
|
636
|
+
context "when using the default tag" do
|
637
|
+
let(:config) { { "resolve" => ["message"] } }
|
638
|
+
let(:event) { LogStash::Event.new("message" => "carrera.databits.net") }
|
639
|
+
|
640
|
+
it "should add the default DNS timeout tag" do
|
641
|
+
expect(event.get("tags")).to eq(["_dnstimeout"])
|
642
|
+
end
|
643
|
+
end
|
644
|
+
|
645
|
+
context "when using a custom tag" do
|
646
|
+
let(:config) { { "resolve" => ["message"], "tag_on_timeout" => ["dns_custom_timeout"] } }
|
647
|
+
let(:event) { LogStash::Event.new("message" => "carrera.databits.net") }
|
648
|
+
|
649
|
+
it "should add the custom DNS timeout tag" do
|
650
|
+
expect(event.get("tags")).to eq(["dns_custom_timeout"])
|
651
|
+
end
|
652
|
+
end
|
653
|
+
|
654
|
+
context "when using no tags" do
|
655
|
+
let(:config) { { "resolve" => ["message"], "tag_on_timeout" => [] } }
|
656
|
+
let(:event) { LogStash::Event.new("message" => "carrera.databits.net") }
|
657
|
+
|
658
|
+
it "should not add any failure tags" do
|
659
|
+
expect(event.get("tags")).to eq(nil)
|
660
|
+
end
|
661
|
+
end
|
662
|
+
|
663
|
+
context "when logging" do
|
664
|
+
|
665
|
+
context "with debug" do
|
666
|
+
let(:config) { { "resolve" => ["message"] } }
|
667
|
+
let(:event) { LogStash::Event.new("message" => "127.0.0.1") }
|
668
|
+
|
669
|
+
before do
|
670
|
+
allow(subject.logger).to receive(:debug).with(any_args)
|
671
|
+
end
|
672
|
+
|
673
|
+
it "logs on timeout exception" do
|
674
|
+
subject.filter(event)
|
675
|
+
expect(subject.logger).to have_received(:debug).with("DNS: timeout on resolving the hostname.", :field => "message", :value => "127.0.0.1")
|
676
|
+
end
|
677
|
+
end
|
678
|
+
end
|
679
|
+
end
|
680
|
+
|
681
|
+
describe "dns reverse timeout" do
|
682
|
+
|
683
|
+
let(:subject) { LogStash::Filters::DNS.new(config) }
|
684
|
+
|
685
|
+
before(:each) do
|
686
|
+
allow(subject).to receive(:getname).and_raise(Resolv::ResolvTimeout)
|
687
|
+
subject.register
|
688
|
+
subject.filter(event)
|
689
|
+
end
|
690
|
+
|
691
|
+
context "when using the default tag" do
|
692
|
+
let(:config) { { "reverse" => ["message"] } }
|
693
|
+
let(:event) { LogStash::Event.new("message" => "127.0.0.1") }
|
694
|
+
|
695
|
+
it "should add the default DNS timeout tag" do
|
696
|
+
expect(event.get("tags")).to eq(["_dnstimeout"])
|
697
|
+
end
|
698
|
+
end
|
699
|
+
|
700
|
+
context "when using a custom tag" do
|
701
|
+
let(:config) { { "reverse" => ["message"], "tag_on_timeout" => ["dns_custom_timeout"] } }
|
702
|
+
let(:event) { LogStash::Event.new("message" => "127.0.0.1") }
|
703
|
+
|
704
|
+
it "should add the custom DNS timeout tag" do
|
705
|
+
expect(event.get("tags")).to eq(["dns_custom_timeout"])
|
706
|
+
end
|
707
|
+
end
|
708
|
+
|
709
|
+
context "when using no tags" do
|
710
|
+
let(:config) { { "reverse" => ["message"], "tag_on_timeout" => [] } }
|
711
|
+
let(:event) { LogStash::Event.new("message" => "127.0.0.1") }
|
712
|
+
|
713
|
+
it "should not add any failure tags" do
|
714
|
+
expect(event.get("tags")).to eq(nil)
|
715
|
+
end
|
716
|
+
end
|
717
|
+
|
718
|
+
context "when logging" do
|
719
|
+
|
720
|
+
context "with debug" do
|
721
|
+
let(:config) { { "reverse" => ["message"] } }
|
722
|
+
let(:event) { LogStash::Event.new("message" => "127.0.0.1") }
|
723
|
+
|
724
|
+
before do
|
725
|
+
allow(subject.logger).to receive(:debug).with(any_args)
|
726
|
+
end
|
727
|
+
|
728
|
+
it "logs timeout exception" do
|
729
|
+
subject.filter(event)
|
730
|
+
expect(subject.logger).to have_received(:debug).with("DNS: timeout on resolving address.", :field => "message", :value => "127.0.0.1")
|
731
|
+
end
|
732
|
+
end
|
733
|
+
end
|
734
|
+
end
|
735
|
+
|
587
736
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: logstash-filter-dns
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.
|
4
|
+
version: 3.2.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: 2023-01-26 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'
|
61
|
+
- !ruby/object:Gem::Dependency
|
62
|
+
requirement: !ruby/object:Gem::Requirement
|
63
|
+
requirements:
|
64
|
+
- - ">="
|
65
|
+
- !ruby/object:Gem::Version
|
66
|
+
version: '0'
|
67
|
+
name: insist
|
68
|
+
prerelease: false
|
69
|
+
type: :development
|
70
|
+
version_requirements: !ruby/object:Gem::Requirement
|
71
|
+
requirements:
|
72
|
+
- - ">="
|
73
|
+
- !ruby/object:Gem::Version
|
74
|
+
version: '0'
|
61
75
|
description: This gem is a Logstash plugin required to be installed on top of the
|
62
76
|
Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This
|
63
77
|
gem is not a stand-alone program
|
@@ -100,8 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
100
114
|
- !ruby/object:Gem::Version
|
101
115
|
version: '0'
|
102
116
|
requirements: []
|
103
|
-
|
104
|
-
rubygems_version: 2.6.13
|
117
|
+
rubygems_version: 3.1.6
|
105
118
|
signing_key:
|
106
119
|
specification_version: 4
|
107
120
|
summary: Performs a standard or reverse DNS lookup
|