fluent-plugin-elasticsearch 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0d19458ba42dc0503bcbc2d1d5d83f58f125ba5
-  data.tar.gz: c3ca62e3b1801ed4b507ce61efca73a662836445
+  metadata.gz: c7a72b5f18408cf9b8725a94d3bb4d17f67c6bcf
+  data.tar.gz: d38af83c56c759fafdb8d712c45561f0eab69815
 SHA512:
-  metadata.gz: e919bbe4e67ed88809331b3b1e2c5db6c4f57e03b48bfc0df97edc2980bbf6f0a076e61749acc8f19e9f7ba415836d4d506789a41dc475d5b91d85ee6878b68f
-  data.tar.gz: f4ee41cb99098a2de2a3a98a90b1ebd3977d28dfa9b7c7c52127e1446c73c6dc7b2839489d972d067bfdefde9f1658b11abead46fcaab4efa16c48f10ff6e81b
+  metadata.gz: 4eaa3a19fb9e0a4c7752d7fbc45420e203ab079fb7fb1d8326e4b7165c6c6bece2e87e82c0e67ef7f48303550514e5517a570da2aa797e17c437b986b6d041c3
+  data.tar.gz: acb23ca717a7421f031b0ed2f4588daa92f195355d91a7a902c783f974ef93997420d69b4ea3c05082cb7be065dc61e7c285d04a46e04f259ca97835a0213819

data/History.md

@@ -4,6 +4,9 @@
 - Log ES response errors (#230)
 - Use latest elasticsearch-ruby (#240)
 
+### 1.13.1
+- backport adding config parameter to enable elasticsearch-ruby's transporter logging (#343)
+
 ### 1.13.0
 - Backport allowing to overwrite existing index template (#336)
 

data/README.md

@@ -48,6 +48,7 @@ Note: For Amazon Elasticsearch Service please consider using [fluent-plugin-aws-
   + [write_operation](#write_operation)
   + [time_parse_error_tag](#time_parse_error_tag)
   + [reconnect_on_error](#reconnect_on_error)
+  + [with_transporter_log](#with_transporter_log)
   + [Client/host certificate options](#clienthost-certificate-options)
   + [Proxy Support](#proxy-support)
   + [Buffered output options](#buffered-output-options)
@@ -468,6 +469,17 @@ We recommended to set this true in the presence of elasticsearch shield.
 reconnect_on_error true # defaults to false
 ```
 
+### with_transporter_log
+
+This is debugging purpose option to enable to obtain transporter layer log.
+Default value is `false` for backward compatibility.
+
+We recommend to set this true if you start to debug this plugin.
+
+```
+with_transporter_log true
+```
+
 ### Client/host certificate options
 
 Need to verify ElasticSearch's certificate?  You can use the following parameter to specify a CA instead of using an environment variable.

data/fluent-plugin-elasticsearch.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-elasticsearch'
-  s.version       = '1.13.0'
+  s.version       = '1.13.1'
   s.authors       = ['diogo', 'pitr']
   s.email         = ['pitr.vern@gmail.com', 'me@diogoterror.com']
   s.description   = %q{ElasticSearch output plugin for Fluent event collector}

data/lib/fluent/plugin/out_elasticsearch.rb

@@ -69,6 +69,7 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
   config_param :time_parse_error_tag, :string, :default => 'Fluent::ElasticsearchOutput::TimeParser.error'
   config_param :reconnect_on_error, :bool, :default => false
   config_param :pipeline, :string, :default => nil
+  config_param :with_transporter_log, :bool, :default => false
 
   include Fluent::ElasticsearchIndexTemplate
   include Fluent::GenerateHashIdSupport
@@ -123,6 +124,13 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
     if @hash_config
       raise Fluent::ConfigError, "@hash_config.hash_id_key and id_key must be equal." unless @hash_config.hash_id_key == @id_key
     end
+
+    @transport_logger = nil
+    if @with_transporter_log
+      @transport_logger = log
+      log_level = conf['@log_level'] || conf['log_level']
+      log.warn "Consider to specify log_level with @log_level." unless log_level
+    end
   end
 
   def create_meta_config_map
@@ -171,6 +179,7 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
                                                                             reload_on_failure: @reload_on_failure,
                                                                             resurrect_after: @resurrect_after,
                                                                             retry_on_failure: 5,
+                                                                            logger: @transport_logger,
                                                                             transport_options: {
                                                                               headers: { 'Content-Type' => 'application/json' },
                                                                               request: { timeout: @request_timeout },

data/lib/fluent/plugin/out_elasticsearch_dynamic.rb

@@ -49,6 +49,7 @@ class Fluent::ElasticsearchOutputDynamic < Fluent::ElasticsearchOutput
                                                                             reload_on_failure: @reload_on_failure,
                                                                             resurrect_after: @resurrect_after,
                                                                             retry_on_failure: 5,
+                                                                            logger: @transport_logger,
                                                                             transport_options: {
                                                                               headers: { 'Content-Type' => 'application/json' },
                                                                               request: { timeout: @request_timeout },

data/test/plugin/test_out_elasticsearch.rb

@@ -202,6 +202,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert_nil instance.client_key
     assert_nil instance.client_cert
     assert_nil instance.client_key_pass
+    assert_false instance.with_transporter_log
   end
 
   def test_configure_with_invaild_generate_id_config

data/test/plugin/test_out_elasticsearch_dynamic.rb

@@ -75,6 +75,7 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     assert_nil instance.client_key
     assert_nil instance.client_cert
     assert_nil instance.client_key_pass
+    assert_false instance.with_transporter_log
   end
 
   def test_defaults

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd