fluent-plugin-elasticsearch 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdf35ea1b2e3e85372e0f5af8febdc9920e38090053b7e818d714d32d9df6428
-  data.tar.gz: f43d98b89ee686f14bfe3b544f929cefc2b50d28d064cd9c40a3502aadf0774b
+  metadata.gz: 4ab0dd77a7749e31c5f80959ad351620d448c4127144a321385341e00884e2f1
+  data.tar.gz: '002829c47fa544b91eb9b5727718ac68a2aab7270a4567fdd9f3ca3039b8ff15'
 SHA512:
-  metadata.gz: 8d4b5829f6bfcc13d8e25a60fca57422068a1449376690776dbe6623346ae058226563b215ad4926b97680b632515516309e6d50414d2d030e4d559359ae077a
-  data.tar.gz: 763d3a4838093c99d92a2b4f3382335ff95ddd4e20d0c4a2378a42b3cb830a4c6654501662920035f9299a28e492372d5671792f0098f9f9e4566035d24533af
+  metadata.gz: 3630b2cf30675a1b0e397ba06d7f005c392dad90144e417d828373ed666d0fddff85167b7bfa57f37c1d1089b7d25b69fefdd9a8cf74068d01018dae17393a07
+  data.tar.gz: 196015f384b95ab35c73d4ddeaa2766a92242fd750a9d3432370317102cfbf4e756e7c181910f93cc39742cf8574e265b90720b458395cf576121464e8081b8b

data/History.md

@@ -4,6 +4,9 @@
 - Log ES response errors (#230)
 - Use latest elasticsearch-ruby (#240)
 
+### 2.8.1
+- Restore default value of type name #(377)
+
 ### 2.8.0
 - Remove outdated generating hash id support module (#373)
 - Check Elasticsearch major version (#371)

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.8.0'
+  s.version       = '2.8.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

@@ -24,7 +24,8 @@ module Fluent::Plugin
 
     DEFAULT_BUFFER_TYPE = "memory"
     DEFAULT_ELASTICSEARCH_VERSION = 5 # For compatibility.
-    DEFAULT_TYPE_NAME = "_doc".freeze
+    DEFAULT_TYPE_NAME_ES_7x = "_doc".freeze
+    DEFAULT_TYPE_NAME = "fluentd".freeze
 
     config_param :host, :string,  :default => 'localhost'
     config_param :port, :integer, :default => 9200
@@ -156,7 +157,10 @@ EOC
       end
 
       @last_seen_major_version = detect_es_major_version rescue DEFAULT_ELASTICSEARCH_VERSION
-      if @last_seen_major_version >= 7 && @type_name != DEFAULT_TYPE_NAME
+      if @last_seen_major_version == 6 && @type_name != DEFAULT_TYPE_NAME_ES_7x
+        log.info "Detected ES 6.x: ES 7.x will only accept `_doc` in type_name."
+      end
+      if @last_seen_major_version >= 7 && @type_name != DEFAULT_TYPE_NAME_ES_7x
         log.warn "Detected ES 7.x or above: `_doc` will be used as the document `_type`."
         @type_name = '_doc'.freeze
       end
@@ -427,7 +431,7 @@ EOC
             target_type = '_doc'.freeze
           end
         else
-          if @last_seen_major_version >= 7 && target_type != DEFAULT_TYPE_NAME
+          if @last_seen_major_version >= 7 && target_type != DEFAULT_TYPE_NAME_ES_7x
             log.warn "Detected ES 7.x or above: `_doc` will be used as the document `_type`."
             target_type = '_doc'.freeze
           else

data/test/plugin/test_out_elasticsearch.rb

@@ -37,6 +37,10 @@ class ElasticsearchOutput < Test::Unit::TestCase
     }.configure(conf)
   end
 
+  def default_type_name
+    Fluent::Plugin::ElasticsearchOutput::DEFAULT_TYPE_NAME
+  end
+
   def sample_record
     {'age' => 26, 'request_id' => '42', 'parent_id' => 'parent', 'routing_id' => 'routing'}
   end
@@ -220,6 +224,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert_nil instance.client_key_pass
     assert_false instance.with_transporter_log
     assert_equal :"application/x-ndjson", instance.content_type
+    assert_equal "fluentd", default_type_name
   end
 
   test 'configure Content-Type' do
@@ -665,7 +670,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
-    assert_equal('_doc', index_cmds.first['index']['_type'])
+    assert_equal(default_type_name, index_cmds.first['index']['_type'])
   end
 
   def test_writes_to_speficied_index
@@ -843,7 +848,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
 
   data("old"           => {"es_version" => 2, "_type" => "local-override"},
        "old_behavior"  => {"es_version" => 5, "_type" => "local-override"},
-       "border"        => {"es_version" => 6, "_type" => "_doc"},
+       "border"        => {"es_version" => 6, "_type" => "fluentd"},
        "fixed_behavior"=> {"es_version" => 7, "_type" => "_doc"},
       )
   def test_writes_to_target_type_key(data)
@@ -865,7 +870,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
-    assert_equal('_doc', index_cmds.first['index']['_type'])
+    assert_equal(default_type_name, index_cmds.first['index']['_type'])
   end
 
   def test_writes_to_target_type_key_fallack_to_type_name
@@ -881,7 +886,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
 
   data("old"           => {"es_version" => 2, "_type" => "local-override"},
        "old_behavior"  => {"es_version" => 5, "_type" => "local-override"},
-       "border"        => {"es_version" => 6, "_type" => "_doc"},
+       "border"        => {"es_version" => 6, "_type" => "fluentd"},
        "fixed_behavior"=> {"es_version" => 7, "_type" => "_doc"},
       )
   def test_writes_to_target_type_key_nested(data)
@@ -910,7 +915,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
         }
       }))
     end
-    assert_equal('_doc', index_cmds.first['index']['_type'])
+    assert_equal(default_type_name, index_cmds.first['index']['_type'])
   end
 
   def test_writes_to_speficied_host

data/test/plugin/test_out_elasticsearch_dynamic.rb

@@ -34,6 +34,10 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     }.configure(conf)
   end
 
+  def default_type_name
+    Fluent::Plugin::ElasticsearchOutput::DEFAULT_TYPE_NAME
+  end
+
   def sample_record
     {'age' => 26, 'request_id' => '42', 'parent_id' => 'parent', 'routing_id' => 'routing'}
   end
@@ -275,7 +279,7 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end
-    assert_equal('_doc', index_cmds.first['index']['_type'])
+    assert_equal(default_type_name, index_cmds.first['index']['_type'])
   end
 
   def test_writes_to_specified_index

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd