fluent-plugin-elasticsearch 1.18.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e6b46f67805b944adff6414e59f57c384cb02d7609440773ef3ee412bd8cb46
-  data.tar.gz: c808857aae2e8566e88c211b3e03b69a7979fca4e09de569be972ba6f3210d5e
+  metadata.gz: f4e4ff948915da51a4c267d0350157b841c6b3f09862571d9777072d60d5c337
+  data.tar.gz: dde99b5bd72bfadad60013689d8109b5776beb6ae942d65fad1ad8777df1ecb0
 SHA512:
-  metadata.gz: be3a97d063b6ddbe4f4fa6cb267e7453341a31a678b8385c197ad25e5eb92dad0503ab92db0a0bdda00b41522944dfd50f11666943f5af3f76044551d423a137
-  data.tar.gz: f2ae3e1a47fc1567aa82fa79127717b53b5765b97d71cfb02564d76671ee9376ef8626c9e4bae7c8a65d68c114ecbe5436e6902d52630658dcb4ca9e08ff3396
+  metadata.gz: 13d604ed0ac1822333b5464efe34fd7f943b9c1151cbd2bf60c40356b028bab9164c6c66d26dd515c182d19a3f95f4b18e504d118212bf86be647b3681bd5659
+  data.tar.gz: d90733254d79a977a12adc64a47f01315acfe391c3841f82c055be6aef20b1c209dd6e0d86620a581efd1b8b5f90b433fb6fb640126cda122b427802fc1beec3

data/History.md

@@ -2,6 +2,9 @@
 
 ### [Unreleased]
 
+### 1.18.1
+- add new option to suppress doc wrapping (porting to v0.12) (#558)
+
 ### 1.18.0
 - Avoid NoMethodError on unknown Elasticsearch error responses (#487)
 

data/README.md

@@ -60,6 +60,7 @@ Note: For Amazon Elasticsearch Service please consider using [fluent-plugin-aws-
   + [reload_after](#reload_after)
   + [Not seeing a config you need?](#not-seeing-a-config-you-need)
   + [Dynamic configuration](#dynamic-configuration)
+  + [suppress_doc_wrap](#suppress_doc_wrap)
 * [Contact](#contact)
 * [Contributing](#contributing)
 * [Running tests](#running-tests)
@@ -638,6 +639,12 @@ If you want configurations to depend on information in messages, you can use `el
 
 **Please note, this uses Ruby's `eval` for every message, so there are performance and security implications.**
 
+### suppress_doc_wrap
+
+By default, record body is wrapped by 'doc'. This behavior can not handle update script requests. You can set this to suppress doc wrapping and allow record body to be untouched.
+
+Default value is `false`.
+
 ## Contact
 
 If you have a question, [open an Issue](https://github.com/uken/fluent-plugin-elasticsearch/issues).

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.18.0'
+  s.version       = '1.18.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

@@ -90,6 +90,7 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
   config_param :emit_error_for_missing_id, :bool, :default => false
   config_param :sniffer_class_name, :string, :default => nil
   config_param :reload_after, :integer, :default => DEFAULT_RELOAD_AFTER
+  config_param :suppress_doc_wrap, :bool, :default => false
 
   include Fluent::ElasticsearchIndexTemplate
   include Fluent::ElasticsearchConstants
@@ -322,6 +323,9 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
 
   def update_body(record, op)
     update = remove_keys(record)
+    if @suppress_doc_wrap
+      return update
+    end
     body = {"doc".freeze => update}
     if op == UPSERT_OP
       if update == record

data/test/plugin/test_out_elasticsearch.rb

@@ -1732,4 +1732,63 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert_logs_include(log.out.logs, /In Fluent::ElasticsearchSimpleSniffer hosts/, 2)
   end
 
+  def test_suppress_doc_wrap
+    driver.configure('write_operation update
+                      id_key id
+                      remove_keys id
+                      suppress_doc_wrap true')
+    stub_elastic_ping
+    stub_elastic
+    doc_body = {'field' => 'value'}
+    doc_record = {'id' => 1, 'doc' => doc_body}
+    script_body = {'source' => 'ctx._source.counter += params.param1',
+                   'lang' => 'painless',
+                   'params' => {'param1' => 1}}
+    upsert_body = {'counter' => 1}
+    script_record = {'id' => 2, 'script' => script_body, 'upsert' => upsert_body}
+    driver.emit(doc_record, 1)
+    driver.emit(script_record, 2)
+    driver.run
+    assert(
+      index_cmds[1] == {'doc' => doc_body}
+    )
+    assert(
+      index_cmds[3] == {
+        'script' => script_body,
+        'upsert' => upsert_body
+      }
+    )
+  end
+
+  def test_suppress_doc_wrap_should_handle_record_as_is_at_upsert
+    driver.configure('write_operation upsert
+                      id_key id
+                      remove_keys id
+                      suppress_doc_wrap true')
+    stub_elastic_ping
+    stub_elastic
+    doc_body = {'field' => 'value'}
+    doc_record = {'id' => 1, 'doc' => doc_body, 'doc_as_upsert' => true}
+    script_body = {'source' => 'ctx._source.counter += params.param1',
+                   'lang' => 'painless',
+                   'params' => {'param1' => 1}}
+    upsert_body = {'counter' => 1}
+    script_record = {'id' => 2, 'script' => script_body, 'upsert' => upsert_body}
+    driver.emit(doc_record, 1)
+    driver.emit(script_record, 2)
+    driver.run
+    assert(
+      index_cmds[1] == {
+        'doc' => doc_body,
+        'doc_as_upsert' => true
+      }
+    )
+    assert(
+      index_cmds[3] == {
+        'script' => script_body,
+        'upsert' => upsert_body
+      }
+    )
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.1
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -176,8 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Elasticsearch output plugin for Fluent event collector