fluent-plugin-elasticsearch 5.2.5 → 5.3.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 (10) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/linux.yml +1 -1
  3. data/.github/workflows/macos.yml +1 -1
  4. data/.github/workflows/windows.yml +1 -1
  5. data/History.md +6 -0
  6. data/README.md +2 -0
  7. data/fluent-plugin-elasticsearch.gemspec +3 -2
  8. data/lib/fluent/plugin/in_elasticsearch.rb +1 -0
  9. data/lib/fluent/plugin/out_elasticsearch.rb +3 -1
  10. metadata +21 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9e6354575b148be2666c68a6a3c72fcda76139517570203751217cb130fcc070
4
- data.tar.gz: 32a0c118516bb5dca54e402e655309565d08f2e1d01caf467a39f2c15d58f26f
3
+ metadata.gz: a475837f544383a6d7c59f43f31c9d79a7c6154b2b8c851c266a9bbbe393e50a
4
+ data.tar.gz: 300ad2d07e3009f9d50433ceecee0e410fbd129d75c86d71646e659f58f19df3
5
5
  SHA512:
6
- metadata.gz: 444ef6890245dd454adde27b32478369c913f8a4a4b55bd51025390fcf8850ffceb08203fd85265a3fbbdb9f8f4e7bf77526da2119860de1a6c35fe525275ef9
7
- data.tar.gz: a78b3e755f9a9f4eef63fb694cc39ceb6db5bc3d565f46f1934b234d00ddb48ea76235db8623f84e70a64afd844f29dc90b75d4d237194054e0777a92f5d199c
6
+ metadata.gz: d1b12f9ee8582952388aadb13e06ef2538677bb761e9e55f1ea41214442c224b3334252a2b78bc35db6a334c19fa2183fff4a9311bd55bf8edeb44cbab30a1b5
7
+ data.tar.gz: eff7db364b8c307f01935b18221effc879e65d9ef300caba3cbdfc3a1c0fe7d84f3f4d8741fdb934bed553f58d0475a76b235598145e9f39c56c124766015540
data/.github/workflows/linux.yml CHANGED
@@ -11,7 +11,7 @@ jobs:
11
11
  strategy:
12
12
  fail-fast: false
13
13
  matrix:
14
- ruby: [ '2.7', '3.0', '3.1', '3.2' ]
14
+ ruby: [ '3.0', '3.1', '3.2' ]
15
15
  os:
16
16
  - ubuntu-latest
17
17
  name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
data/.github/workflows/macos.yml CHANGED
@@ -11,7 +11,7 @@ jobs:
11
11
  strategy:
12
12
  fail-fast: false
13
13
  matrix:
14
- ruby: [ '2.7', '3.0', '3.1', '3.2' ]
14
+ ruby: [ '3.0', '3.1', '3.2' ]
15
15
  os:
16
16
  - macOS-latest
17
17
  name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
data/.github/workflows/windows.yml CHANGED
@@ -11,7 +11,7 @@ jobs:
11
11
  strategy:
12
12
  fail-fast: false
13
13
  matrix:
14
- ruby: [ '2.7', '3.0', '3.1', '3.2' ]
14
+ ruby: [ '3.0', '3.1', '3.2' ]
15
15
  os:
16
16
  - windows-latest
17
17
  name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
data/History.md CHANGED
@@ -2,6 +2,12 @@
2
2
 
3
3
  ### [Unreleased]
4
4
 
