Added 'proxy_uri' option to AWS-based plugins.

This commit is contained in:
Malthe Borch 2013-10-10 14:42:55 +02:00
parent 44ba643cea
commit e0e1d3101b
2 changed files with 9 additions and 1 deletions

View file

@ -36,6 +36,7 @@
- bugfix: elasticsearch: the default port range is now 9300-9305; the older
range up to 9400 was unnecessary and could cause problems for the
elasticsearch cluster in some cases.
- improvement: aws-based outputs (e.g. cloudwatch) now support proxy uri.
- bugfix: rabbitmq: disable automatic connection recovery (LOGSTASH-1350)
(#642)
- bugfix: riemann: fixed tagging of riemann events (#631)

View file

@ -35,6 +35,9 @@ module LogStash::PluginMixins::AwsConfig
# The AWS SDK for Ruby defaults to SSL so we preserve that
config :use_ssl, :validate => :boolean, :default => true
# URI to proxy server if required
config :proxy_uri, :validate => :string
# Path to YAML file containing a hash of AWS credentials.
# This file will only be loaded if `access_key_id` and
# `secret_access_key` aren't set. The contents of the
@ -68,6 +71,10 @@ module LogStash::PluginMixins::AwsConfig
opts[:use_ssl] = @use_ssl
if (@proxy_uri)
opts[:proxy_uri] = @proxy_uri
end
# The AWS SDK for Ruby doesn't know how to make an endpoint hostname from a region
# for example us-west-1 -> foosvc.us-west-1.amazonaws.com
# So our plugins need to know how to generate their endpoints from a region
@ -82,4 +89,4 @@ module LogStash::PluginMixins::AwsConfig
return opts
end # def aws_options_hash
end
end