fluent-plugin-elasticsearch 1.13.0 → 1.13.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/History.md +3 -0
- data/README.md +12 -0
- data/fluent-plugin-elasticsearch.gemspec +1 -1
- data/lib/fluent/plugin/out_elasticsearch.rb +9 -0
- data/lib/fluent/plugin/out_elasticsearch_dynamic.rb +1 -0
- data/test/plugin/test_out_elasticsearch.rb +1 -0
- data/test/plugin/test_out_elasticsearch_dynamic.rb +1 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c7a72b5f18408cf9b8725a94d3bb4d17f67c6bcf
|
|
4
|
+
data.tar.gz: d38af83c56c759fafdb8d712c45561f0eab69815
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4eaa3a19fb9e0a4c7752d7fbc45420e203ab079fb7fb1d8326e4b7165c6c6bece2e87e82c0e67ef7f48303550514e5517a570da2aa797e17c437b986b6d041c3
|
|
7
|
+
data.tar.gz: acb23ca717a7421f031b0ed2f4588daa92f195355d91a7a902c783f974ef93997420d69b4ea3c05082cb7be065dc61e7c285d04a46e04f259ca97835a0213819
|
data/History.md
CHANGED
|
@@ -4,6 +4,9 @@
|
|
|
4
4
|
- Log ES response errors (#230)
|
|
5
5
|
- Use latest elasticsearch-ruby (#240)
|
|
6
6
|
|
|
7
|
+
### 1.13.1
|
|
8
|
+
- backport adding config parameter to enable elasticsearch-ruby's transporter logging (#343)
|
|
9
|
+
|
|
7
10
|
### 1.13.0
|
|
8
11
|
- Backport allowing to overwrite existing index template (#336)
|
|
9
12
|
|
data/README.md
CHANGED
|
@@ -48,6 +48,7 @@ Note: For Amazon Elasticsearch Service please consider using [fluent-plugin-aws-
|
|
|
48
48
|
+ [write_operation](#write_operation)
|
|
49
49
|
+ [time_parse_error_tag](#time_parse_error_tag)
|
|
50
50
|
+ [reconnect_on_error](#reconnect_on_error)
|
|
51
|
+
+ [with_transporter_log](#with_transporter_log)
|
|
51
52
|
+ [Client/host certificate options](#clienthost-certificate-options)
|
|
52
53
|
+ [Proxy Support](#proxy-support)
|
|
53
54
|
+ [Buffered output options](#buffered-output-options)
|
|
@@ -468,6 +469,17 @@ We recommended to set this true in the presence of elasticsearch shield.
|
|
|
468
469
|
reconnect_on_error true # defaults to false
|
|
469
470
|
```
|
|
470
471
|
|
|
472
|
+
### with_transporter_log
|
|
473
|
+
|
|
474
|
+
This is debugging purpose option to enable to obtain transporter layer log.
|
|
475
|
+
Default value is `false` for backward compatibility.
|
|
476
|
+
|
|
477
|
+
We recommend to set this true if you start to debug this plugin.
|
|
478
|
+
|
|
479
|
+
```
|
|
480
|
+
with_transporter_log true
|
|
481
|
+
```
|
|
482
|
+
|
|
471
483
|
### Client/host certificate options
|
|
472
484
|
|
|
473
485
|
Need to verify ElasticSearch's certificate? You can use the following parameter to specify a CA instead of using an environment variable.
|
|
@@ -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 = '1.13.
|
|
6
|
+
s.version = '1.13.1'
|
|
7
7
|
s.authors = ['diogo', 'pitr']
|
|
8
8
|
s.email = ['pitr.vern@gmail.com', 'me@diogoterror.com']
|
|
9
9
|
s.description = %q{ElasticSearch output plugin for Fluent event collector}
|
|
@@ -69,6 +69,7 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
|
|
|
69
69
|
config_param :time_parse_error_tag, :string, :default => 'Fluent::ElasticsearchOutput::TimeParser.error'
|
|
70
70
|
config_param :reconnect_on_error, :bool, :default => false
|
|
71
71
|
config_param :pipeline, :string, :default => nil
|
|
72
|
+
config_param :with_transporter_log, :bool, :default => false
|
|
72
73
|
|
|
73
74
|
include Fluent::ElasticsearchIndexTemplate
|
|
74
75
|
include Fluent::GenerateHashIdSupport
|
|
@@ -123,6 +124,13 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
|
|
|
123
124
|
if @hash_config
|
|
124
125
|
raise Fluent::ConfigError, "@hash_config.hash_id_key and id_key must be equal." unless @hash_config.hash_id_key == @id_key
|
|
125
126
|
end
|
|
127
|
+
|
|
128
|
+
@transport_logger = nil
|
|
129
|
+
if @with_transporter_log
|
|
130
|
+
@transport_logger = log
|
|
131
|
+
log_level = conf['@log_level'] || conf['log_level']
|
|
132
|
+
log.warn "Consider to specify log_level with @log_level." unless log_level
|
|
133
|
+
end
|
|
126
134
|
end
|
|
127
135
|
|
|
128
136
|
def create_meta_config_map
|
|
@@ -171,6 +179,7 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
|
|
|
171
179
|
reload_on_failure: @reload_on_failure,
|
|
172
180
|
resurrect_after: @resurrect_after,
|
|
173
181
|
retry_on_failure: 5,
|
|
182
|
+
logger: @transport_logger,
|
|
174
183
|
transport_options: {
|
|
175
184
|
headers: { 'Content-Type' => 'application/json' },
|
|
176
185
|
request: { timeout: @request_timeout },
|
|
@@ -49,6 +49,7 @@ class Fluent::ElasticsearchOutputDynamic < Fluent::ElasticsearchOutput
|
|
|
49
49
|
reload_on_failure: @reload_on_failure,
|
|
50
50
|
resurrect_after: @resurrect_after,
|
|
51
51
|
retry_on_failure: 5,
|
|
52
|
+
logger: @transport_logger,
|
|
52
53
|
transport_options: {
|
|
53
54
|
headers: { 'Content-Type' => 'application/json' },
|
|
54
55
|
request: { timeout: @request_timeout },
|
|
@@ -202,6 +202,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
|
|
|
202
202
|
assert_nil instance.client_key
|
|
203
203
|
assert_nil instance.client_cert
|
|
204
204
|
assert_nil instance.client_key_pass
|
|
205
|
+
assert_false instance.with_transporter_log
|
|
205
206
|
end
|
|
206
207
|
|
|
207
208
|
def test_configure_with_invaild_generate_id_config
|
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: 1.13.
|
|
4
|
+
version: 1.13.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- diogo
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2017-
|
|
12
|
+
date: 2017-12-20 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: fluentd
|