logstash-input-cloudwatch 2.0.3 → 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/LICENSE +1 -1
- data/docs/index.asciidoc +34 -3
- data/lib/logstash/inputs/cloudwatch.rb +4 -4
- data/logstash-input-cloudwatch.gemspec +2 -2
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f46e1822ab59ac9f9a32ddbd86c274974036b633ec008da9d08e51d2fe4518e1
|
4
|
+
data.tar.gz: cc83df65e57f7208b159ae2f63b9e7e20f44ba36da096dc64b90c045fe1d574e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b43e088aa20f89e198161d65892a1bb018f0243eebf7afa2a9e65c2f96dab5c20b62aeca265d0a71bafde19e368a4513a4be0ebdbca07d2b11449ace0cea522e
|
7
|
+
data.tar.gz: 484543732e23c0e6429c19bce8d27fa5fb27b4947f7315471ab9330867e175212d60dd6371931aa28a582416f8c8d76d14d4af0001ce7c457746ad92ea906e0b
|
data/CHANGELOG.md
CHANGED
data/LICENSE
CHANGED
data/docs/index.asciidoc
CHANGED
@@ -93,13 +93,16 @@ This plugin supports the following configuration options plus the <<plugins-{typ
|
|
93
93
|
| <<plugins-{type}s-{plugin}-access_key_id>> |<<string,string>>|No
|
94
94
|
| <<plugins-{type}s-{plugin}-aws_credentials_file>> |<<string,string>>|No
|
95
95
|
| <<plugins-{type}s-{plugin}-combined>> |<<boolean,boolean>>|No
|
96
|
+
| <<plugins-{type}s-{plugin}-endpoint>> |<<string,string>>|No
|
96
97
|
| <<plugins-{type}s-{plugin}-filters>> |<<array,array>>|Yes
|
97
98
|
| <<plugins-{type}s-{plugin}-interval>> |<<number,number>>|No
|
98
99
|
| <<plugins-{type}s-{plugin}-metrics>> |<<array,array>>|No
|
99
100
|
| <<plugins-{type}s-{plugin}-namespace>> |<<string,string>>|No
|
100
101
|
| <<plugins-{type}s-{plugin}-period>> |<<number,number>>|No
|
101
102
|
| <<plugins-{type}s-{plugin}-proxy_uri>> |<<string,string>>|No
|
102
|
-
| <<plugins-{type}s-{plugin}-region>> |<<string,string
|
103
|
+
| <<plugins-{type}s-{plugin}-region>> |<<string,string>>|No
|
104
|
+
| <<plugins-{type}s-{plugin}-role_arn>> |<<string,string>>|No
|
105
|
+
| <<plugins-{type}s-{plugin}-role_session_name>> |<<string,string>>|No
|
103
106
|
| <<plugins-{type}s-{plugin}-secret_access_key>> |<<string,string>>|No
|
104
107
|
| <<plugins-{type}s-{plugin}-session_token>> |<<string,string>>|No
|
105
108
|
| <<plugins-{type}s-{plugin}-statistics>> |<<array,array>>|No
|
@@ -151,6 +154,16 @@ file should look like this:
|
|
151
154
|
|
152
155
|
Use this for namespaces that need to combine the dimensions like S3 and SNS.
|
153
156
|
|
157
|
+
[id="plugins-{type}s-{plugin}-endpoint"]
|
158
|
+
===== `endpoint`
|
159
|
+
|
160
|
+
* Value type is <<string,string>>
|
161
|
+
* There is no default value for this setting.
|
162
|
+
|
163
|
+
The endpoint to connect to. By default it is constructed using the value of `region`.
|
164
|
+
This is useful when connecting to S3 compatible services, but beware that these aren't
|
165
|
+
guaranteed to work correctly with the AWS SDK.
|
166
|
+
|
154
167
|
[id="plugins-{type}s-{plugin}-filters"]
|
155
168
|
===== `filters`
|
156
169
|
|
@@ -220,11 +233,29 @@ URI to proxy server if required
|
|
220
233
|
[id="plugins-{type}s-{plugin}-region"]
|
221
234
|
===== `region`
|
222
235
|
|
223
|
-
* Value
|
236
|
+
* Value type is <<string,string>>
|
224
237
|
* Default value is `"us-east-1"`
|
225
238
|
|
226
239
|
The AWS Region
|
227
240
|
|
241
|
+
[id="plugins-{type}s-{plugin}-role_arn"]
|
242
|
+
===== `role_arn`
|
243
|
+
|
244
|
+
* Value type is <<string,string>>
|
245
|
+
* There is no default value for this setting.
|
246
|
+
|
247
|
+
The AWS IAM Role to assume, if any.
|
248
|
+
This is used to generate temporary credentials, typically for cross-account access.
|
249
|
+
See the https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html[AssumeRole API documentation] for more information.
|
250
|
+
|
251
|
+
[id="plugins-{type}s-{plugin}-role_session_name"]
|
252
|
+
===== `role_session_name`
|
253
|
+
|
254
|
+
* Value type is <<string,string>>
|
255
|
+
* Default value is `"logstash"`
|
256
|
+
|
257
|
+
Session name to use when assuming an IAM role.
|
258
|
+
|
228
259
|
[id="plugins-{type}s-{plugin}-secret_access_key"]
|
229
260
|
===== `secret_access_key`
|
230
261
|
|
@@ -263,4 +294,4 @@ The AWS SDK for Ruby defaults to SSL so we preserve that
|
|
263
294
|
|
264
295
|
|
265
296
|
[id="plugins-{type}s-{plugin}-common-options"]
|
266
|
-
include::{include_path}/{type}.asciidoc[]
|
297
|
+
include::{include_path}/{type}.asciidoc[]
|
@@ -144,8 +144,8 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
|
|
144
144
|
raise 'No metrics to query' unless metrics_for(@namespace).count > 0
|
145
145
|
|
146
146
|
metrics_for(@namespace).each do |metric|
|
147
|
-
@logger.
|
148
|
-
@logger.
|
147
|
+
@logger.debug "Polling metric #{metric}"
|
148
|
+
@logger.debug "Filters: #{aws_filters}"
|
149
149
|
@combined ? from_filters(queue, metric) : from_resources(queue, metric)
|
150
150
|
end
|
151
151
|
end # loop
|
@@ -163,7 +163,7 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
|
|
163
163
|
# For every resource in the dimension
|
164
164
|
dim_resources = *dim_resources
|
165
165
|
dim_resources.each do |resource|
|
166
|
-
@logger.
|
166
|
+
@logger.debug "Polling resource #{dimension}: #{resource}"
|
167
167
|
|
168
168
|
options = metric_options(@namespace, metric)
|
169
169
|
options[:dimensions] = [ { name: dimension, value: resource } ]
|
@@ -190,7 +190,7 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
|
|
190
190
|
def from_filters(queue, metric)
|
191
191
|
options = metric_options(@namespace, metric)
|
192
192
|
options[:dimensions] = aws_filters
|
193
|
-
@logger.
|
193
|
+
@logger.debug "Dim: #{options[:dimensions]}"
|
194
194
|
|
195
195
|
datapoints = clients['CloudWatch'].get_metric_statistics(options)
|
196
196
|
@logger.debug "DPs: #{datapoints.data}"
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Gem::Specification.new do |s|
|
2
2
|
s.name = 'logstash-input-cloudwatch'
|
3
|
-
s.version = '2.0
|
3
|
+
s.version = '2.1.0'
|
4
4
|
s.licenses = ['Apache License (2.0)']
|
5
5
|
s.summary = "Pulls events from the Amazon Web Services CloudWatch API "
|
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"
|
@@ -36,6 +36,6 @@ Gem::Specification.new do |s|
|
|
36
36
|
s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
|
37
37
|
s.add_runtime_dependency 'logstash-codec-plain'
|
38
38
|
s.add_runtime_dependency 'stud', '>= 0.0.19'
|
39
|
-
s.add_runtime_dependency 'logstash-mixin-aws'
|
39
|
+
s.add_runtime_dependency 'logstash-mixin-aws', '>= 4.3.0'
|
40
40
|
s.add_development_dependency 'logstash-devutils'
|
41
41
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: logstash-input-cloudwatch
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0
|
4
|
+
version: 2.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jurgens du Toit
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2018-04-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
@@ -63,7 +63,7 @@ dependencies:
|
|
63
63
|
requirements:
|
64
64
|
- - ">="
|
65
65
|
- !ruby/object:Gem::Version
|
66
|
-
version:
|
66
|
+
version: 4.3.0
|
67
67
|
name: logstash-mixin-aws
|
68
68
|
prerelease: false
|
69
69
|
type: :runtime
|
@@ -71,7 +71,7 @@ dependencies:
|
|
71
71
|
requirements:
|
72
72
|
- - ">="
|
73
73
|
- !ruby/object:Gem::Version
|
74
|
-
version:
|
74
|
+
version: 4.3.0
|
75
75
|
- !ruby/object:Gem::Dependency
|
76
76
|
requirement: !ruby/object:Gem::Requirement
|
77
77
|
requirements:
|
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
125
125
|
version: '0'
|
126
126
|
requirements: []
|
127
127
|
rubyforge_project:
|
128
|
-
rubygems_version: 2.6.
|
128
|
+
rubygems_version: 2.6.13
|
129
129
|
signing_key:
|
130
130
|
specification_version: 4
|
131
131
|
summary: Pulls events from the Amazon Web Services CloudWatch API
|