logstash-input-sqs 3.1.2 → 3.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +12 -0
- data/LICENSE +199 -10
- data/README.md +1 -1
- data/docs/index.asciidoc +32 -0
- data/lib/logstash/inputs/sqs.rb +39 -17
- data/logstash-input-sqs.gemspec +3 -3
- data/spec/inputs/sqs_spec.rb +113 -3
- metadata +6 -7
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7e5a412aaf0b37b3f1c6673afc9fd8b78556daa2f9376a23d1487d2f67a3dedd
|
|
4
|
+
data.tar.gz: 9743307a98b4776f11c345a99eca8ebf33f85bb877d06665d65e22f1523f70a8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e7cc7618b904128cec536bc969a866eff79115a572387847be526eb491f7686e57036c37d7c88e6c144c07e42f814a82bfd62e36c1b74638f9bb09828dc791c8
|
|
7
|
+
data.tar.gz: 216ff224a892a75c6189fec011643af992f014af8cdcf9d2401ecc95687d3eea400a83d218a5b3823cd3f53918f93aef3c78297eea9cc4fd804a8f000e7cd629
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## 3.3.1
|
|
2
|
+
- Refactoring: used logstash-mixin-aws to leverage shared code to manage `additional_settings` [#64](https://github.com/logstash-plugins/logstash-input-sqs/pull/64)
|
|
3
|
+
|
|
4
|
+
## 3.3.0
|
|
5
|
+
- Feature: Add `additional_settings` option to fine-grain configuration of AWS client [#61](https://github.com/logstash-plugins/logstash-input-sqs/pull/61)
|
|
6
|
+
|
|
7
|
+
## 3.2.0
|
|
8
|
+
- Feature: Add `queue_owner_aws_account_id` parameter for cross-account queues [#60](https://github.com/logstash-plugins/logstash-input-sqs/pull/60)
|
|
9
|
+
|
|
10
|
+
## 3.1.3
|
|
11
|
+
- Fix: retry networking errors (with backoff) [#57](https://github.com/logstash-plugins/logstash-input-sqs/pull/57)
|
|
12
|
+
|
|
1
13
|
## 3.1.2
|
|
2
14
|
- Added support for multiple events inside same message from SQS [#48](https://github.com/logstash-plugins/logstash-input-sqs/pull/48/files)
|
|
3
15
|
|
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-sqs)
|
|
4
4
|
|
|
5
5
|
This is a plugin for [Logstash](https://github.com/elastic/logstash).
|
|
6
6
|
|
data/docs/index.asciidoc
CHANGED
|
@@ -85,6 +85,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
|
|
|
85
85
|
|=======================================================================
|
|
86
86
|
|Setting |Input type|Required
|
|
87
87
|
| <<plugins-{type}s-{plugin}-access_key_id>> |<<string,string>>|No
|
|
88
|
+
| <<plugins-{type}s-{plugin}-additional_settings>> |<<hash,hash>>|No
|
|
88
89
|
| <<plugins-{type}s-{plugin}-aws_credentials_file>> |<<string,string>>|No
|
|
89
90
|
| <<plugins-{type}s-{plugin}-endpoint>> |<<string,string>>|No
|
|
90
91
|
| <<plugins-{type}s-{plugin}-id_field>> |<<string,string>>|No
|
|
@@ -92,6 +93,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
|
|
|
92
93
|
| <<plugins-{type}s-{plugin}-polling_frequency>> |<<number,number>>|No
|
|
93
94
|
| <<plugins-{type}s-{plugin}-proxy_uri>> |<<string,string>>|No
|
|
94
95
|
| <<plugins-{type}s-{plugin}-queue>> |<<string,string>>|Yes
|
|
96
|
+
| <<plugins-{type}s-{plugin}-queue_owner_aws_account_id>> |<<string,string>>|No
|
|
95
97
|
| <<plugins-{type}s-{plugin}-region>> |<<string,string>>|No
|
|
96
98
|
| <<plugins-{type}s-{plugin}-role_arn>> |<<string,string>>|No
|
|
97
99
|
| <<plugins-{type}s-{plugin}-role_session_name>> |<<string,string>>|No
|
|
@@ -120,6 +122,28 @@ This plugin uses the AWS SDK and supports several ways to get credentials, which
|
|
|
120
122
|
4. Environment variables `AMAZON_ACCESS_KEY_ID` and `AMAZON_SECRET_ACCESS_KEY`
|
|
121
123
|
5. IAM Instance Profile (available when running inside EC2)
|
|
122
124
|
|
|
125
|
+
[id="plugins-{type}s-{plugin}-additional_settings"]
|
|
126
|
+
===== `additional_settings`
|
|
127
|
+
|
|
128
|
+
* Value type is <<hash,hash>>
|
|
129
|
+
* Default value is `{}`
|
|
130
|
+
|
|
131
|
+
Key-value pairs of settings and corresponding values used to parametrize
|
|
132
|
+
the connection to SQS. See full list in https://docs.aws.amazon.com/sdk-for-ruby/v2/api/Aws/SQS/Client.html[the AWS SDK documentation]. Example:
|
|
133
|
+
|
|
134
|
+
[source,ruby]
|
|
135
|
+
input {
|
|
136
|
+
sqs {
|
|
137
|
+
access_key_id => "1234"
|
|
138
|
+
secret_access_key => "secret"
|
|
139
|
+
queue => "logstash-test-queue"
|
|
140
|
+
additional_settings => {
|
|
141
|
+
force_path_style => true
|
|
142
|
+
follow_redirects => false
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
|
|
123
147
|
[id="plugins-{type}s-{plugin}-aws_credentials_file"]
|
|
124
148
|
===== `aws_credentials_file`
|
|
125
149
|
|
|
@@ -188,6 +212,14 @@ URI to proxy server if required
|
|
|
188
212
|
|
|
189
213
|
Name of the SQS Queue name to pull messages from. Note that this is just the name of the queue, not the URL or ARN.
|
|
190
214
|
|
|
215
|
+
[id="plugins-{type}s-{plugin}-queue_owner_aws_account_id"]
|
|
216
|
+
===== `queue_owner_aws_account_id`
|
|
217
|
+
|
|
218
|
+
* Value type is <<string,string>>
|
|
219
|
+
* There is no default value for this setting.
|
|
220
|
+
|
|
221
|
+
ID of the AWS account owning the queue if you want to use a https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-basic-examples-of-sqs-policies.html#grant-two-permissions-to-one-account[cross-account queue] with embedded policy. Note that AWS SDK only support numerical account ID and not account aliases.
|
|
222
|
+
|
|
191
223
|
[id="plugins-{type}s-{plugin}-region"]
|
|
192
224
|
===== `region`
|
|
193
225
|
|
data/lib/logstash/inputs/sqs.rb
CHANGED
|
@@ -80,9 +80,14 @@ class LogStash::Inputs::SQS < LogStash::Inputs::Threadable
|
|
|
80
80
|
|
|
81
81
|
default :codec, "json"
|
|
82
82
|
|
|
83
|
+
config :additional_settings, :validate => :hash, :default => {}
|
|
84
|
+
|
|
83
85
|
# Name of the SQS Queue name to pull messages from. Note that this is just the name of the queue, not the URL or ARN.
|
|
84
86
|
config :queue, :validate => :string, :required => true
|
|
85
87
|
|
|
88
|
+
# Account ID of the AWS account which owns the queue.
|
|
89
|
+
config :queue_owner_aws_account_id, :validate => :string, :required => false
|
|
90
|
+
|
|
86
91
|
# Name of the event field in which to store the SQS message ID
|
|
87
92
|
config :id_field, :validate => :string
|
|
88
93
|
|
|
@@ -99,17 +104,24 @@ class LogStash::Inputs::SQS < LogStash::Inputs::Threadable
|
|
|
99
104
|
|
|
100
105
|
def register
|
|
101
106
|
require "aws-sdk"
|
|
102
|
-
@logger.info("Registering SQS input", :queue => @queue)
|
|
107
|
+
@logger.info("Registering SQS input", :queue => @queue, :queue_owner_aws_account_id => @queue_owner_aws_account_id)
|
|
103
108
|
|
|
104
109
|
setup_queue
|
|
105
110
|
end
|
|
106
111
|
|
|
112
|
+
def queue_url(aws_sqs_client)
|
|
113
|
+
if @queue_owner_aws_account_id
|
|
114
|
+
return aws_sqs_client.get_queue_url({:queue_name => @queue, :queue_owner_aws_account_id => @queue_owner_aws_account_id})[:queue_url]
|
|
115
|
+
else
|
|
116
|
+
return aws_sqs_client.get_queue_url(:queue_name => @queue)[:queue_url]
|
|
117
|
+
end
|
|
118
|
+
end
|
|
119
|
+
|
|
107
120
|
def setup_queue
|
|
108
|
-
aws_sqs_client = Aws::SQS::Client.new(aws_options_hash)
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
@logger.error("Cannot establish connection to Amazon SQS", :error => e)
|
|
121
|
+
aws_sqs_client = Aws::SQS::Client.new(aws_options_hash || {})
|
|
122
|
+
@poller = Aws::SQS::QueuePoller.new(queue_url(aws_sqs_client), :client => aws_sqs_client)
|
|
123
|
+
rescue Aws::SQS::Errors::ServiceError, Seahorse::Client::NetworkingError => e
|
|
124
|
+
@logger.error("Cannot establish connection to Amazon SQS", exception_details(e))
|
|
113
125
|
raise LogStash::ConfigurationError, "Verify the SQS queue name and your credentials"
|
|
114
126
|
end
|
|
115
127
|
|
|
@@ -151,28 +163,38 @@ class LogStash::Inputs::SQS < LogStash::Inputs::Threadable
|
|
|
151
163
|
end
|
|
152
164
|
|
|
153
165
|
private
|
|
166
|
+
|
|
154
167
|
# Runs an AWS request inside a Ruby block with an exponential backoff in case
|
|
155
168
|
# we experience a ServiceError.
|
|
156
169
|
#
|
|
157
|
-
# @param [Integer] max_time maximum amount of time to sleep before giving up.
|
|
158
|
-
# @param [Integer] sleep_time the initial amount of time to sleep before retrying.
|
|
159
170
|
# @param [Block] block Ruby code block to execute.
|
|
160
|
-
def run_with_backoff(
|
|
161
|
-
|
|
162
|
-
|
|
171
|
+
def run_with_backoff(&block)
|
|
172
|
+
sleep_time = BACKOFF_SLEEP_TIME
|
|
163
173
|
begin
|
|
164
174
|
block.call
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
sleep(next_sleep)
|
|
169
|
-
next_sleep = next_sleep > max_time ? sleep_time : sleep_time * BACKOFF_FACTOR
|
|
170
|
-
|
|
175
|
+
rescue Aws::SQS::Errors::ServiceError, Seahorse::Client::NetworkingError => e
|
|
176
|
+
@logger.warn("SQS error ... retrying with exponential backoff", exception_details(e, sleep_time))
|
|
177
|
+
sleep_time = backoff_sleep(sleep_time)
|
|
171
178
|
retry
|
|
172
179
|
end
|
|
173
180
|
end
|
|
174
181
|
|
|
182
|
+
def backoff_sleep(sleep_time)
|
|
183
|
+
sleep(sleep_time)
|
|
184
|
+
sleep_time > MAX_TIME_BEFORE_GIVING_UP ? sleep_time : sleep_time * BACKOFF_FACTOR
|
|
185
|
+
end
|
|
186
|
+
|
|
175
187
|
def convert_epoch_to_timestamp(time)
|
|
176
188
|
LogStash::Timestamp.at(time.to_i / 1000)
|
|
177
189
|
end
|
|
190
|
+
|
|
191
|
+
def exception_details(e, sleep_time = nil)
|
|
192
|
+
details = { :queue => @queue, :exception => e.class, :message => e.message }
|
|
193
|
+
details[:code] = e.code if e.is_a?(Aws::SQS::Errors::ServiceError) && e.code
|
|
194
|
+
details[:cause] = e.original_error if e.respond_to?(:original_error) && e.original_error # Seahorse::Client::NetworkingError
|
|
195
|
+
details[:sleep_time] = sleep_time if sleep_time
|
|
196
|
+
details[:backtrace] = e.backtrace if @logger.debug?
|
|
197
|
+
details
|
|
198
|
+
end
|
|
199
|
+
|
|
178
200
|
end # class LogStash::Inputs::SQS
|
data/logstash-input-sqs.gemspec
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
Gem::Specification.new do |s|
|
|
2
2
|
s.name = 'logstash-input-sqs'
|
|
3
|
-
s.version = '3.1
|
|
4
|
-
s.licenses = ['Apache
|
|
3
|
+
s.version = '3.3.1'
|
|
4
|
+
s.licenses = ['Apache-2.0']
|
|
5
5
|
s.summary = "Pulls events from an Amazon Web Services Simple Queue Service queue"
|
|
6
6
|
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"
|
|
7
7
|
s.authors = ["Elastic"]
|
|
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
|
|
|
22
22
|
s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
|
|
23
23
|
|
|
24
24
|
s.add_runtime_dependency 'logstash-codec-json'
|
|
25
|
-
s.add_runtime_dependency 'logstash-mixin-aws', '>=
|
|
25
|
+
s.add_runtime_dependency 'logstash-mixin-aws', '>= 5.1.0'
|
|
26
26
|
|
|
27
27
|
s.add_development_dependency 'logstash-devutils'
|
|
28
28
|
s.add_development_dependency "logstash-codec-json_lines"
|
data/spec/inputs/sqs_spec.rb
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
# encoding: utf-8
|
|
2
2
|
require "spec_helper"
|
|
3
|
+
require "logstash/devutils/rspec/shared_examples"
|
|
3
4
|
require "logstash/inputs/sqs"
|
|
4
5
|
require "logstash/errors"
|
|
5
6
|
require "logstash/event"
|
|
@@ -48,6 +49,59 @@ describe LogStash::Inputs::SQS do
|
|
|
48
49
|
expect { subject.register }.not_to raise_error
|
|
49
50
|
end
|
|
50
51
|
|
|
52
|
+
context "when queue_aws_account_id option is specified" do
|
|
53
|
+
let(:queue_account_id) { "123456789012" }
|
|
54
|
+
let(:config) do
|
|
55
|
+
{
|
|
56
|
+
"region" => "us-east-1",
|
|
57
|
+
"access_key_id" => "123",
|
|
58
|
+
"secret_access_key" => "secret",
|
|
59
|
+
"queue" => queue_name,
|
|
60
|
+
"queue_owner_aws_account_id" => queue_account_id
|
|
61
|
+
}
|
|
62
|
+
end
|
|
63
|
+
it "passes the option to sqs client" do
|
|
64
|
+
expect(Aws::SQS::Client).to receive(:new).and_return(mock_sqs)
|
|
65
|
+
expect(mock_sqs).to receive(:get_queue_url).with({ :queue_name => queue_name, :queue_owner_aws_account_id => queue_account_id }).and_return({:queue_url => queue_url })
|
|
66
|
+
expect { subject.register }.not_to raise_error
|
|
67
|
+
end
|
|
68
|
+
end
|
|
69
|
+
|
|
70
|
+
describe "additional_settings" do
|
|
71
|
+
context "supported settings" do
|
|
72
|
+
let(:config) {
|
|
73
|
+
{
|
|
74
|
+
"additional_settings" => { "force_path_style" => 'true', "ssl_verify_peer" => 'false', "profile" => 'logstash' },
|
|
75
|
+
"queue" => queue_name
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
it 'should instantiate Aws::SQS clients with force_path_style set' do
|
|
80
|
+
expect(Aws::SQS::Client).to receive(:new).and_return(mock_sqs)
|
|
81
|
+
# mock a remote call to retrieve the queue URL
|
|
82
|
+
expect(mock_sqs).to receive(:get_queue_url).with({ :queue_name => queue_name }).and_return({:queue_url => queue_url })
|
|
83
|
+
|
|
84
|
+
expect(subject.aws_options_hash).to include({:force_path_style => true, :ssl_verify_peer => false, :profile => 'logstash'})
|
|
85
|
+
|
|
86
|
+
expect { subject.register }.not_to raise_error
|
|
87
|
+
end
|
|
88
|
+
end
|
|
89
|
+
|
|
90
|
+
context "unsupported settings" do
|
|
91
|
+
let(:config) {
|
|
92
|
+
{
|
|
93
|
+
"additional_settings" => { "stub_responses" => 'true', "invalid_option" => "invalid" },
|
|
94
|
+
"queue" => queue_name
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
it 'must fail with ArgumentError' do
|
|
99
|
+
expect {subject.register}.to raise_error(ArgumentError, /invalid_option/)
|
|
100
|
+
end
|
|
101
|
+
end
|
|
102
|
+
|
|
103
|
+
end
|
|
104
|
+
|
|
51
105
|
context "when interrupting the plugin" do
|
|
52
106
|
before do
|
|
53
107
|
expect(Aws::SQS::Client).to receive(:new).and_return(mock_sqs)
|
|
@@ -156,7 +210,7 @@ describe LogStash::Inputs::SQS do
|
|
|
156
210
|
|
|
157
211
|
context 'can create multiple events' do
|
|
158
212
|
require "logstash/codecs/json_lines"
|
|
159
|
-
let(:config) { super.merge({ "codec" => "json_lines" }) }
|
|
213
|
+
let(:config) { super().merge({ "codec" => "json_lines" }) }
|
|
160
214
|
let(:first_message) { { "sequence" => "first" } }
|
|
161
215
|
let(:second_message) { { "sequence" => "second" } }
|
|
162
216
|
let(:encoded_message) { double("sqs_message", :body => "#{LogStash::Json::dump(first_message)}\n#{LogStash::Json::dump(second_message)}\n") }
|
|
@@ -177,7 +231,7 @@ describe LogStash::Inputs::SQS do
|
|
|
177
231
|
expect(subject).to receive(:poller).and_return(mock_sqs).at_least(:once)
|
|
178
232
|
end
|
|
179
233
|
|
|
180
|
-
context "SQS
|
|
234
|
+
context "SQS error" do
|
|
181
235
|
it "retry to fetch messages" do
|
|
182
236
|
# change the poller implementation to raise SQS errors.
|
|
183
237
|
had_error = false
|
|
@@ -200,7 +254,63 @@ describe LogStash::Inputs::SQS do
|
|
|
200
254
|
end
|
|
201
255
|
end
|
|
202
256
|
|
|
203
|
-
context "
|
|
257
|
+
context "SQS error (retries)" do
|
|
258
|
+
|
|
259
|
+
it "retry to fetch messages" do
|
|
260
|
+
sleep_time = LogStash::Inputs::SQS::BACKOFF_SLEEP_TIME
|
|
261
|
+
expect(subject).to receive(:sleep).with(sleep_time)
|
|
262
|
+
expect(subject).to receive(:sleep).with(sleep_time * 2)
|
|
263
|
+
expect(subject).to receive(:sleep).with(sleep_time * 4)
|
|
264
|
+
|
|
265
|
+
error_count = 0
|
|
266
|
+
expect(mock_sqs).to receive(:poll).with(anything()).at_most(4) do
|
|
267
|
+
error_count += 1
|
|
268
|
+
if error_count <= 3
|
|
269
|
+
raise Aws::SQS::Errors::QueueDoesNotExist.new("testing", "testing exception (#{error_count})")
|
|
270
|
+
end
|
|
271
|
+
|
|
272
|
+
queue << payload
|
|
273
|
+
end
|
|
274
|
+
|
|
275
|
+
subject.run(queue)
|
|
276
|
+
|
|
277
|
+
expect(queue.size).to eq(1)
|
|
278
|
+
expect(queue.pop).to eq(payload)
|
|
279
|
+
end
|
|
280
|
+
|
|
281
|
+
end
|
|
282
|
+
|
|
283
|
+
context "networking error" do
|
|
284
|
+
|
|
285
|
+
before(:all) { require 'seahorse/client/networking_error' }
|
|
286
|
+
|
|
287
|
+
it "retry to fetch messages" do
|
|
288
|
+
sleep_time = LogStash::Inputs::SQS::BACKOFF_SLEEP_TIME
|
|
289
|
+
expect(subject).to receive(:sleep).with(sleep_time).twice
|
|
290
|
+
|
|
291
|
+
error_count = 0
|
|
292
|
+
expect(mock_sqs).to receive(:poll).with(anything()).at_most(5) do
|
|
293
|
+
error_count += 1
|
|
294
|
+
if error_count == 1
|
|
295
|
+
raise Seahorse::Client::NetworkingError.new(Net::OpenTimeout.new, 'timeout')
|
|
296
|
+
end
|
|
297
|
+
if error_count == 3
|
|
298
|
+
raise Seahorse::Client::NetworkingError.new(SocketError.new('spec-error'))
|
|
299
|
+
end
|
|
300
|
+
|
|
301
|
+
queue << payload
|
|
302
|
+
end
|
|
303
|
+
|
|
304
|
+
subject.run(queue)
|
|
305
|
+
subject.run(queue)
|
|
306
|
+
|
|
307
|
+
expect(queue.size).to eq(2)
|
|
308
|
+
expect(queue.pop).to eq(payload)
|
|
309
|
+
end
|
|
310
|
+
|
|
311
|
+
end
|
|
312
|
+
|
|
313
|
+
context "other error" do
|
|
204
314
|
it "stops executing the code and raise the exception" do
|
|
205
315
|
expect(mock_sqs).to receive(:poll).with(anything()).at_most(2) do
|
|
206
316
|
raise RuntimeError
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: logstash-input-sqs
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.1
|
|
4
|
+
version: 3.3.1
|
|
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: 2022-02-16 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -49,7 +49,7 @@ dependencies:
|
|
|
49
49
|
requirements:
|
|
50
50
|
- - ">="
|
|
51
51
|
- !ruby/object:Gem::Version
|
|
52
|
-
version:
|
|
52
|
+
version: 5.1.0
|
|
53
53
|
name: logstash-mixin-aws
|
|
54
54
|
prerelease: false
|
|
55
55
|
type: :runtime
|
|
@@ -57,7 +57,7 @@ dependencies:
|
|
|
57
57
|
requirements:
|
|
58
58
|
- - ">="
|
|
59
59
|
- !ruby/object:Gem::Version
|
|
60
|
-
version:
|
|
60
|
+
version: 5.1.0
|
|
61
61
|
- !ruby/object:Gem::Dependency
|
|
62
62
|
requirement: !ruby/object:Gem::Requirement
|
|
63
63
|
requirements:
|
|
@@ -110,7 +110,7 @@ files:
|
|
|
110
110
|
- spec/support/helpers.rb
|
|
111
111
|
homepage: http://www.elastic.co/guide/en/logstash/current/index.html
|
|
112
112
|
licenses:
|
|
113
|
-
- Apache
|
|
113
|
+
- Apache-2.0
|
|
114
114
|
metadata:
|
|
115
115
|
logstash_plugin: 'true'
|
|
116
116
|
logstash_group: input
|
|
@@ -129,8 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
129
129
|
- !ruby/object:Gem::Version
|
|
130
130
|
version: '0'
|
|
131
131
|
requirements: []
|
|
132
|
-
|
|
133
|
-
rubygems_version: 2.6.13
|
|
132
|
+
rubygems_version: 3.1.6
|
|
134
133
|
signing_key:
|
|
135
134
|
specification_version: 4
|
|
136
135
|
summary: Pulls events from an Amazon Web Services Simple Queue Service queue
|