fluent-plugin-elasticsearch 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16f9f3e664e714be9d1e7fee4b3f8a1683ec9728
-  data.tar.gz: beb9fa49cb58739036a3f2c1cda6ee936fbd873d
+  metadata.gz: 97d1627c0193a5dce42c5154bc62c1609e18dd9e
+  data.tar.gz: e37519936763de220cc909f3bcb77b6cb97ce7b5
 SHA512:
-  metadata.gz: 8527ebae2dbdb312cc6ed32af668077f9560b74db612a4f5d381f758e4e9cb4aa6230a6859a4a72c3f2b944b1fbf07292a49804cd4648a81392259938f133bab
-  data.tar.gz: 887830c553b5ed0350bf64aba4f38d24c28c557fad5493c3ae5f350049269737645e93addfac89b0c252898d07cc127707a9d35f23470ea45cd35f5df48839e0
+  metadata.gz: 918c75ef1df3f9bbbe40c83db330c22618fcddfadcdffd6d02a73a6dc647939899fc3d2f4a3c4b553e16e9cb6fe64d2814b43d064a85d89412a893eecca5f5f1
+  data.tar.gz: 13e526c7723c3db9889549a57c808591ee2793f981be0dcf0ffa375828bbe33ff59d790df60da8e38499b7d59885821c0672621cf51456030329bf5ab3f48b89

data/History.md

@@ -4,6 +4,10 @@
 - Log ES response errors (#230)
 - Use latest elasticsearch-ruby (#240)
 
+### 2.1.1
+- Raise ConfigError when specifying different @hash_config.hash_id_key and id_key configration (#327)
+- Small typo fix in README.md (#325)
+
 ### 2.1.0
 - Retry on certain errors from Elasticsearch (#322)
 

data/README.md

@@ -563,7 +563,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       = '2.1.0'
+  s.version       = '2.1.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

@@ -7,7 +7,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

@@ -134,6 +134,10 @@ module Fluent::Plugin
       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

@@ -227,6 +227,21 @@ class ElasticsearchOutput < Test::Unit::TestCase
     end
   end
 
+  test 'with invaild generate id config' do
+    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: 2.1.0
+  version: 2.1.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