fluent-plugin-elasticsearch 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 922b71db0e33341c9be81d522da1fe51db43346195104d3c5cb9eedc8146ade8
-  data.tar.gz: 855510d16b2e6999a8d8884c9f4c64c41974fef91d0c2e57410d393335d50396
+  metadata.gz: 73279ef661fbc0c7d8f5539b8e8524e7fce1ade17ae44e2f0ca96bd49fd047d8
+  data.tar.gz: b9b5fd6396f87231a9b430fa194da647f221083ec292cd5fa3092a5f76f57655
 SHA512:
-  metadata.gz: fd43e39d0e436923a5146b0841546f59b0e36c9a6a9f06a41e9ac80d71faf24fbebc87f88721c1da199d38869c42fcc0b8862aa852688d945015fd550bb9244b
-  data.tar.gz: 3fcad730cb9ecbe8713f9361e50b42ca985834cc60e62d42a4c551f69c02ef5131bd073d9940814bff266c83470cbee9dfcbb528a99f585cddea86c391886609
+  metadata.gz: 7893520f2758d4c256c33c4656db6b5afb4125ff55bb18277f5edb7cee8a9cd14b7e9705f005a5c4ce6574b51548bee239cd261036f2aa3cb1f0eff24104cb65
+  data.tar.gz: 281ea7247a4d3b6ccf35a47698f632bc91fcac7f51a5b16fdb3b4a3e75a96bd518807de1c018b905e0d6cf353fe56973a06d04483f39c2decf80c67ac320429d

data/.travis.yml

@@ -4,11 +4,15 @@ rvm:
   - 2.1
   - 2.2
   - 2.3
-  - 2.4.4
-  - 2.5.1
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
 
 gemfile:
  - Gemfile
 
+before_install:
+  - gem update --system=2.7.8
+
 script: bundle exec rake test
 sudo: false

data/History.md

@@ -1,6 +1,12 @@
 ## Changelog [[tags]](https://github.com/uken/fluent-plugin-elasticsearch/tags)
 
 ### [Unreleased]
+
+### 3.0.2
+-  appveyor: Remove Ruby 2.1 CI targets on AppVeyor (#524)
+- Follow removal of _routing field change on recent Elasticsearch (#523)
+- Travis: Tweak to use Ruby versions (#522)
+
 ### 3.0.1
 - Remove needless Elasticsearch version detection (#520)
 

data/appveyor.yml

@@ -25,11 +25,6 @@ environment:
       devkit: C:\Ruby23-x64\DevKit
     - ruby_version: "22-x64"
       devkit: C:\Ruby23-x64\DevKit
-    - ruby_version: "21-x64"
-      devkit: C:\Ruby23-x64\DevKit
-    - ruby_version: "21"
-      devkit: C:\Ruby23\DevKit
-      WIN_RAPID: true
 matrix:
   allow_failures:
     - ruby_version: "21"

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       = '3.0.1'
+  s.version       = '3.0.2'
   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

@@ -268,6 +268,8 @@ EOC
       if @buffer_config.flush_thread_count < 2
         log.warn "To prevent events traffic jam, you should specify 2 or more 'flush_thread_count'."
       end
+
+      @routing_key_name = configure_routing_key_name
     end
 
     def backend_options
@@ -291,6 +293,14 @@ EOC
       Elasticsearch::VERSION
     end
 
+    def configure_routing_key_name
+      if @last_seen_major_version >= 7
+        'routing'
+      else
+        '_routing'
+      end
+    end
+
     def convert_compat_id_key(key)
       if key.include?('.') && !key.start_with?('$[')
         key = "$.#{key}" unless key.start_with?('$.')
@@ -302,7 +312,7 @@ EOC
       result = []
       result << [record_accessor_create(@id_key), '_id'] if @id_key
       result << [record_accessor_create(@parent_key), '_parent'] if @parent_key
-      result << [record_accessor_create(@routing_key), '_routing'] if @routing_key
+      result << [record_accessor_create(@routing_key), @routing_key_name] if @routing_key
       result
     end
 

data/lib/fluent/plugin/out_elasticsearch_dynamic.rb

@@ -32,7 +32,7 @@ module Fluent::Plugin
     end
 
     def create_meta_config_map
-      {'id_key' => '_id', 'parent_key' => '_parent', 'routing_key' => '_routing'}
+      {'id_key' => '_id', 'parent_key' => '_parent', 'routing_key' => @routing_key_name}
     end
 
 

data/test/plugin/test_out_elasticsearch.rb

@@ -1764,13 +1764,24 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert(!index_cmds[0]['index'].has_key?('_parent'))
   end
 
-  def test_adds_routing_key_when_configured
-    driver.configure("routing_key routing_id\n")
-    stub_elastic
-    driver.run(default_tag: 'test') do
-      driver.feed(sample_record)
+  class AddsRoutingKeyWhenConfiguredTest < self
+    def test_es6
+      driver('', 6).configure("routing_key routing_id\n")
+      stub_elastic
+      driver.run(default_tag: 'test') do
+        driver.feed(sample_record)
+      end
+      assert_equal(index_cmds[0]['index']['_routing'], 'routing')
+    end
+
+    def test_es7
+      driver('', 7).configure("routing_key routing_id\n")
+      stub_elastic
+      driver.run(default_tag: 'test') do
+        driver.feed(sample_record)
+      end
+      assert_equal(index_cmds[0]['index']['routing'], 'routing')
     end
-    assert_equal(index_cmds[0]['index']['_routing'], 'routing')
   end
 
   class NestedRoutingKeyTest < self

data/test/plugin/test_out_elasticsearch_dynamic.rb

@@ -735,13 +735,24 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     assert(!index_cmds[0]['index'].has_key?('_parent'))
   end
 
-  def test_adds_routing_key_when_configured
-    driver.configure("routing_key routing_id\n")
-    stub_elastic
-    driver.run(default_tag: 'test') do
-      driver.feed(sample_record)
+  class AddsRoutingKeyWhenConfiguredTest < self
+    def test_es6
+      driver('', 6).configure("routing_key routing_id\n")
+      stub_elastic
+      driver.run(default_tag: 'test') do
+        driver.feed(sample_record)
+      end
+      assert_equal(index_cmds[0]['index']['_routing'], 'routing')
+    end
+
+    def test_es7
+      driver('', 7).configure("routing_key routing_id\n")
+      stub_elastic
+      driver.run(default_tag: 'test') do
+        driver.feed(sample_record)
+      end
+      assert_equal(index_cmds[0]['index']['routing'], 'routing')
     end
-    assert_equal(index_cmds[0]['index']['_routing'], 'routing')
   end
 
   class NestedRoutingKeyTest < self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-26 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd