fluent-plugin-elasticsearch 2.11.7 → 2.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a8adf956e53ac370bbabdb66572a3a61cfe3d27220532ff773ee7cffe53c600
-  data.tar.gz: 57d22aa95d06ca181f0f55a7c2f0be4b19f5050bb01e4cb9bf2df17c7a2c710e
+  metadata.gz: 7a1df6327a4af9049ed3fb5bbb10a153a79a183d1309996f00abcc20d8410108
+  data.tar.gz: 8129c3a35a66eca22611fdaaebe36bb9f4122ff06f3b51e1ae29675125894c88
 SHA512:
-  metadata.gz: 596ba2952540acad16e8c49b60992382c0947c0d834375016560cd29b3d2ae7f29d18fd98006e2bda3dc3c9038d45dcf565084af6161c9abbbdb1d19f7e9ec48
-  data.tar.gz: 903f77f656774e464e0f230f7d18669374965d1a8391307f91a3470df92213a0c545211c9da4ea18a5c40e08d3af04d756c9582e4d36ee5ac61e4e5053ba70ce
+  metadata.gz: 1e1c2f01409ca7f181e75c88c6b1f32d289259504a5cda50e3d99429e952b8364c2957e10aa77e2dc8f8b3c2cf7d832efe5bc88493e6537a1160b39ba1c2d833
+  data.tar.gz: baf563a878fa159061e8232a5b9916b205aa6b9d00b2a5f67d0eb1c306decab30fd7a302e8da5478eb3200c62cf4de52ccf888b7fdda75d5c3bb688a1160de93

data/History.md

@@ -2,6 +2,9 @@
 
 ### [Unreleased]
 
+### 2.11.8
+- Serialize requests with Oj (#464)
+
 ### 2.11.7
 - Add mechanism to detect ES and its client version mismatch (#463)
 

data/README.md

@@ -59,6 +59,7 @@ Current maintainers: @cosmo0920
   + [content_type](#content_type)
   + [include_index_in_url](#include_index_in_url)
   + [http_backend](#http_backend)
+  + [prefer_oj_serializer](#prefer_oj_serializer)
   + [Client/host certificate options](#clienthost-certificate-options)
   + [Proxy Support](#proxy-support)
   + [Buffer options](#buffer-options)
@@ -661,6 +662,18 @@ Default value is `excon` which is default http_backend of elasticsearch plugin.
 http_backend typhoeus
 ```
 
+### prefer_oj_serializer
+
+With default beavior, Elasticsearch client uses `Yajl` as JSON encoder/decoder.
+`Oj` is the alternative high performance JSON encoder/decoder.
+When this parameter sets as `true`, Elasticsearch client uses `Oj` as JSON encoder/decoder.
+
+Default value is `false`.
+
+```
+prefer_oj_serializer 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       = '2.11.7'
+  s.version       = '2.11.8'
   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/oj_serializer.rb

@@ -0,0 +1,22 @@
+require 'oj'
+
+module Fluent::Plugin
+  module Serializer
+
+    class Oj
+      include Elasticsearch::Transport::Transport::Serializer::Base
+
+      # De-serialize a Hash from JSON string
+      #
+      def load(string, options={})
+        ::Oj.load(string, options)
+      end
+
+      # Serialize a Hash to JSON string
+      #
+      def dump(object, options={})
+        ::Oj.dump(object, options)
+      end
+    end
+  end
+end

data/lib/fluent/plugin/out_elasticsearch.rb

@@ -15,6 +15,10 @@ require 'fluent/error'
 require_relative 'elasticsearch_constants'
 require_relative 'elasticsearch_error_handler'
 require_relative 'elasticsearch_index_template'
+begin
+  require_relative 'oj_serializer'
+rescue LoadError
+end
 
 module Fluent::Plugin
   class ElasticsearchOutput < Output
@@ -114,6 +118,7 @@ EOC
     config_param :include_index_in_url, :bool, :default => false
     config_param :http_backend, :enum, list: [:excon, :typhoeus], :default => :excon
     config_param :validate_client_version, :bool, :default => false
+    config_param :prefer_oj_serializer, :bool, :default => false
 
     config_section :buffer do
       config_set_default :@type, DEFAULT_BUFFER_TYPE
@@ -175,9 +180,14 @@ EOC
 
       @meta_config_map = create_meta_config_map
 
+      @serializer_class = nil
       begin
         require 'oj'
         @dump_proc = Oj.method(:dump)
+        if @prefer_oj_serializer
+          @serializer_class = Fluent::Plugin::Serializer::Oj
+          Elasticsearch::API.settings[:serializer] = Fluent::Plugin::Serializer::Oj
+        end
       rescue LoadError
         @dump_proc = Yajl.method(:dump)
       end
@@ -322,6 +332,7 @@ EOC
                                                                                 password: @password
                                                                               },
                                                                               sniffer_class: @sniffer_class,
+                                                                              serializer_class: @serializer_class,
                                                                             }), &adapter_conf)
         es = Elasticsearch::Client.new transport: transport
 

data/test/plugin/test_out_elasticsearch.rb

@@ -212,6 +212,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert_equal :"application/json", instance.content_type
     assert_equal "fluentd", default_type_name
     assert_equal :excon, instance.http_backend
+    assert_false instance.prefer_oj_serializer
   end
 
   test 'configure Content-Type' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.11.7
+  version: 2.11.8
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-01 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -149,6 +149,7 @@ files:
 - lib/fluent/plugin/elasticsearch_index_template.rb
 - lib/fluent/plugin/elasticsearch_simple_sniffer.rb
 - lib/fluent/plugin/filter_elasticsearch_genid.rb
+- lib/fluent/plugin/oj_serializer.rb
 - lib/fluent/plugin/out_elasticsearch.rb
 - lib/fluent/plugin/out_elasticsearch_dynamic.rb
 - test/helper.rb