fluent-plugin-elasticsearch 0.5.0 → 0.5.1

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 (6) hide show
  1. data/History.md +4 -0
  2. data/fluent-plugin-elasticsearch.gemspec +1 -1
  3. data/lib/fluent/plugin/out_elasticsearch.rb +1 -1
  4. data/test/plugin/test_out_elasticsearch.rb +8 -3
  5. metadata +37 -19
  6. checksums.yaml +0 -7
data/History.md CHANGED
@@ -3,6 +3,10 @@
3
3
  ### Future
4
4
 
5
5
 
6
+ ### 0.5.1
7
+
8
+ - fix legacy hosts option, port should be optional (#75)
9
+
6
10
  ### 0.5.0
7
11
 
8
12
  - add full connection URI support (#65)
data/fluent-plugin-elasticsearch.gemspec CHANGED
@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = 'fluent-plugin-elasticsearch'
6
- s.version = '0.5.0'
6
+ s.version = '0.5.1'
7
7
  s.authors = ['diogo', 'pitr']
8
8
  s.email = ['pitr@uken.com', 'diogo@uken.com']
9
9
  s.description = %q{ElasticSearch output plugin for Fluent event collector}
data/lib/fluent/plugin/out_elasticsearch.rb CHANGED
@@ -71,7 +71,7 @@ class Fluent::ElasticsearchOutput < Fluent::BufferedOutput
71
71
  hosts = if @hosts
72
72
  @hosts.split(',').map do |host_str|
73
73
  # Support legacy hosts format host:port,host:port,host:port...
74
- if host_str.match(%r{^[^:]+\:\d+$})
74
+ if host_str.match(%r{^[^:]+(\:\d+)?$})
75
75
  {
76
76
  host: host_str.split(':')[0],
77
77
  port: (host_str.split(':')[1] || @port).to_i,
data/test/plugin/test_out_elasticsearch.rb CHANGED
@@ -76,19 +76,24 @@ class ElasticsearchOutput < Test::Unit::TestCase
76
76
 
77
77
  def test_legacy_hosts_list
78
78
  config = %{
79
- hosts host1:50,host2:100
79
+ hosts host1:50,host2:100,host3
80
80
  scheme https
81
81
  path /es/
82
+ port 123
82
83
  }
83
84
  instance = driver('test', config).instance
84
85
 
85
- assert_equal 2, instance.get_connection_options[:hosts].length
86
- host1, host2 = instance.get_connection_options[:hosts]
86
+ assert_equal 3, instance.get_connection_options[:hosts].length
87
+ host1, host2, host3 = instance.get_connection_options[:hosts]
87
88
 
88
89
  assert_equal 'host1', host1[:host]
89
90
  assert_equal 50, host1[:port]
90
91
  assert_equal 'https', host1[:scheme]
91
92
  assert_equal '/es/', host2[:path]
93
+ assert_equal 'host3', host3[:host]
94
+ assert_equal 123, host3[:port]
95
+ assert_equal 'https', host3[:scheme]
96
+ assert_equal '/es/', host3[:path]
92
97
  end
93
98
 
94
99
  def test_hosts_list
metadata CHANGED
@@ -1,7 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-elasticsearch
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.0
4
+ version: 0.5.1
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - diogo
@@ -9,76 +10,86 @@ authors:
9
10
  autorequire:
10
11
  bindir: bin
11
12
  cert_chain: []
12
- date: 2014-10-06 00:00:00.000000000 Z
13
+ date: 2014-10-07 00:00:00.000000000 Z
13
14
  dependencies:
14
15
  - !ruby/object:Gem::Dependency
15
16
  name: fluentd
16
17
  requirement: !ruby/object:Gem::Requirement
18
+ none: false
17
19
  requirements:
18
- - - "~>"
20
+ - - ~>
19
21
  - !ruby/object:Gem::Version
20
22
  version: '0'
21
23
  type: :runtime
22
24
  prerelease: false
23
25
  version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
24
27
  requirements:
25
- - - "~>"
28
+ - - ~>
26
29
  - !ruby/object:Gem::Version
27
30
  version: '0'
28
31
  - !ruby/object:Gem::Dependency
29
32
  name: patron
30
33
  requirement: !ruby/object:Gem::Requirement
34
+ none: false
31
35
  requirements:
32
- - - "~>"
36
+ - - ~>
33
37
  - !ruby/object:Gem::Version
34
38
  version: '0'
35
39
  type: :runtime
36
40
  prerelease: false
37
41
  version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
38
43
  requirements:
39
- - - "~>"
44
+ - - ~>
40
45
  - !ruby/object:Gem::Version
41
46
  version: '0'
42
47
  - !ruby/object:Gem::Dependency
43
48
  name: elasticsearch
44
49
  requirement: !ruby/object:Gem::Requirement
50
+ none: false
45
51
  requirements:
46
- - - ">="
52
+ - - ! '>='
47
53
  - !ruby/object:Gem::Version
48
54
  version: '0'
49
55
  type: :runtime
50
56
  prerelease: false
51
57
  version_requirements: !ruby/object:Gem::Requirement
58
+ none: false
52
59
  requirements:
53
- - - ">="
60
+ - - ! '>='
54
61
  - !ruby/object:Gem::Version
55
62
  version: '0'
56
63
  - !ruby/object:Gem::Dependency
57
64
  name: rake
58
65
  requirement: !ruby/object:Gem::Requirement
66
+ none: false
59
67
  requirements:
60
- - - "~>"
68
+ - - ~>
61
69
  - !ruby/object:Gem::Version
62
70
  version: '0'
63
71
  type: :development
64
72
  prerelease: false
65
73
  version_requirements: !ruby/object:Gem::Requirement
74
+ none: false
66
75
  requirements:
67
- - - "~>"
76
+ - - ~>
68
77
  - !ruby/object:Gem::Version
69
78
  version: '0'
70
79
  - !ruby/object:Gem::Dependency
71
80
  name: webmock
72
81
  requirement: !ruby/object:Gem::Requirement
82
+ none: false
73
83
  requirements:
74
- - - "~>"
84
+ - - ~>
75
85
  - !ruby/object:Gem::Version
76
86
  version: '1'
77
87
  type: :development
78
88
  prerelease: false
79
89
  version_requirements: !ruby/object:Gem::Requirement
90
+ none: false
80
91
  requirements:
81
- - - "~>"
92
+ - - ~>
82
93
  - !ruby/object:Gem::Version
83
94
  version: '1'
84
95
  description: ElasticSearch output plugin for Fluent event collector
@@ -89,8 +100,8 @@ executables: []
89
100
  extensions: []
90
101
  extra_rdoc_files: []
91
102
  files:
92
- - ".gitignore"
93
- - ".travis.yml"
103
+ - .gitignore
104
+ - .travis.yml
94
105
  - Gemfile
95
106
  - History.md
96
107
  - LICENSE.txt
@@ -103,26 +114,33 @@ files:
103
114
  homepage: https://github.com/uken/fluent-plugin-elasticsearch
104
115
  licenses:
105
116
  - MIT
106
- metadata: {}
107
117
  post_install_message:
108
118
  rdoc_options: []
109
119
  require_paths:
110
120
  - lib
111
121
  required_ruby_version: !ruby/object:Gem::Requirement
122
+ none: false
112
123
  requirements:
113
- - - ">="
124
+ - - ! '>='
114
125
  - !ruby/object:Gem::Version
115
126
  version: '0'
127
+ segments:
128
+ - 0
129
+ hash: 1536252562969787484
116
130
  required_rubygems_version: !ruby/object:Gem::Requirement
131
+ none: false
117
132
  requirements:
118
- - - ">="
133
+ - - ! '>='
119
134
  - !ruby/object:Gem::Version
120
135
  version: '0'
136
+ segments:
137
+ - 0
138
+ hash: 1536252562969787484
121
139
  requirements: []
122
140
  rubyforge_project:
123
- rubygems_version: 2.2.2
141
+ rubygems_version: 1.8.23
124
142
  signing_key:
125
- specification_version: 4
143
+ specification_version: 3
126
144
  summary: ElasticSearch output plugin for Fluent event collector
127
145
  test_files:
128
146
  - test/helper.rb
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: 52e6ea7f1fcf3e37be32d06f5d81d5364702cbe5
4
- data.tar.gz: 66ce94029829ccf119262929ca50e9e21c4d73ea
5
- SHA512:
6
- metadata.gz: b9922d58ba0999c3c03671144b1f4446da3154731e9e5b9dc4bc7dc921d154f382259b2b8b972a21bbcafc35f12265921dadbcba4f592d4fc0f1ebba16566ff5
7
- data.tar.gz: d0ec86f473deb9e1a70cca98f3d8194a72f82d08f389246840ae1e25c0dcad9a2c7832b3d54acb6e774652e6c26f50858a9945bca069760f8e972ee01b666515