5
+ ### 5.3.0
6
+
7
+ - Unpin `faraday` from v1, upgrade to v2. (#1012)
8
+ Note that if you can't migrate other plugins from `faraday` v1 yet, need to keep
9
+ fluent-plugin-elasticsearch v5.2.5.
10
+
5
11
  ### 5.2.5
6
12
 
7
13
  - Update the name of parameter about `thread_pool`.
data/README.md CHANGED
@@ -125,6 +125,8 @@ Current maintainers: [Hiroshi Hatake | @cosmo0920](https://github.com/cosmo0920)
125
125
  | >= 2.0.0 && < 3.2.3 | >= v0.14.20 | >= 2.1 |
126
126
  | < 2.0.0 | >= v0.12.0 | >= 1.9 |
127
127
 
128
+ NOTE: Since fluent-plugin-elasticsearch 5.3.0, it requires faraday 2.0 or later.
129
+
128
130
  NOTE: For v0.12 version, you should use 1.x.y version. Please send patch into v0.12 branch if you encountered 1.x version's bug.
129
131
 
130
132
  NOTE: This documentation is for fluent-plugin-elasticsearch 2.x or later. For 1.x documentation, please see [v0.12 branch](https://github.com/uken/fluent-plugin-elasticsearch/tree/v0.12).
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 = '5.2.5'
6
+ s.version = '5.3.0'
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}
@@ -23,7 +23,8 @@ Gem::Specification.new do |s|
23
23
  s.required_ruby_version = Gem::Requirement.new(">= 2.3".freeze)
24
24
 
25
25
  s.add_runtime_dependency 'fluentd', '>= 0.14.22'
26
- s.add_runtime_dependency "faraday", "~> 1.10"
26
+ s.add_runtime_dependency 'faraday', '>= 2.0.0'
27
+ s.add_runtime_dependency 'faraday-excon', '>= 2.0.0'
27
28
  s.add_runtime_dependency 'excon', '>= 0'
28
29
  s.add_runtime_dependency 'elasticsearch'
29
30
 
data/lib/fluent/plugin/in_elasticsearch.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  require 'elasticsearch'
2
2
 
3
+ require 'faraday/excon'
3
4
  require 'fluent/log-ext'
4
5
  require 'fluent/plugin/input'
5
6
  require_relative 'elasticsearch_constants'
data/lib/fluent/plugin/out_elasticsearch.rb CHANGED
@@ -32,6 +32,8 @@ begin
32
32
  rescue LoadError
33
33
  end
34
34
 
35
+ require 'faraday/excon'
36
+
35
37
  module Fluent::Plugin
36
38
  class ElasticsearchOutput < Output
37
39
  class RecoverableRequestFailure < StandardError; end
@@ -471,7 +473,7 @@ EOC
471
473
  when :excon
472
474
  { client_key: @client_key, client_cert: @client_cert, client_key_pass: @client_key_pass, nonblock: @http_backend_excon_nonblock }
473
475
  when :typhoeus
474
- require 'typhoeus'
476
+ require 'faraday/typhoeus'
475
477
  { sslkey: @client_key, sslcert: @client_cert, keypasswd: @client_key_pass }
476
478
  end
477
479
  rescue LoadError => ex
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.2.5
4
+ version: 5.3.0
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-03-27 00:00:00.000000000 Z
13
+ date: 2023-04-11 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: fluentd
@@ -30,16 +30,30 @@ dependencies:
30
30
  name: faraday
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
- - - "~>"
33
+ - - ">="
34
34
  - !ruby/object:Gem::Version
35
- version: '1.10'
35
+ version: 2.0.0
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
- - - "~>"
40
+ - - ">="
41
+ - !ruby/object:Gem::Version
42
+ version: 2.0.0
43
+ - !ruby/object:Gem::Dependency
44
+ name: faraday-excon
45
+ requirement: !ruby/object:Gem::Requirement
46
+ requirements:
47
+ - - ">="
48
+ - !ruby/object:Gem::Version
49
+ version: 2.0.0
50
+ type: :runtime
51
+ prerelease: false
52
+ version_requirements: !ruby/object:Gem::Requirement
53
+ requirements:
54
+ - - ">="
41
55
  - !ruby/object:Gem::Version
42
- version: '1.10'
56
+ version: 2.0.0
43
57
  - !ruby/object:Gem::Dependency
44
58
  name: excon
45
59
  requirement: !ruby/object:Gem::Requirement
@@ -237,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
237
251
  - !ruby/object:Gem::Version
238
252
  version: '0'
239
253
  requirements: []
240
- rubygems_version: 3.1.6
254
+ rubygems_version: 3.3.26
241
255
  signing_key:
242
256
  specification_version: 4
243
257
  summary: Elasticsearch output plugin for Fluent event collector