fluent-plugin-opensearch 1.0.9 → 1.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/coverage.yaml +2 -2
- data/.github/workflows/linux.yml +1 -1
- data/.github/workflows/macos.yml +1 -1
- data/.github/workflows/windows.yml +1 -1
- data/History.md +10 -0
- data/README.OpenSearchInput.md +1 -1
- data/README.md +2 -0
- data/fluent-plugin-opensearch.gemspec +5 -5
- data/lib/fluent/plugin/in_opensearch.rb +1 -0
- data/lib/fluent/plugin/opensearch_index_template.rb +2 -2
- data/lib/fluent/plugin/out_opensearch.rb +2 -1
- metadata +33 -19
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ecc83833c1b081c2c7a43eb518ec339c2fe2b1c3153ea424d02b046bfd26129c
|
4
|
+
data.tar.gz: '09443e78f21f9e3a064c0fdc0faea5d20d2b67ce85f8f187cef5322382a827e5'
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fa530480b103bacbe4e00bc0bff3d3aca549acb126fc2251affa80267e24391bd929f9c9a903906c83807cdddc880a6a53b6470ec944fcaaecd73943bcb3560a
|
7
|
+
data.tar.gz: bc8a40ae17f566b1176edf1f163e8df740df72c19f99fce220dcc0a88cc1c857bfd5b1014f201f5261328eee234d3eb24a2421cc7b882e6c1b047e7e660fb4f3
|
data/.github/workflows/linux.yml
CHANGED
data/.github/workflows/macos.yml
CHANGED
data/History.md
CHANGED
@@ -2,6 +2,16 @@
|
|
2
2
|
|
3
3
|
### [Unreleased]
|
4
4
|
|
5
|
+
### 1.1.0
|
6
|
+
- Unpin `faraday` from v1, upgrade to v2.
|
7
|
+
Note that if you can't migrate other plugins from `faraday` v1 yet, need to keep
|
8
|
+
fluent-plugin-opensearch v1.0.10.
|
9
|
+
|
10
|
+
### 1.0.10
|
11
|
+
- Replace File.exists? with File.exist? to work with Ruby 3.2 (#93)
|
12
|
+
- Add a constraint for dependent gem to stay on Faraday v1 (#90)
|
13
|
+
- README.md: Fix a link to opensearch-ruby (#85)
|
14
|
+
|
5
15
|
### 1.0.9
|
6
16
|
- Adjust GitHub workflows (#89)
|
7
17
|
- out\_opensearch: Provide service_name choices for handling serverless (#88)
|
data/README.OpenSearchInput.md
CHANGED
@@ -68,7 +68,7 @@ hosts host1:port1,host2:port2,host3:port3
|
|
68
68
|
|
69
69
|
You can specify multiple OpenSearch hosts with separator ",".
|
70
70
|
|
71
|
-
If you specify multiple hosts, this plugin will load balance updates to OpenSearch. This is an [opensearch-ruby](https://github.com/opensearch/opensearch-ruby) feature, the default strategy is round-robin.
|
71
|
+
If you specify multiple hosts, this plugin will load balance updates to OpenSearch. This is an [opensearch-ruby](https://github.com/opensearch-project/opensearch-ruby) feature, the default strategy is round-robin.
|
72
72
|
|
73
73
|
If you specify `hosts` option, `host` and `port` options are ignored.
|
74
74
|
|
data/README.md
CHANGED
@@ -111,6 +111,8 @@ Send your logs to OpenSearch (and search them with OpenSearch Dashboards maybe?)
|
|
111
111
|
|:----------------------------:|:-----------:|:------:|
|
112
112
|
| >= 1.0.0 | >= v1.x | >= 2.4 |
|
113
113
|
|
114
|
+
NOTE: Since fluent-plugin-opensearch 1.1.0, it requires faraday 2.0 or later.
|
115
|
+
|
114
116
|
NOTE: This documentation is for fluent-plugin-opensearch 1.x or later.
|
115
117
|
|
116
118
|
## Installation
|
@@ -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-opensearch'
|
6
|
-
s.version = '1.0
|
6
|
+
s.version = '1.1.0'
|
7
7
|
s.authors = ['Hiroshi Hatake']
|
8
8
|
s.email = ['cosmo0920.wp@gmail.com']
|
9
9
|
s.description = %q{Opensearch output plugin for Fluent event collector}
|
@@ -23,12 +23,12 @@ 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 'excon', '>= 0'
|
27
26
|
s.add_runtime_dependency 'opensearch-ruby'
|
28
27
|
s.add_runtime_dependency "aws-sdk-core", "~> 3"
|
29
|
-
s.add_runtime_dependency
|
30
|
-
s.add_runtime_dependency
|
31
|
-
|
28
|
+
s.add_runtime_dependency 'excon', '>= 0'
|
29
|
+
s.add_runtime_dependency 'faraday', '>= 2.0.0'
|
30
|
+
s.add_runtime_dependency 'faraday-excon', '>= 2.0.0'
|
31
|
+
s.add_runtime_dependency "faraday_middleware-aws-sigv4", "~> 1.0.1"
|
32
32
|
|
33
33
|
s.add_development_dependency 'rake', '>= 0'
|
34
34
|
s.add_development_dependency 'webrick', '~> 1.7.0'
|
@@ -29,7 +29,7 @@ require_relative './opensearch_error'
|
|
29
29
|
|
30
30
|
module Fluent::OpenSearchIndexTemplate
|
31
31
|
def get_template(template_file)
|
32
|
-
if !File.
|
32
|
+
if !File.exist?(template_file)
|
33
33
|
raise "If you specify a template_name you must specify a valid template file (checked '#{template_file}')!"
|
34
34
|
end
|
35
35
|
file_contents = IO.read(template_file).gsub(/\n/,'')
|
@@ -37,7 +37,7 @@ module Fluent::OpenSearchIndexTemplate
|
|
37
37
|
end
|
38
38
|
|
39
39
|
def get_custom_template(template_file, customize_template)
|
40
|
-
if !File.
|
40
|
+
if !File.exist?(template_file)
|
41
41
|
raise "If you specify a template_name you must specify a valid template file (checked '#{template_file}')!"
|
42
42
|
end
|
43
43
|
file_contents = IO.read(template_file).gsub(/\n/,'')
|
@@ -56,6 +56,7 @@ rescue LoadError
|
|
56
56
|
end
|
57
57
|
require 'aws-sdk-core'
|
58
58
|
require 'faraday_middleware/aws_sigv4'
|
59
|
+
require 'faraday/excon'
|
59
60
|
|
60
61
|
module Fluent::Plugin
|
61
62
|
class OpenSearchOutput < Output
|
@@ -509,7 +510,7 @@ module Fluent::Plugin
|
|
509
510
|
when :excon
|
510
511
|
{ client_key: @client_key, client_cert: @client_cert, client_key_pass: @client_key_pass, nonblock: @http_backend_excon_nonblock }
|
511
512
|
when :typhoeus
|
512
|
-
require 'typhoeus'
|
513
|
+
require 'faraday/typhoeus'
|
513
514
|
{ sslkey: @client_key, sslcert: @client_cert, keypasswd: @client_key_pass }
|
514
515
|
end
|
515
516
|
rescue LoadError => ex
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fluent-plugin-opensearch
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0
|
4
|
+
version: 1.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Hiroshi Hatake
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2023-04-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: fluentd
|
@@ -25,7 +25,7 @@ dependencies:
|
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: 0.14.22
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
|
-
name:
|
28
|
+
name: opensearch-ruby
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - ">="
|
@@ -39,7 +39,21 @@ dependencies:
|
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: '0'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
|
-
name:
|
42
|
+
name: aws-sdk-core
|
43
|
+
requirement: !ruby/object:Gem::Requirement
|
44
|
+
requirements:
|
45
|
+
- - "~>"
|
46
|
+
- !ruby/object:Gem::Version
|
47
|
+
version: '3'
|
48
|
+
type: :runtime
|
49
|
+
prerelease: false
|
50
|
+
version_requirements: !ruby/object:Gem::Requirement
|
51
|
+
requirements:
|
52
|
+
- - "~>"
|
53
|
+
- !ruby/object:Gem::Version
|
54
|
+
version: '3'
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
name: excon
|
43
57
|
requirement: !ruby/object:Gem::Requirement
|
44
58
|
requirements:
|
45
59
|
- - ">="
|
@@ -53,47 +67,47 @@ dependencies:
|
|
53
67
|
- !ruby/object:Gem::Version
|
54
68
|
version: '0'
|
55
69
|
- !ruby/object:Gem::Dependency
|
56
|
-
name:
|
70
|
+
name: faraday
|
57
71
|
requirement: !ruby/object:Gem::Requirement
|
58
72
|
requirements:
|
59
|
-
- - "
|
73
|
+
- - ">="
|
60
74
|
- !ruby/object:Gem::Version
|
61
|
-
version:
|
75
|
+
version: 2.0.0
|
62
76
|
type: :runtime
|
63
77
|
prerelease: false
|
64
78
|
version_requirements: !ruby/object:Gem::Requirement
|
65
79
|
requirements:
|
66
|
-
- - "
|
80
|
+
- - ">="
|
67
81
|
- !ruby/object:Gem::Version
|
68
|
-
version:
|
82
|
+
version: 2.0.0
|
69
83
|
- !ruby/object:Gem::Dependency
|
70
|
-
name: faraday
|
84
|
+
name: faraday-excon
|
71
85
|
requirement: !ruby/object:Gem::Requirement
|
72
86
|
requirements:
|
73
|
-
- - "
|
87
|
+
- - ">="
|
74
88
|
- !ruby/object:Gem::Version
|
75
|
-
version:
|
89
|
+
version: 2.0.0
|
76
90
|
type: :runtime
|
77
91
|
prerelease: false
|
78
92
|
version_requirements: !ruby/object:Gem::Requirement
|
79
93
|
requirements:
|
80
|
-
- - "
|
94
|
+
- - ">="
|
81
95
|
- !ruby/object:Gem::Version
|
82
|
-
version:
|
96
|
+
version: 2.0.0
|
83
97
|
- !ruby/object:Gem::Dependency
|
84
98
|
name: faraday_middleware-aws-sigv4
|
85
99
|
requirement: !ruby/object:Gem::Requirement
|
86
100
|
requirements:
|
87
|
-
- - "
|
101
|
+
- - "~>"
|
88
102
|
- !ruby/object:Gem::Version
|
89
|
-
version:
|
103
|
+
version: 1.0.1
|
90
104
|
type: :runtime
|
91
105
|
prerelease: false
|
92
106
|
version_requirements: !ruby/object:Gem::Requirement
|
93
107
|
requirements:
|
94
|
-
- - "
|
108
|
+
- - "~>"
|
95
109
|
- !ruby/object:Gem::Version
|
96
|
-
version:
|
110
|
+
version: 1.0.1
|
97
111
|
- !ruby/object:Gem::Dependency
|
98
112
|
name: rake
|
99
113
|
requirement: !ruby/object:Gem::Requirement
|
@@ -256,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
256
270
|
- !ruby/object:Gem::Version
|
257
271
|
version: '0'
|
258
272
|
requirements: []
|
259
|
-
rubygems_version: 3.
|
273
|
+
rubygems_version: 3.3.26
|
260
274
|
signing_key:
|
261
275
|
specification_version: 4
|
262
276
|
summary: Opensearch output plugin for Fluent event collector
|