logstash-output-elasticsearch-ec2 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46c53616bca4fa8ae321e642f23cab651f8e13fc
-  data.tar.gz: f97361a96b262d0fce7f623a3858e97802f9f0a5
+  metadata.gz: 48d2f3dcf770788ba21d4b51f0fa23a18b89475a
+  data.tar.gz: 275da28fa4976f85ef2c349a2f7d8c6fc30560ec
 SHA512:
-  metadata.gz: 18725a66e6afe91aa8f639c4486c71162aa9e23bbb51d5356c6882134fa25b5753fc3ac97f4b02fc2f312aafe73574a81a64e9ba3589daa85f6c23ded263f624
-  data.tar.gz: 6d414f99d90f2f20e926aa40b4b0d27f582f2df66c13302f2e647ad6066a2fca4a751cb91b9d286ea99848d2fab0bddf80f091c451afe340a114caf6c518749f
+  metadata.gz: e270842bea9f73af5c7edb26f85e318bb7c0cc73df4456ba461e25f754f1b2a5f037a6b299f4858613642673a34a9ba918c79f91afaca12f826322de508ed99a
+  data.tar.gz: 7abb5fee40c9545746fc7ba95010656a572cdd5e989cda02cd283166f5c89d38395b521a142bd091e676506dd8a527e7c6f08871fafcb772cbcc8249e0e29f82

data/lib/logstash/outputs/elasticsearch/ec2.rb

@@ -9,6 +9,8 @@ module LogStash::Outputs::ElasticSearch::Ec2
 
   def create_options
 
+    config :discovery, :validate => ['zen', 'ec2'], :default => 'zen'
+
     config :aws_access_key, :validate => :string
 
     config :aws_secret_key, :validate => :string
@@ -29,14 +31,17 @@ module LogStash::Outputs::ElasticSearch::Ec2
 
   def self.create_client_config(plugin)
      settings = {}
-     settings['cloud.aws.access_key'] = plugin.aws_access_key if plugin.aws_access_key
-     settings['cloud.aws.secret_key'] = plugin.aws_secret_key if plugin.aws_secret_key
-     settings['cloud.aws.protocol'] = plugin.aws_protocol if plugin.aws_protocol
-     settings['cloud.aws.protocol.s3.protocol'] = plugin.s3_protocol if plugin.s3_protocol
-     settings['cloud.aws.protocol.ec2.protocol'] = plugin.ec2_protocol if plugin.ec2_protocol
-     settings['cloud.aws.proxy_host'] = plugin.aws_proxy_host if plugin.aws_proxy_host
-     settings['cloud.aws.proxy_port'] = plugin.aws_proxy_port if plugin.aws_proxy_port
-     settings['cloud.aws.region'] = plugin.aws_region if plugin.aws_region
+     if plugin.discovery == 'ec2'
+       settings['discovery.type'] = plugin.discovery
+       settings['cloud.aws.access_key'] = plugin.aws_access_key if plugin.aws_access_key
+       settings['cloud.aws.secret_key'] = plugin.aws_secret_key if plugin.aws_secret_key
+       settings['cloud.aws.protocol'] = plugin.aws_protocol if plugin.aws_protocol
+       settings['cloud.aws.protocol.s3.protocol'] = plugin.s3_protocol if plugin.s3_protocol
+       settings['cloud.aws.protocol.ec2.protocol'] = plugin.ec2_protocol if plugin.ec2_protocol
+       settings['cloud.aws.proxy_host'] = plugin.aws_proxy_host if plugin.aws_proxy_host
+       settings['cloud.aws.proxy_port'] = plugin.aws_proxy_port if plugin.aws_proxy_port
+       settings['cloud.aws.region'] = plugin.aws_region if plugin.aws_region
+     end
      settings
   end
 

data/logstash-output-elasticsearch-ec2.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch-ec2'
-  s.version         = '0.2.4'
+  s.version         = '0.3.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "EC2 plugin for the Elasticsearch Output"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
-  s.add_runtime_dependency 'logstash-output-elasticsearch'
+  s.add_runtime_dependency 'logstash-output-elasticsearch', ['>= 0.2.2']
   s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
 
   s.add_development_dependency 'logstash-devutils'

metadata

@@ -1,30 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch-ec2
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-output-elasticsearch
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  name: logstash-output-elasticsearch
+        version: 0.2.2
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-core
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 1.4.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -33,31 +42,22 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash-core
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
 email: info@elasticsearch.com
 executables: []
@@ -77,9 +77,9 @@ files:
 - vendor/jar-dependencies/runtime-jars/aws-java-sdk-1.7.13.jar
 - vendor/jar-dependencies/runtime-jars/commons-codec-1.4.jar
 - vendor/jar-dependencies/runtime-jars/commons-logging-1.1.1.jar
-- vendor/jar-dependencies/runtime-jars/elasticsearch-cloud-aws-2.4.1.jar
-- vendor/jar-dependencies/runtime-jars/httpclient-4.2.jar
-- vendor/jar-dependencies/runtime-jars/httpcore-4.2.jar
+- vendor/jar-dependencies/runtime-jars/elasticsearch-cloud-aws-2.5.0.jar
+- vendor/jar-dependencies/runtime-jars/httpclient-4.3.6.jar
+- vendor/jar-dependencies/runtime-jars/httpcore-4.3.3.jar
 - vendor/jar-dependencies/runtime-jars/jackson-annotations-2.1.1.jar
 - vendor/jar-dependencies/runtime-jars/jackson-core-2.1.1.jar
 - vendor/jar-dependencies/runtime-jars/jackson-databind-2.1.1.jar
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: EC2 plugin for the Elasticsearch Output