fluent-plugin-elasticsearch 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d8cd27ced7ebf6f0c8d1a2026032b683af8eadd
-  data.tar.gz: 98591a5682b51f4ca97fb206620cec059c57ca74
+  metadata.gz: 101b819a34a206c64e8829e72793158b8f5e448e
+  data.tar.gz: ffc95b8b3649186630a722e15dbe77f70ce7efa6
 SHA512:
-  metadata.gz: c9291c5f41c33732d5dc467e6171446670c1deca8ec79d2c01085e1aeda17bec50206573cede541766a0a6ddce2a566c7d8cc5d2531a410173b2ea07ad98c11e
-  data.tar.gz: c7c9c6badfddfd12190837ad504355d2758195c7318fef04b21ce67a0c6a051157a4b89aed074559f9f2696f7af9fc408d2f27ab07db0ae8c6e63214beee64bc
+  metadata.gz: caf081c1c9dcbf623bba5e649333b8e6790d9700c2931c0964cf8a0711f346d45355454a2d2e675d0e415252e77d76311a997d6e1cfbe64ab5290644c2d85dd6
+  data.tar.gz: e137b0dc4de293528fe907f60e06007ff51ac860ea0cf040974a246f799ea7e6e582a49ba6c2f804b0dacf2ad4784d9ba0a387185d4010cbc1c469990ceb1583

data/History.md

@@ -4,6 +4,10 @@
 - Log ES response errors (#230)
 - Use latest elasticsearch-ruby (#240)
 
+### 1.11.1
+- Raise ConfigError when specifying different @hash_config.hash_id_key and id_key configration (#326)
+- backport small typo fix in README.md (#328)
+
 ### 1.11.0
 - backport adding bulk errors handling (#324)
 

data/README.md

@@ -522,8 +522,9 @@ Here is a sample config:
 
 ```
 <hash>
-  hash_id_key _id    # storing generated hash id key
-<hash>
+  hash_id_key _hash    # storing generated hash id key
+</hash>
+id_key _hash # specify same key name which is specified in hash_id_key
 ```
 
 ### Not seeing a config you need?

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.11.0'
+  s.version       = '1.11.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/generate_hash_id_support.rb

@@ -6,7 +6,7 @@ module Fluent
     def self.included(klass)
       klass.instance_eval {
         config_section :hash, param_name: :hash_config, required: false, multi: false do
-          config_param :hash_id_key, :string, default: '_id'
+          config_param :hash_id_key, :string, default: '_hash'
         end
       }
     end

data/lib/fluent/plugin/out_elasticsearch.rb

@@ -118,6 +118,10 @@ class Fluent::ElasticsearchOutput < Fluent::ObjectBufferedOutput
     if @password && m = @password.match(/%{(?<password>.*)}/)
       @password = URI.encode_www_form_component(m["password"])
     end
+
+    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
   end
 
   def create_meta_config_map

data/test/plugin/test_out_elasticsearch.rb

@@ -204,6 +204,21 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert_nil instance.client_key_pass
   end
 
+  def test_configure_with_invaild_generate_id_config
+    assert_raise(Fluent::ConfigError) {
+      driver.configure(Fluent::Config::Element.new(
+                         'ROOT', '', {
+                           '@type' => 'elasticsearch',
+                           'id_key' =>'id_mismatch',
+                         }, [
+                           Fluent::Config::Element.new('hash', '', {
+                                                         'hash_id_key' => '_hash',
+                                                       }, [])
+                         ]
+                       ))
+    }
+  end
+
   def test_template_already_present
     config = %{
       host            logs.google.com

metadata

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