logstash-output-elasticsearch 7.4.0-java → 7.4.1-java
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.
- checksums.yaml +5 -5
- data/CHANGELOG.md +3 -0
- data/lib/logstash/outputs/elasticsearch/common.rb +6 -3
- data/lib/logstash/outputs/elasticsearch/http_client.rb +7 -9
- data/lib/logstash/outputs/elasticsearch/http_client/pool.rb +31 -12
- data/lib/logstash/outputs/elasticsearch/template_manager.rb +4 -6
- data/logstash-output-elasticsearch.gemspec +1 -1
- data/spec/es_spec_helper.rb +6 -0
- data/spec/integration/outputs/compressed_indexing_spec.rb +46 -44
- data/spec/integration/outputs/delete_spec.rb +51 -49
- data/spec/integration/outputs/groovy_update_spec.rb +131 -129
- data/spec/integration/outputs/index_version_spec.rb +82 -81
- data/spec/integration/outputs/ingest_pipeline_spec.rb +51 -49
- data/spec/integration/outputs/painless_update_spec.rb +132 -130
- data/spec/integration/outputs/parent_spec.rb +56 -54
- data/spec/integration/outputs/sniffer_spec.rb +5 -2
- data/spec/integration/outputs/templates_5x_spec.rb +81 -82
- data/spec/integration/outputs/templates_spec.rb +81 -81
- data/spec/integration/outputs/update_spec.rb +101 -99
- data/spec/unit/outputs/elasticsearch/http_client/pool_spec.rb +3 -0
- data/spec/unit/outputs/elasticsearch/http_client_spec.rb +1 -1
- data/spec/unit/outputs/elasticsearch/template_manager_spec.rb +13 -25
- metadata +4 -6
@@ -21,6 +21,9 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::Pool do
|
|
21
21
|
|
22
22
|
allow(::Manticore::Client).to receive(:new).and_return(manticore_double)
|
23
23
|
|
24
|
+
allow(subject).to receive(:connected_es_versions).with(any_args).and_return(["0.0.0"])
|
25
|
+
allow(subject).to receive(:get_es_version).with(any_args).and_return("0.0.0")
|
26
|
+
|
24
27
|
subject.start
|
25
28
|
end
|
26
29
|
|
@@ -132,7 +132,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient do
|
|
132
132
|
}
|
133
133
|
|
134
134
|
it "returns the hash response" do
|
135
|
-
expect(subject.pool).to receive(:get).with(path, nil).and_return(
|
135
|
+
expect(subject.pool).to receive(:get).with(path, nil).and_return(get_response)
|
136
136
|
expect(subject.get(path)["body"]).to eq(body)
|
137
137
|
end
|
138
138
|
end
|
@@ -6,32 +6,21 @@ require "json"
|
|
6
6
|
describe LogStash::Outputs::ElasticSearch::TemplateManager do
|
7
7
|
|
8
8
|
describe ".get_es_major_version" do
|
9
|
-
let(:es_1x_version) { '{ "number" : "1.7.0", "build_hash" : "929b9739cae115e73c346cb5f9a6f24ba735a743", "build_timestamp" : "2015-07-16T14:31:07Z", "build_snapshot" : false, "lucene_version" : "4.10.4" }' }
|
10
|
-
let(:es_2x_version) { '{ "number" : "2.3.4", "build_hash" : "e455fd0c13dceca8dbbdbb1665d068ae55dabe3f", "build_timestamp" : "2016-06-30T11:24:31Z", "build_snapshot" : false, "lucene_version" : "5.5.0" }' }
|
11
|
-
let(:es_5x_version) { '{ "number" : "5.0.0-alpha4", "build_hash" : "b0da471", "build_date" : "2016-06-22T12:33:48.164Z", "build_snapshot" : false, "lucene_version" : "6.1.0" }' }
|
12
9
|
let(:client) { double("client") }
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
end
|
17
|
-
it "detects major version is 1" do
|
18
|
-
expect(described_class.get_es_major_version(client)).to eq("1")
|
19
|
-
end
|
10
|
+
|
11
|
+
before(:each) do
|
12
|
+
allow(client).to receive(:connected_es_versions).and_return(["5.3.0"])
|
20
13
|
end
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
end
|
25
|
-
it "detects major version is 2" do
|
26
|
-
expect(described_class.get_es_major_version(client)).to eq("2")
|
27
|
-
end
|
14
|
+
|
15
|
+
it "picks the largest major version" do
|
16
|
+
expect(described_class.get_es_major_version(client)).to eq(5)
|
28
17
|
end
|
29
|
-
context "
|
18
|
+
context "if there are nodes with multiple major versions" do
|
30
19
|
before(:each) do
|
31
|
-
allow(client).to receive(:
|
20
|
+
allow(client).to receive(:connected_es_versions).and_return(["5.3.0", "6.0.0"])
|
32
21
|
end
|
33
|
-
it "
|
34
|
-
expect(described_class.get_es_major_version(client)).to eq(
|
22
|
+
it "picks the largest major version" do
|
23
|
+
expect(described_class.get_es_major_version(client)).to eq(6)
|
35
24
|
end
|
36
25
|
end
|
37
26
|
end
|
@@ -39,19 +28,18 @@ describe LogStash::Outputs::ElasticSearch::TemplateManager do
|
|
39
28
|
describe ".default_template_path" do
|
40
29
|
context "elasticsearch 1.x" do
|
41
30
|
it "chooses the 2x template" do
|
42
|
-
expect(described_class.default_template_path(
|
31
|
+
expect(described_class.default_template_path(1)).to match(/elasticsearch-template-es2x.json/)
|
43
32
|
end
|
44
33
|
end
|
45
34
|
context "elasticsearch 2.x" do
|
46
35
|
it "chooses the 2x template" do
|
47
|
-
expect(described_class.default_template_path(
|
36
|
+
expect(described_class.default_template_path(2)).to match(/elasticsearch-template-es2x.json/)
|
48
37
|
end
|
49
38
|
end
|
50
39
|
context "elasticsearch 5.x" do
|
51
40
|
it "chooses the 5x template" do
|
52
|
-
expect(described_class.default_template_path(
|
41
|
+
expect(described_class.default_template_path(5)).to match(/elasticsearch-template-es5x.json/)
|
53
42
|
end
|
54
43
|
end
|
55
44
|
end
|
56
|
-
|
57
45
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: logstash-output-elasticsearch
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 7.4.
|
4
|
+
version: 7.4.1
|
5
5
|
platform: java
|
6
6
|
authors:
|
7
7
|
- Elastic
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-09-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
@@ -196,9 +196,7 @@ dependencies:
|
|
196
196
|
- - ">="
|
197
197
|
- !ruby/object:Gem::Version
|
198
198
|
version: '0'
|
199
|
-
description: This gem is a Logstash plugin required to be installed on top of the
|
200
|
-
Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This
|
201
|
-
gem is not a stand-alone program
|
199
|
+
description: This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program
|
202
200
|
email: info@elastic.co
|
203
201
|
executables: []
|
204
202
|
extensions: []
|
@@ -282,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
282
280
|
version: '0'
|
283
281
|
requirements: []
|
284
282
|
rubyforge_project:
|
285
|
-
rubygems_version: 2.
|
283
|
+
rubygems_version: 2.4.8
|
286
284
|
signing_key:
|
287
285
|
specification_version: 4
|
288
286
|
summary: Logstash Output to Elasticsearch
|