logstash-output-elasticsearch-ec2 0.2.4 → 0.3.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.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/logstash/outputs/elasticsearch/ec2.rb +13 -8
  3. data/logstash-output-elasticsearch-ec2.gemspec +2 -2
  4. data/vendor/jar-dependencies/runtime-jars/elasticsearch-cloud-aws-2.5.0.jar +0 -0
  5. data/vendor/jar-dependencies/runtime-jars/httpclient-4.3.6.jar +0 -0
  6. data/vendor/jar-dependencies/runtime-jars/httpcore-4.3.3.jar +0 -0
  7. metadata +22 -22
  8. data/vendor/jar-dependencies/runtime-jars/elasticsearch-cloud-aws-2.4.1.jar +0 -0
  9. data/vendor/jar-dependencies/runtime-jars/httpclient-4.2.jar +0 -0
  10. data/vendor/jar-dependencies/runtime-jars/httpcore-4.2.jar +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 46c53616bca4fa8ae321e642f23cab651f8e13fc
4
- data.tar.gz: f97361a96b262d0fce7f623a3858e97802f9f0a5
3
+ metadata.gz: 48d2f3dcf770788ba21d4b51f0fa23a18b89475a
4
+ data.tar.gz: 275da28fa4976f85ef2c349a2f7d8c6fc30560ec
5
5
  SHA512:
6
- metadata.gz: 18725a66e6afe91aa8f639c4486c71162aa9e23bbb51d5356c6882134fa25b5753fc3ac97f4b02fc2f312aafe73574a81a64e9ba3589daa85f6c23ded263f624
7
- data.tar.gz: 6d414f99d90f2f20e926aa40b4b0d27f582f2df66c13302f2e647ad6066a2fca4a751cb91b9d286ea99848d2fab0bddf80f091c451afe340a114caf6c518749f
6
+ metadata.gz: e270842bea9f73af5c7edb26f85e318bb7c0cc73df4456ba461e25f754f1b2a5f037a6b299f4858613642673a34a9ba918c79f91afaca12f826322de508ed99a
7
+ data.tar.gz: 7abb5fee40c9545746fc7ba95010656a572cdd5e989cda02cd283166f5c89d38395b521a142bd091e676506dd8a527e7c6f08871fafcb772cbcc8249e0e29f82
data/lib/logstash/outputs/elasticsearch/ec2.rb CHANGED
@@ -9,6 +9,8 @@ module LogStash::Outputs::ElasticSearch::Ec2
9
9
 
10
10
  def create_options
11
11
 
12
+ config :discovery, :validate => ['zen', 'ec2'], :default => 'zen'
13
+
12
14
  config :aws_access_key, :validate => :string
13
15
 
14
16
  config :aws_secret_key, :validate => :string
@@ -29,14 +31,17 @@ module LogStash::Outputs::ElasticSearch::Ec2
29
31
 
30
32
  def self.create_client_config(plugin)
31
33
  settings = {}
32
- settings['cloud.aws.access_key'] = plugin.aws_access_key if plugin.aws_access_key
33
- settings['cloud.aws.secret_key'] = plugin.aws_secret_key if plugin.aws_secret_key
34
- settings['cloud.aws.protocol'] = plugin.aws_protocol if plugin.aws_protocol
35
- settings['cloud.aws.protocol.s3.protocol'] = plugin.s3_protocol if plugin.s3_protocol
36
- settings['cloud.aws.protocol.ec2.protocol'] = plugin.ec2_protocol if plugin.ec2_protocol
37
- settings['cloud.aws.proxy_host'] = plugin.aws_proxy_host if plugin.aws_proxy_host
38
- settings['cloud.aws.proxy_port'] = plugin.aws_proxy_port if plugin.aws_proxy_port
39
- settings['cloud.aws.region'] = plugin.aws_region if plugin.aws_region
34
+ if plugin.discovery == 'ec2'
35
+ settings['discovery.type'] = plugin.discovery
36
+ settings['cloud.aws.access_key'] = plugin.aws_access_key if plugin.aws_access_key
37
+ settings['cloud.aws.secret_key'] = plugin.aws_secret_key if plugin.aws_secret_key
38
+ settings['cloud.aws.protocol'] = plugin.aws_protocol if plugin.aws_protocol
39
+ settings['cloud.aws.protocol.s3.protocol'] = plugin.s3_protocol if plugin.s3_protocol
40
+ settings['cloud.aws.protocol.ec2.protocol'] = plugin.ec2_protocol if plugin.ec2_protocol
41
+ settings['cloud.aws.proxy_host'] = plugin.aws_proxy_host if plugin.aws_proxy_host
42
+ settings['cloud.aws.proxy_port'] = plugin.aws_proxy_port if plugin.aws_proxy_port
43
+ settings['cloud.aws.region'] = plugin.aws_region if plugin.aws_region
44
+ end
40
45
  settings
41
46
  end
42
47
 
data/logstash-output-elasticsearch-ec2.gemspec CHANGED
@@ -1,7 +1,7 @@
1
1
  Gem::Specification.new do |s|
2
2
 
3
3
  s.name = 'logstash-output-elasticsearch-ec2'
4
- s.version = '0.2.4'
4
+ s.version = '0.3.0'
5
5
  s.licenses = ['Apache License (2.0)']
6
6
  s.summary = "EC2 plugin for the Elasticsearch Output"
7
7
  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|
20
20
  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
21
21
 
22
22
  # Gem dependencies
23
- s.add_runtime_dependency 'logstash-output-elasticsearch'
23
+ s.add_runtime_dependency 'logstash-output-elasticsearch', ['>= 0.2.2']
24
24
  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
25
25
 
26
26
  s.add_development_dependency 'logstash-devutils'
metadata CHANGED
@@ -1,30 +1,39 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-output-elasticsearch-ec2
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.4
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elasticsearch
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-16 00:00:00.000000000 Z
11
+ date: 2015-04-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
+ name: logstash-output-elasticsearch
15
+ version_requirements: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - '>='
18
+ - !ruby/object:Gem::Version
19
+ version: 0.2.2
14
20
  requirement: !ruby/object:Gem::Requirement
15
21
  requirements:
16
22
  - - '>='
17
23
  - !ruby/object:Gem::Version
18
- version: '0'
19
- name: logstash-output-elasticsearch
24
+ version: 0.2.2
20
25
  prerelease: false
21
26
  type: :runtime
27
+ - !ruby/object:Gem::Dependency
28
+ name: logstash-core
22
29
  version_requirements: !ruby/object:Gem::Requirement
23
30
  requirements:
24
31
  - - '>='
25
32
  - !ruby/object:Gem::Version
26
- version: '0'
27
- - !ruby/object:Gem::Dependency
33
+ version: 1.4.0
34
+ - - <
35
+ - !ruby/object:Gem::Version
36
+ version: 2.0.0
28
37
  requirement: !ruby/object:Gem::Requirement
29
38
  requirements:
30
39
  - - '>='
@@ -33,31 +42,22 @@ dependencies:
33
42
  - - <
34
43
  - !ruby/object:Gem::Version
35
44
  version: 2.0.0
36
- name: logstash-core
37
45
  prerelease: false
38
46
  type: :runtime
47
+ - !ruby/object:Gem::Dependency
48
+ name: logstash-devutils
39
49
  version_requirements: !ruby/object:Gem::Requirement
40
50
  requirements:
41
51
  - - '>='
42
52
  - !ruby/object:Gem::Version
43
- version: 1.4.0
44
- - - <
45
- - !ruby/object:Gem::Version
46
- version: 2.0.0
47
- - !ruby/object:Gem::Dependency
53
+ version: '0'
48
54
  requirement: !ruby/object:Gem::Requirement
49
55
  requirements:
50
56
  - - '>='
51
57
  - !ruby/object:Gem::Version
52
58
  version: '0'
53
- name: logstash-devutils
54
59
  prerelease: false
55
60
  type: :development
56
- version_requirements: !ruby/object:Gem::Requirement
57
- requirements:
58
- - - '>='
59
- - !ruby/object:Gem::Version
60
- version: '0'
61
61
  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
62
62
  email: info@elasticsearch.com
63
63
  executables: []
@@ -77,9 +77,9 @@ files:
77
77
  - vendor/jar-dependencies/runtime-jars/aws-java-sdk-1.7.13.jar
78
78
  - vendor/jar-dependencies/runtime-jars/commons-codec-1.4.jar
79
79
  - vendor/jar-dependencies/runtime-jars/commons-logging-1.1.1.jar
80
- - vendor/jar-dependencies/runtime-jars/elasticsearch-cloud-aws-2.4.1.jar
81
- - vendor/jar-dependencies/runtime-jars/httpclient-4.2.jar
82
- - vendor/jar-dependencies/runtime-jars/httpcore-4.2.jar
80
+ - vendor/jar-dependencies/runtime-jars/elasticsearch-cloud-aws-2.5.0.jar
81
+ - vendor/jar-dependencies/runtime-jars/httpclient-4.3.6.jar
82
+ - vendor/jar-dependencies/runtime-jars/httpcore-4.3.3.jar
83
83
  - vendor/jar-dependencies/runtime-jars/jackson-annotations-2.1.1.jar
84
84
  - vendor/jar-dependencies/runtime-jars/jackson-core-2.1.1.jar
85
85
  - vendor/jar-dependencies/runtime-jars/jackson-databind-2.1.1.jar
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
106
106
  version: '0'
107
107
  requirements: []
108
108
  rubyforge_project:
109
- rubygems_version: 2.4.5
109
+ rubygems_version: 2.1.9
110
110
  signing_key:
111
111
  specification_version: 4
112
112
  summary: EC2 plugin for the Elasticsearch Output