logstash-output-elasticsearch_java 2.0.0.beta9 → 2.0.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 (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +5 -0
  3. data/lib/logstash/outputs/elasticsearch_java.rb +2 -6
  4. data/logstash-output-elasticsearch_java.gemspec +2 -2
  5. data/spec/integration/outputs/retry_spec.rb +4 -4
  6. metadata +35 -30
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c2adf5a83677078a3f4f640e2b7154ea79438a8b
4
- data.tar.gz: df41f4b1f4728a35a49251ad972a130e94bb3f0f
3
+ metadata.gz: 8203c181d7406272e4f3a539964c0f5403d2f1fc
4
+ data.tar.gz: 256f76da6ffa545b0c8c3680f8ceb5c64a6af5c2
5
5
  SHA512:
6
- metadata.gz: 8c73c40a6b138c0f0db50452e4a7049249b3fd7cc00b5121437f0adad90b1c8f13812ab1bcad63e10fd2fc2df00f4c6bece8b666b89b83eea0da62490cc62b4f
7
- data.tar.gz: 4de7038f19b596210d23ae61bc338f7ca8380e961b73a656c631102e046fdf9a21f5775737d21d7d8bc2c8a6e888a4c0bd0ab6789dd11bc8ddbb6230f369344a
6
+ metadata.gz: 4fcd1adadbe9a7c5720e84b9bcab3c040b507a306078b3c42783b89180c16c1a3d9ac6e13e9a677583c894b01412b5f46aa78d7e5ff03f4d978ec8e31773e34a
7
+ data.tar.gz: 29461bb180ca18236aa6cf6de5dcc15ab853ade4d540b9f39f3471f52f19a4c8cc60186963af53e63fa7dcaa802038770b704d3c0cced1590cdcb0a654d8ef7d
data/CHANGELOG.md CHANGED
@@ -1,2 +1,7 @@
1
+ ## 2.0.0
2
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully,
3
+ instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
4
+ - Dependency on logstash-core update to 2.0
5
+
1
6
  ## 2.0.0
2
7
  - Initial Release. Only supports Node/Transport in ES2.x
data/lib/logstash/outputs/elasticsearch_java.rb CHANGED
@@ -410,7 +410,7 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
410
410
 
411
411
  public
412
412
  def receive(event)
413
- return unless output?(event)
413
+
414
414
 
415
415
  # block until we have not maxed out our
416
416
  # retry queue. This is applying back-pressure
@@ -481,11 +481,7 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
481
481
  end # def flush
482
482
 
483
483
  public
484
- def teardown
485
- if @cacert # remove temporary jks store created from the cacert
486
- File.delete(@truststore)
487
- end
488
-
484
+ def close
489
485
  @retry_teardown_requested.make_true
490
486
  # First, make sure retry_timer_thread is stopped
491
487
  # to ensure we do not signal a retry based on
data/logstash-output-elasticsearch_java.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'logstash-output-elasticsearch_java'
3
- s.version = '2.0.0.beta9'
3
+ s.version = '2.0.0'
4
4
  s.licenses = ['apache-2.0']
5
5
  s.summary = "Logstash Output to Elasticsearch using Java node/transport client"
6
6
  s.description = "Output events to elasticsearch using the java client"
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
23
23
  s.add_runtime_dependency 'elasticsearch', ['>= 1.0.13', '~> 1.0']
24
24
  s.add_runtime_dependency 'stud', ['>= 0.0.17', '~> 0.0']
25
25
  s.add_runtime_dependency 'cabin', ['~> 0.6']
26
- s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
26
+ s.add_runtime_dependency "logstash-core", ">= 2.0.0.beta2", "< 3.0.0"
27
27
 
28
28
  s.add_development_dependency 'ftw', '~> 0.0.42'
29
29
  s.add_development_dependency 'logstash-input-generator'
data/spec/integration/outputs/retry_spec.rb CHANGED
@@ -61,7 +61,7 @@ describe "failures in bulk class expected behavior", :integration => true do
61
61
  end
62
62
  subject.register
63
63
  subject.receive(event1)
64
- subject.teardown
64
+ subject.close
65
65
  end
66
66
 
67
67
  it "should retry actions with response status of 503" do
@@ -109,7 +109,7 @@ describe "failures in bulk class expected behavior", :integration => true do
109
109
  subject.register
110
110
  subject.receive(invalid_event)
111
111
  expect(subject).not_to receive(:retry_push)
112
- subject.teardown
112
+ subject.close
113
113
 
114
114
  @es.indices.refresh
115
115
  sleep(5)
@@ -123,7 +123,7 @@ describe "failures in bulk class expected behavior", :integration => true do
123
123
  subject.register
124
124
  subject.receive(event1)
125
125
  expect(subject).not_to receive(:retry_push)
126
- subject.teardown
126
+ subject.close
127
127
 
128
128
  @es.indices.refresh
129
129
  sleep(5)
@@ -137,7 +137,7 @@ describe "failures in bulk class expected behavior", :integration => true do
137
137
  subject.register
138
138
  subject.receive(invalid_event)
139
139
  subject.receive(event1)
140
- subject.teardown
140
+ subject.close
141
141
  @es.indices.refresh
142
142
  sleep(5)
143
143
 
metadata CHANGED
@@ -1,19 +1,19 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-output-elasticsearch_java
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.beta9
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-25 00:00:00.000000000 Z
11
+ date: 2015-10-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
15
15
  requirements:
16
- - - ">="
16
+ - - '>='
17
17
  - !ruby/object:Gem::Version
18
18
  version: '0'
19
19
  name: concurrent-ruby
@@ -21,16 +21,16 @@ dependencies:
21
21
  type: :runtime
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - '>='
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  requirement: !ruby/object:Gem::Requirement
29
29
  requirements:
30
- - - ">="
30
+ - - '>='
31
31
  - !ruby/object:Gem::Version
32
32
  version: 1.0.13
33
- - - "~>"
33
+ - - ~>
34
34
  - !ruby/object:Gem::Version
35
35
  version: '1.0'
36
36
  name: elasticsearch
@@ -38,19 +38,19 @@ dependencies:
38
38
  type: :runtime
39
39
  version_requirements: !ruby/object:Gem::Requirement
40
40
  requirements:
41
- - - ">="
41
+ - - '>='
42
42
  - !ruby/object:Gem::Version
43
43
  version: 1.0.13
44
- - - "~>"
44
+ - - ~>
45
45
  - !ruby/object:Gem::Version
46
46
  version: '1.0'
47
47
  - !ruby/object:Gem::Dependency
48
48
  requirement: !ruby/object:Gem::Requirement
49
49
  requirements:
50
- - - ">="
50
+ - - '>='
51
51
  - !ruby/object:Gem::Version
52
52
  version: 0.0.17
53
- - - "~>"
53
+ - - ~>
54
54
  - !ruby/object:Gem::Version
55
55
  version: '0.0'
56
56
  name: stud
@@ -58,16 +58,16 @@ dependencies:
58
58
  type: :runtime
59
59
  version_requirements: !ruby/object:Gem::Requirement
60
60
  requirements:
61
- - - ">="
61
+ - - '>='
62
62
  - !ruby/object:Gem::Version
63
63
  version: 0.0.17
64
- - - "~>"
64
+ - - ~>
65
65
  - !ruby/object:Gem::Version
66
66
  version: '0.0'
67
67
  - !ruby/object:Gem::Dependency
68
68
  requirement: !ruby/object:Gem::Requirement
69
69
  requirements:
70
- - - "~>"
70
+ - - ~>
71
71
  - !ruby/object:Gem::Version
72
72
  version: '0.6'
73
73
  name: cabin
@@ -75,27 +75,33 @@ dependencies:
75
75
  type: :runtime
76
76
  version_requirements: !ruby/object:Gem::Requirement
77
77
  requirements:
78
- - - "~>"
78
+ - - ~>
79
79
  - !ruby/object:Gem::Version
80
80
  version: '0.6'
81
81
  - !ruby/object:Gem::Dependency
82
82
  requirement: !ruby/object:Gem::Requirement
83
83
  requirements:
84
- - - "~>"
84
+ - - '>='
85
85
  - !ruby/object:Gem::Version
86
- version: 2.0.0.snapshot
86
+ version: 2.0.0.beta2
87
+ - - <
88
+ - !ruby/object:Gem::Version
89
+ version: 3.0.0
87
90
  name: logstash-core
88
91
  prerelease: false
89
92
  type: :runtime
90
93
  version_requirements: !ruby/object:Gem::Requirement
91
94
  requirements:
92
- - - "~>"
95
+ - - '>='
96
+ - !ruby/object:Gem::Version
97
+ version: 2.0.0.beta2
98
+ - - <
93
99
  - !ruby/object:Gem::Version
94
- version: 2.0.0.snapshot
100
+ version: 3.0.0
95
101
  - !ruby/object:Gem::Dependency
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
107
  name: ftw
@@ -103,13 +109,13 @@ dependencies:
103
109
  type: :development
104
110
  version_requirements: !ruby/object:Gem::Requirement
105
111
  requirements:
106
- - - "~>"
112
+ - - ~>
107
113
  - !ruby/object:Gem::Version
108
114
  version: 0.0.42
109
115
  - !ruby/object:Gem::Dependency
110
116
  requirement: !ruby/object:Gem::Requirement
111
117
  requirements:
112
- - - ">="
118
+ - - '>='
113
119
  - !ruby/object:Gem::Version
114
120
  version: '0'
115
121
  name: logstash-input-generator
@@ -117,13 +123,13 @@ dependencies:
117
123
  type: :development
118
124
  version_requirements: !ruby/object:Gem::Requirement
119
125
  requirements:
120
- - - ">="
126
+ - - '>='
121
127
  - !ruby/object:Gem::Version
122
128
  version: '0'
123
129
  - !ruby/object:Gem::Dependency
124
130
  requirement: !ruby/object:Gem::Requirement
125
131
  requirements:
126
- - - ">="
132
+ - - '>='
127
133
  - !ruby/object:Gem::Version
128
134
  version: '0'
129
135
  name: logstash-devutils
@@ -131,13 +137,13 @@ dependencies:
131
137
  type: :development
132
138
  version_requirements: !ruby/object:Gem::Requirement
133
139
  requirements:
134
- - - ">="
140
+ - - '>='
135
141
  - !ruby/object:Gem::Version
136
142
  version: '0'
137
143
  - !ruby/object:Gem::Dependency
138
144
  requirement: !ruby/object:Gem::Requirement
139
145
  requirements:
140
- - - ">="
146
+ - - '>='
141
147
  - !ruby/object:Gem::Version
142
148
  version: '0'
143
149
  name: longshoreman
@@ -145,7 +151,7 @@ dependencies:
145
151
  type: :development
146
152
  version_requirements: !ruby/object:Gem::Requirement
147
153
  requirements:
148
- - - ">="
154
+ - - '>='
149
155
  - !ruby/object:Gem::Version
150
156
  version: '0'
151
157
  description: Output events to elasticsearch using the java client
@@ -228,14 +234,14 @@ require_paths:
228
234
  - lib
229
235
  required_ruby_version: !ruby/object:Gem::Requirement
230
236
  requirements:
231
- - - ">="
237
+ - - '>='
232
238
  - !ruby/object:Gem::Version
233
239
  version: '0'
234
240
  required_rubygems_version: !ruby/object:Gem::Requirement
235
241
  requirements:
236
- - - ">"
242
+ - - '>='
237
243
  - !ruby/object:Gem::Version
238
- version: 1.3.1
244
+ version: '0'
239
245
  requirements: []
240
246
  rubyforge_project:
241
247
  rubygems_version: 2.4.8
@@ -254,4 +260,3 @@ test_files:
254
260
  - spec/integration/outputs/update_spec.rb
255
261
  - spec/unit/outputs/elasticsearch/protocol_spec.rb
256
262
  - spec/unit/outputs/elasticsearch_spec.rb
257
- has_rdoc: