logstash-input-cloudwatch 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01423d84b352678fd55c640d8a97f432c5d232dea995162be2d06349b6e01394
-  data.tar.gz: 1f21d8a17408bde126e6999b940c1de18ed31b96d40a64820a366f688d528de3
+  metadata.gz: f46e1822ab59ac9f9a32ddbd86c274974036b633ec008da9d08e51d2fe4518e1
+  data.tar.gz: cc83df65e57f7208b159ae2f63b9e7e20f44ba36da096dc64b90c045fe1d574e
 SHA512:
-  metadata.gz: ab73baa27cdb674c15b93a1641c8e4af47fd391ef8953808a6b7b21f95fc67df2f101453d93df31c66825a3bf8f614e6529651e669bbaf40c7cc10cacf7473e8
-  data.tar.gz: babc7338fe58865792e6e50f82ec7210bfd29f8d85f96ede62d5ac0355ebb44ac8d7918044ecfbf6cf31b7f6c943745d439e57c51532ac27a7f390f33bbb6e31
+  metadata.gz: b43e088aa20f89e198161d65892a1bb018f0243eebf7afa2a9e65c2f96dab5c20b62aeca265d0a71bafde19e368a4513a4be0ebdbca07d2b11449ace0cea522e
+  data.tar.gz: 484543732e23c0e6429c19bce8d27fa5fb27b4947f7315471ab9330867e175212d60dd6371931aa28a582416f8c8d76d14d4af0001ce7c457746ad92ea906e0b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.1.0
+  - Add documentation for endpoint, role_arn and role_session_name #29
+  - Reduce info level logging verbosity #27
+
 ## 2.0.3
   - Update gemspec summary
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012-2018 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/docs/index.asciidoc

@@ -93,13 +93,16 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 | <<plugins-{type}s-{plugin}-access_key_id>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-aws_credentials_file>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-combined>> |<<boolean,boolean>>|No
+| <<plugins-{type}s-{plugin}-endpoint>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-filters>> |<<array,array>>|Yes
 | <<plugins-{type}s-{plugin}-interval>> |<<number,number>>|No
 | <<plugins-{type}s-{plugin}-metrics>> |<<array,array>>|No
 | <<plugins-{type}s-{plugin}-namespace>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-period>> |<<number,number>>|No
 | <<plugins-{type}s-{plugin}-proxy_uri>> |<<string,string>>|No
-| <<plugins-{type}s-{plugin}-region>> |<<string,string>>, one of `["us-east-1", "us-east-2", "us-west-1", "us-west-2", "eu-central-1", "eu-west-1", "eu-west-2", "ap-southeast-1", "ap-southeast-2", "ap-northeast-1", "ap-northeast-2", "sa-east-1", "us-gov-west-1", "cn-north-1", "ap-south-1", "ca-central-1"]`|No
+| <<plugins-{type}s-{plugin}-region>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-role_arn>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-role_session_name>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-secret_access_key>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-session_token>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-statistics>> |<<array,array>>|No
@@ -151,6 +154,16 @@ file should look like this:
 
 Use this for namespaces that need to combine the dimensions like S3 and SNS.
 
+[id="plugins-{type}s-{plugin}-endpoint"]
+===== `endpoint`
+
+  * Value type is <<string,string>>
+  * There is no default value for this setting.
+
+The endpoint to connect to. By default it is constructed using the value of `region`.
+This is useful when connecting to S3 compatible services, but beware that these aren't
+guaranteed to work correctly with the AWS SDK.
+
 [id="plugins-{type}s-{plugin}-filters"]
 ===== `filters` 
 
@@ -220,11 +233,29 @@ URI to proxy server if required
 [id="plugins-{type}s-{plugin}-region"]
 ===== `region` 
 
-  * Value can be any of: `us-east-1`, `us-east-2`, `us-west-1`, `us-west-2`, `eu-central-1`, `eu-west-1`, `eu-west-2`, `ap-southeast-1`, `ap-southeast-2`, `ap-northeast-1`, `ap-northeast-2`, `sa-east-1`, `us-gov-west-1`, `cn-north-1`, `ap-south-1`, `ca-central-1`
+  * Value type is <<string,string>>
   * Default value is `"us-east-1"`
 
 The AWS Region
 
+[id="plugins-{type}s-{plugin}-role_arn"]
+===== `role_arn`
+
+  * Value type is <<string,string>>
+  * There is no default value for this setting.
+
+The AWS IAM Role to assume, if any.
+This is used to generate temporary credentials, typically for cross-account access.
+See the https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html[AssumeRole API documentation] for more information.
+
+[id="plugins-{type}s-{plugin}-role_session_name"]
+===== `role_session_name`
+
+  * Value type is <<string,string>>
+  * Default value is `"logstash"`
+
+Session name to use when assuming an IAM role.
+
 [id="plugins-{type}s-{plugin}-secret_access_key"]
 ===== `secret_access_key` 
 
@@ -263,4 +294,4 @@ The AWS SDK for Ruby defaults to SSL so we preserve that
 
 
 [id="plugins-{type}s-{plugin}-common-options"]
-include::{include_path}/{type}.asciidoc[]
+include::{include_path}/{type}.asciidoc[]

data/lib/logstash/inputs/cloudwatch.rb

@@ -144,8 +144,8 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
       raise 'No metrics to query' unless metrics_for(@namespace).count > 0
 
       metrics_for(@namespace).each do |metric|
-        @logger.info "Polling metric #{metric}"
-        @logger.info "Filters: #{aws_filters}"
+        @logger.debug "Polling metric #{metric}"
+        @logger.debug "Filters: #{aws_filters}"
         @combined ? from_filters(queue, metric) : from_resources(queue, metric)
       end
     end # loop
@@ -163,7 +163,7 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
       # For every resource in the dimension
       dim_resources = *dim_resources
       dim_resources.each do |resource|
-        @logger.info "Polling resource #{dimension}: #{resource}"
+        @logger.debug "Polling resource #{dimension}: #{resource}"
 
         options = metric_options(@namespace, metric)
         options[:dimensions] = [ { name: dimension, value: resource } ]
@@ -190,7 +190,7 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
   def from_filters(queue, metric)
     options = metric_options(@namespace, metric)
     options[:dimensions] = aws_filters
-    @logger.info "Dim: #{options[:dimensions]}"
+    @logger.debug "Dim: #{options[:dimensions]}"
 
     datapoints = clients['CloudWatch'].get_metric_statistics(options)
     @logger.debug "DPs: #{datapoints.data}"

data/logstash-input-cloudwatch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-cloudwatch'
-  s.version         = '2.0.3'
+  s.version         = '2.1.0'
   s.licenses      = ['Apache License (2.0)']
   s.summary       = "Pulls events from the Amazon Web Services CloudWatch API "
   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|
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'stud', '>= 0.0.19'
-  s.add_runtime_dependency 'logstash-mixin-aws'
+  s.add_runtime_dependency 'logstash-mixin-aws', '>= 4.3.0'
   s.add_development_dependency 'logstash-devutils'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.0
   name: logstash-mixin-aws
   prerelease: false
   type: :runtime
@@ -71,7 +71,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Pulls events from the Amazon Web Services CloudWatch API