logstash-output-elasticsearch 2.6.0-java → 2.6.1-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +3 -13
  3. data/lib/logstash/outputs/elasticsearch/common.rb +1 -0
  4. data/lib/logstash/outputs/elasticsearch/common_configs.rb +5 -0
  5. data/logstash-output-elasticsearch.gemspec +1 -1
  6. data/spec/unit/outputs/elasticsearch_spec.rb +24 -0
  7. metadata +45 -45
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a36e1e7ebe56e6917ef4df25ffff96df33949339
4
- data.tar.gz: 4157262fbd998bd25f4e5cabbb647f6de51aaeed
3
+ metadata.gz: 5551c54f0e8b203365e73483a7db20333db6d333
4
+ data.tar.gz: 9c5c987d0fc748b76d253c275cfa698ae26874c5
5
5
  SHA512:
6
- metadata.gz: 7a935a221d63d6d61bd067779108dfbc6773db33cd95538b992941f8691f63006fe465166194bb0203cc3cd12cb24ef7a1ef377221109409d50d4c6e563e524a
7
- data.tar.gz: d06bd8396f378204775a7cc653164b7ab1a165681a2499cbe09f1a30aec7ded03acaa963303782464e69a9b38d1c9b9dae934af2dd35fe5a201d035a69f849cf
6
+ metadata.gz: 7dd6e24625c9c7426be50acd16c7926b4b08ea4f23a6e7c3876015a39a0a34599d98490b515b21f965357a204fedad42b55d261a53c420d09e17d23eb68c86c5
7
+ data.tar.gz: 9d69f8a3c0a888ce32a754a40ad84b28d261d43286f09f595a556f048564f0277ea2463be8dc978b596e9f28f5a1c7acaf759e5120676817e940cd6997c9b375
data/CHANGELOG.md CHANGED
@@ -1,16 +1,6 @@
1
- # 2.6.0
2
- - Changed the default template in this version to be compatible
3
- with Elasticsearch 5.0 due to new changes in mappings. This version contains
4
- the new default template. You _can_ still use this version of Logstash by
5
- manually specifying your own template, or disabling template management.
6
-
7
- # 2.5.5
8
- - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
9
- # 2.5.4
10
- - New dependency requirements for logstash-core for the 5.0 release
11
- ## 2.5.3
12
- - Bump minimum manticore version to 0.5.4 which fixes a memory leak (#392)
13
-
1
+ ## 2.6.1
2
+ - Add 'retry_on_conflict' configuration option which should have been here from the beginning
3
+
14
4
  ## 2.5.2
15
5
  - Fix bug with update document with doc_as_upsert and scripting (#364, #359)
16
6
  - Make error messages more verbose and easier to parse by humans
data/lib/logstash/outputs/elasticsearch/common.rb CHANGED
@@ -138,6 +138,7 @@ module LogStash; module Outputs; class ElasticSearch;
138
138
  if @action == 'update'
139
139
  params[:_upsert] = LogStash::Json.load(event.sprintf(@upsert)) if @upsert != ""
140
140
  params[:_script] = event.sprintf(@script) if @script != ""
141
+ params[:_retry_on_conflict] = @retry_on_conflict
141
142
  end
142
143
  params
143
144
  end
data/lib/logstash/outputs/elasticsearch/common_configs.rb CHANGED
@@ -151,6 +151,11 @@ module LogStash; module Outputs; class ElasticSearch
151
151
  # DEPRECATED This setting no longer does anything. If you need to change the number of retries in flight
152
152
  # try increasing the total number of workers to better handle this.
153
153
  mod.config :retry_max_items, :validate => :number, :default => 500, :deprecated => true
154
+
155
+ # The number of times Elasticsearch should internally retry an update/upserted document
156
+ # See the https://www.elastic.co/guide/en/elasticsearch/guide/current/partial-updates.html[partial updates]
157
+ # for more info
158
+ mod.config :retry_on_conflict, :validate => :number, :default => 1
154
159
  end
155
160
  end
156
161
  end end end
data/logstash-output-elasticsearch.gemspec CHANGED
@@ -1,7 +1,7 @@
1
1
  Gem::Specification.new do |s|
2
2
 
3
3
  s.name = 'logstash-output-elasticsearch'
4
- s.version = '2.6.0'
4
+ s.version = '2.6.1'
5
5
  s.licenses = ['apache-2.0']
6
6
  s.summary = "Logstash Output to Elasticsearch"
7
7
  s.description = "Output events to elasticsearch"
data/spec/unit/outputs/elasticsearch_spec.rb CHANGED
@@ -200,4 +200,28 @@ describe "outputs/elasticsearch" do
200
200
  include_examples("an encrypted client connection")
201
201
  end
202
202
  end
203
+
204
+ describe "retry_on_conflict" do
205
+ let(:num_retries) { 123 }
206
+ let(:event) { LogStash::Event.new("message" => "blah") }
207
+ subject(:eso) {LogStash::Outputs::ElasticSearch.new(options.merge('retry_on_conflict' => num_retries))}
208
+
209
+ context "with a regular index" do
210
+ let(:options) { {"action" => "index"} }
211
+
212
+ it "should interpolate the requested action value when creating an event_action_tuple" do
213
+ action, params, event_data = eso.event_action_tuple(event)
214
+ expect(params).not_to include({:_retry_on_conflict => num_retries})
215
+ end
216
+ end
217
+
218
+ context "using a plain update" do
219
+ let(:options) { {"action" => "update", "retry_on_conflict" => num_retries} }
220
+
221
+ it "should interpolate the requested action value when creating an event_action_tuple" do
222
+ action, params, event_data = eso.event_action_tuple(event)
223
+ expect(params).to include({:_retry_on_conflict => num_retries})
224
+ end
225
+ end
226
+ end
203
227
  end
metadata CHANGED
@@ -1,30 +1,39 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-output-elasticsearch
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.6.0
4
+ version: 2.6.1
5
5
  platform: java
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-03-30 00:00:00.000000000 Z
11
+ date: 2016-04-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
+ name: concurrent-ruby
15
+ version_requirements: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - '>='
18
+ - !ruby/object:Gem::Version
19
+ version: '0'
14
20
  requirement: !ruby/object:Gem::Requirement
15
21
  requirements:
16
22
  - - '>='
17
23
  - !ruby/object:Gem::Version
18
24
  version: '0'
19
- name: concurrent-ruby
20
25
  prerelease: false
21
26
  type: :runtime
27
+ - !ruby/object:Gem::Dependency
28
+ name: elasticsearch
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.0.13
34
+ - - ~>
35
+ - !ruby/object:Gem::Version
36
+ version: '1.0'
28
37
  requirement: !ruby/object:Gem::Requirement
29
38
  requirements:
30
39
  - - '>='
@@ -33,18 +42,18 @@ dependencies:
33
42
  - - ~>
34
43
  - !ruby/object:Gem::Version
35
44
  version: '1.0'
36
- name: elasticsearch
37
45
  prerelease: false
38
46
  type: :runtime
47
+ - !ruby/object:Gem::Dependency
48
+ name: stud
39
49
  version_requirements: !ruby/object:Gem::Requirement
40
50
  requirements:
41
51
  - - '>='
42
52
  - !ruby/object:Gem::Version
43
- version: 1.0.13
53
+ version: 0.0.17
44
54
  - - ~>
45
55
  - !ruby/object:Gem::Version
46
- version: '1.0'
47
- - !ruby/object:Gem::Dependency
56
+ version: '0.0'
48
57
  requirement: !ruby/object:Gem::Requirement
49
58
  requirements:
50
59
  - - '>='
@@ -53,74 +62,74 @@ dependencies:
53
62
  - - ~>
54
63
  - !ruby/object:Gem::Version
55
64
  version: '0.0'
56
- name: stud
57
65
  prerelease: false
58
66
  type: :runtime
67
+ - !ruby/object:Gem::Dependency
68
+ name: cabin
59
69
  version_requirements: !ruby/object:Gem::Requirement
60
70
  requirements:
61
- - - '>='
62
- - !ruby/object:Gem::Version
63
- version: 0.0.17
64
71
  - - ~>
65
72
  - !ruby/object:Gem::Version
66
- version: '0.0'
67
- - !ruby/object:Gem::Dependency
73
+ version: '0.6'
68
74
  requirement: !ruby/object:Gem::Requirement
69
75
  requirements:
70
76
  - - ~>
71
77
  - !ruby/object:Gem::Version
72
78
  version: '0.6'
73
- name: cabin
74
79
  prerelease: false
75
80
  type: :runtime
81
+ - !ruby/object:Gem::Dependency
82
+ name: logstash-core-plugin-api
76
83
  version_requirements: !ruby/object:Gem::Requirement
77
84
  requirements:
78
85
  - - ~>
79
86
  - !ruby/object:Gem::Version
80
- version: '0.6'
81
- - !ruby/object:Gem::Dependency
87
+ version: '1.0'
82
88
  requirement: !ruby/object:Gem::Requirement
83
89
  requirements:
84
90
  - - ~>
85
91
  - !ruby/object:Gem::Version
86
92
  version: '1.0'
87
- name: logstash-core-plugin-api
88
93
  prerelease: false
89
94
  type: :runtime
95
+ - !ruby/object:Gem::Dependency
96
+ name: ftw
90
97
  version_requirements: !ruby/object:Gem::Requirement
91
98
  requirements:
92
99
  - - ~>
93
100
  - !ruby/object:Gem::Version
94
- version: '1.0'
95
- - !ruby/object:Gem::Dependency
101
+ version: 0.0.42
96
102
  requirement: !ruby/object:Gem::Requirement
97
103
  requirements:
98
104
  - - ~>
99
105
  - !ruby/object:Gem::Version
100
106
  version: 0.0.42
101
- name: ftw
102
107
  prerelease: false
103
108
  type: :development
109
+ - !ruby/object:Gem::Dependency
110
+ name: logstash-codec-plain
104
111
  version_requirements: !ruby/object:Gem::Requirement
105
112
  requirements:
106
- - - ~>
113
+ - - '>='
107
114
  - !ruby/object:Gem::Version
108
- version: 0.0.42
109
- - !ruby/object:Gem::Dependency
115
+ version: '0'
110
116
  requirement: !ruby/object:Gem::Requirement
111
117
  requirements:
112
118
  - - '>='
113
119
  - !ruby/object:Gem::Version
114
120
  version: '0'
115
- name: logstash-codec-plain
116
121
  prerelease: false
117
122
  type: :development
123
+ - !ruby/object:Gem::Dependency
124
+ name: manticore
118
125
  version_requirements: !ruby/object:Gem::Requirement
119
126
  requirements:
120
127
  - - '>='
121
128
  - !ruby/object:Gem::Version
122
- version: '0'
123
- - !ruby/object:Gem::Dependency
129
+ version: 0.5.4
130
+ - - <
131
+ - !ruby/object:Gem::Version
132
+ version: 1.0.0
124
133
  requirement: !ruby/object:Gem::Requirement
125
134
  requirements:
126
135
  - - '>='
@@ -129,59 +138,50 @@ dependencies:
129
138
  - - <
130
139
  - !ruby/object:Gem::Version
131
140
  version: 1.0.0
132
- name: manticore
133
141
  prerelease: false
134
142
  type: :runtime
143
+ - !ruby/object:Gem::Dependency
144
+ name: logstash-devutils
135
145
  version_requirements: !ruby/object:Gem::Requirement
136
146
  requirements:
137
147
  - - '>='
138
148
  - !ruby/object:Gem::Version
139
- version: 0.5.4
140
- - - <
141
- - !ruby/object:Gem::Version
142
- version: 1.0.0
143
- - !ruby/object:Gem::Dependency
149
+ version: '0'
144
150
  requirement: !ruby/object:Gem::Requirement
145
151
  requirements:
146
152
  - - '>='
147
153
  - !ruby/object:Gem::Version
148
154
  version: '0'
149
- name: logstash-devutils
150
155
  prerelease: false
151
156
  type: :development
157
+ - !ruby/object:Gem::Dependency
158
+ name: longshoreman
152
159
  version_requirements: !ruby/object:Gem::Requirement
153
160
  requirements:
154
161
  - - '>='
155
162
  - !ruby/object:Gem::Version
156
163
  version: '0'
157
- - !ruby/object:Gem::Dependency
158
164
  requirement: !ruby/object:Gem::Requirement
159
165
  requirements:
160
166
  - - '>='
161
167
  - !ruby/object:Gem::Version
162
168
  version: '0'
163
- name: longshoreman
164
169
  prerelease: false
165
170
  type: :development
171
+ - !ruby/object:Gem::Dependency
172
+ name: flores
166
173
  version_requirements: !ruby/object:Gem::Requirement
167
174
  requirements:
168
175
  - - '>='
169
176
  - !ruby/object:Gem::Version
170
177
  version: '0'
171
- - !ruby/object:Gem::Dependency
172
178
  requirement: !ruby/object:Gem::Requirement
173
179
  requirements:
174
180
  - - '>='
175
181
  - !ruby/object:Gem::Version
176
182
  version: '0'
177
- name: flores
178
183
  prerelease: false
179
184
  type: :development
180
- version_requirements: !ruby/object:Gem::Requirement
181
- requirements:
182
- - - '>='
183
- - !ruby/object:Gem::Version
184
- version: '0'
185
185
  description: Output events to elasticsearch
186
186
  email: info@elastic.co
187
187
  executables: []
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
243
243
  version: '0'
244
244
  requirements: []
245
245
  rubyforge_project:
246
- rubygems_version: 2.4.5
246
+ rubygems_version: 2.4.8
247
247
  signing_key:
248
248
  specification_version: 4
249
249
  summary: Logstash Output to Elasticsearch