fluent-plugin-elasticsearch 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ab0dd77a7749e31c5f80959ad351620d448c4127144a321385341e00884e2f1
-  data.tar.gz: '002829c47fa544b91eb9b5727718ac68a2aab7270a4567fdd9f3ca3039b8ff15'
+  metadata.gz: 3be91761453634986640e4148217110f7959d27514bc5cd045421cd445b848ce
+  data.tar.gz: 9101e94faa8f5d499e7a9a2ab9ab7b5b7d4aeeb6b8f5dc8271f2173e7542fba5
 SHA512:
-  metadata.gz: 3630b2cf30675a1b0e397ba06d7f005c392dad90144e417d828373ed666d0fddff85167b7bfa57f37c1d1089b7d25b69fefdd9a8cf74068d01018dae17393a07
-  data.tar.gz: 196015f384b95ab35c73d4ddeaa2766a92242fd750a9d3432370317102cfbf4e756e7c181910f93cc39742cf8574e265b90720b458395cf576121464e8081b8b
+  metadata.gz: 8aceb999e49cee7de7d48a47169fd3735d27438970d30f15ecae1e6969c9a633bbff16f2c8082a228170ecd80b4d25b7ea74be334c98eccb8dbda32352e607d6
+  data.tar.gz: 51b5fbd6f169cb484340d08727b7627f553dfefa906f1b7e8c2eed42b322f04a271539695331b76661a35a30cc0423a943ff5d49ecaa1e73de1ea234a4bdb804

data/History.md

@@ -4,6 +4,9 @@
 - Log ES response errors (#230)
 - Use latest elasticsearch-ruby (#240)
 
+### 2.8.2
+- Revert content type header default value (#383)
+
 ### 2.8.1
 - Restore default value of type name #(377)
 

data/ISSUE_TEMPLATE.md

@@ -22,3 +22,4 @@ Provide example config and message
 * ES plugin 2.x.y or 1.x.y
   * paste boot log of fluentd or td-agent
   * paste result of ``fluent-gem list``, ``td-agent-gem list`` or your Gemfile.lock
+* ES version (optional)

data/README.md

@@ -573,12 +573,13 @@ with_transporter_log true
 
 ### content_type
 
-With `content_type application/json`, elasticsearch plugin adds `application/json` as `Content-Type` in payload.
+With `content_type application/x-ndjson`, elasticsearch plugin adds `application/x-ndjson` as `Content-Type` in payload.
 
-Default value is `application/x-ndjson` which is encourage to use Elasticsearch bulk request.
+Default value is `application/json` which is default Content-Type of Elasticsearch requests.
+If you will not use template, it recommends to set `content_type application/x-ndjson`.
 
 ```
-content_type application/json
+content_type application/x-ndjson
 ```
 
 ### Client/host certificate options

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

@@ -80,7 +80,7 @@ EOC
     config_param :reconnect_on_error, :bool, :default => false
     config_param :pipeline, :string, :default => nil
     config_param :with_transporter_log, :bool, :default => false
-    config_param :content_type, :enum, list: [:"application/json", :"application/x-ndjson"], :default => :"application/x-ndjson"
+    config_param :content_type, :enum, list: [:"application/json", :"application/x-ndjson"], :default => :"application/json"
 
     config_section :buffer do
       config_set_default :@type, DEFAULT_BUFFER_TYPE

data/test/plugin/test_out_elasticsearch.rb

@@ -223,16 +223,16 @@ class ElasticsearchOutput < Test::Unit::TestCase
     assert_nil instance.client_cert
     assert_nil instance.client_key_pass
     assert_false instance.with_transporter_log
-    assert_equal :"application/x-ndjson", instance.content_type
+    assert_equal :"application/json", instance.content_type
     assert_equal "fluentd", default_type_name
   end
 
   test 'configure Content-Type' do
     config = %{
-      content_type application/json
+      content_type application/x-ndjson
     }
     instance = driver(config).instance
-    assert_equal :"application/json", instance.content_type
+    assert_equal :"application/x-ndjson", instance.content_type
   end
 
   test 'invalid Content-Type' do
@@ -648,7 +648,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
     stub_request(:head, "http://localhost:9200/").
       to_return(:status => 200, :body => "", :headers => {})
     elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
-      with(headers: { "Content-Type" => "application/x-ndjson" })
+      with(headers: { "Content-Type" => "application/json" })
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end

data/test/plugin/test_out_elasticsearch_dynamic.rb

@@ -96,15 +96,15 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     assert_nil instance.client_cert
     assert_nil instance.client_key_pass
     assert_false instance.with_transporter_log
-    assert_equal :"application/x-ndjson", instance.content_type
+    assert_equal :"application/json", instance.content_type
   end
 
   test 'configure Content-Type' do
     config = %{
-      content_type application/json
+      content_type application/x-ndjson
     }
     instance = driver(config).instance
-    assert_equal :"application/json", instance.content_type
+    assert_equal :"application/x-ndjson", instance.content_type
   end
 
   test 'invalid Content-Type' do
@@ -257,7 +257,7 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     stub_request(:head, "http://localhost:9200/").
       to_return(:status => 200, :body => "", :headers => {})
     elastic_request = stub_request(:post, "http://localhost:9200/_bulk").
-      with(headers: { "Content-Type" => "application/x-ndjson" })
+      with(headers: { "Content-Type" => "application/json" })
     driver.run(default_tag: 'test') do
       driver.feed(sample_record)
     end

metadata

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