fluent-plugin-elasticsearch 5.4.1 → 5.4.2
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 +4 -4
- data/History.md +3 -0
- data/fluent-plugin-elasticsearch.gemspec +1 -1
- data/lib/fluent/plugin/in_elasticsearch.rb +5 -1
- data/test/plugin/test_in_elasticsearch.rb +7 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d654e4c24122a1f08b7440556ff43eca647e9aae360c4ebc43f4e29d7a8abfec
|
|
4
|
+
data.tar.gz: 961f8dab627d2628e854e4b6b64a30fb3719c8387dfd73a67aa6da8f059eb447
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 78d3e7ab001e326c47a192798da97b9d44956db46869b807589818469b8c74cfc36bc936c67f2fdffed3c2f2967d4c9ede1737c8c6d774362f524861eee74186
|
|
7
|
+
data.tar.gz: 85e1144f3b227d28772cf785932a44bdf6d73307b7cc0401098acd97083b9638089d5a1e5ad2343cc9a7f64f4d93e274db99419fe07fdfe5b785176d667e6592
|
data/History.md
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 = '5.4.
|
|
6
|
+
s.version = '5.4.2'
|
|
7
7
|
s.authors = ['diogo', 'pitr', 'Hiroshi Hatake']
|
|
8
8
|
s.email = ['pitr.vern@gmail.com', 'me@diogoterror.com', 'cosmo0920.wp@gmail.com']
|
|
9
9
|
s.description = %q{Elasticsearch output plugin for Fluent event collector}
|
|
@@ -286,7 +286,11 @@ module Fluent::Plugin
|
|
|
286
286
|
end
|
|
287
287
|
|
|
288
288
|
router.emit_stream(@tag, es)
|
|
289
|
-
|
|
289
|
+
if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("7.0.0")
|
|
290
|
+
client.clear_scroll(body: {scroll_id: scroll_id}) if scroll_id
|
|
291
|
+
else
|
|
292
|
+
client.clear_scroll(scroll_id: scroll_id) if scroll_id
|
|
293
|
+
end
|
|
290
294
|
end
|
|
291
295
|
|
|
292
296
|
def process_scroll_request(scroll_id)
|
|
@@ -463,9 +463,14 @@ class ElasticsearchInputTest < Test::Unit::TestCase
|
|
|
463
463
|
headers: {'Content-Type' => 'application/json', 'X-elastic-product' => 'Elasticsearch'}}
|
|
464
464
|
end
|
|
465
465
|
end)
|
|
466
|
-
|
|
466
|
+
if Gem::Version.new(Elasticsearch::VERSION) >= Gem::Version.new("7.0.0")
|
|
467
|
+
stub_request(:delete, "http://localhost:9200/_search/scroll").
|
|
468
|
+
with(body: "{\"scroll_id\":\"WomkoUKG0QPB679Ulo6TqQgh3pIGRUmrl9qXXGK3EeiQh9rbYNasTkspZQcJ01uz\"}").
|
|
467
469
|
to_return(status: 200, body: "", headers: {})
|
|
468
|
-
|
|
470
|
+
else
|
|
471
|
+
stub_request(:delete, "http://localhost:9200/_search/scroll/WomkoUKG0QPB679Ulo6TqQgh3pIGRUmrl9qXXGK3EeiQh9rbYNasTkspZQcJ01uz").
|
|
472
|
+
to_return(status: 200, body: "", headers: {})
|
|
473
|
+
end
|
|
469
474
|
driver(CONFIG + %[size 1])
|
|
470
475
|
driver.run(expect_emits: 1, timeout: 10)
|
|
471
476
|
expected = [
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: fluent-plugin-elasticsearch
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 5.4.
|
|
4
|
+
version: 5.4.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- diogo
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2023-
|
|
13
|
+
date: 2023-12-05 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: fluentd
|