logstash-output-elasticsearch 6.2.4-java → 6.2.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2ae1de8b2ef04b483cc7ea7d90a9abe2d23493b
-  data.tar.gz: ccbbb21f0a3c56a03f7a4c209d1cdbe80aa8706d
+  metadata.gz: b8d5f7fef1865846b84c49dfe25980784557041b
+  data.tar.gz: 9eb6fee0f2c819cd0a2f6abbb989d67d5d0f0724
 SHA512:
-  metadata.gz: 0b894a22dc7344fa44b9dd8f3a14f3575be12e31c982ef1424f915094bfb69d7378492b17b8bc6357a0b8fce2379a8691b30a6294ce5de7fc2b04ff404f7f217
-  data.tar.gz: a888417183f7851d31b0cfc567bb0c0c0d8285c518224c715cfd82db96d3e4b2c2bf5c1026f49a82d91ba0223a8f4aa4d61acb0f83cff809673db8e461525dea
+  metadata.gz: 53269eaa667f3e7d4c3f3ee21c1f6f33771cb7a046e00a502b7d78d44614078bcde802d104a95ea4af26128383285c0bd74e998e06c2fb40b155c578c9fb835c
+  data.tar.gz: 2d70eaacefd1a827aa56feaccdd77c2c010512fd1b7a646bcad2078b2491f2958f262ea470a36d5370eecc34704f61718fcf8e6c76ccf76f7714e329c5aed331

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 6.2.5
+- Send the Content-Type: application/json header that proper ES clients should send
+
 ## 6.2.4
 - Fix bug where using escaped characters in the password field would attempt to show a warning but instead crash.
   The warning was also not necessary since escaped characters never worked there before.

data/lib/logstash/outputs/elasticsearch/http_client/manticore_adapter.rb

@@ -2,6 +2,8 @@ require 'manticore'
 require 'cgi'
 
 module LogStash; module Outputs; class ElasticSearch; class HttpClient;
+  DEFAULT_HEADERS = { "Content-Type" => "application/json" }
+  
   class ManticoreAdapter
     attr_reader :manticore, :logger
 
@@ -15,7 +17,7 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
       # We definitely don't need cookies
       options[:cookies] = false
 
-      @request_options = options[:headers] ? {:headers => @options[:headers]} : {}
+      @client_params = {:headers => DEFAULT_HEADERS.merge(options[:headers] || {})}
       
       if options[:proxy]
         options[:proxy] = manticore_proxy_hash(options[:proxy])
@@ -45,7 +47,7 @@ module LogStash; module Outputs; class ElasticSearch; class HttpClient;
     # @see    Transport::Base#perform_request
     #
     def perform_request(url, method, path, params={}, body=nil)
-      params = (params || {}).merge @request_options
+      params = (params || {}).merge(@client_params)
       params[:body] = body if body
 
       if url.user

data/logstash-output-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '6.2.4'
+  s.version         = '6.2.5'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/integration/outputs/index_spec.rb

@@ -44,7 +44,7 @@ describe "TARGET_BULK_BYTES", :integration => true do
   end
 end
 
-describe "indexing" do
+describe "indexing", :integration => true do
   let(:event) { LogStash::Event.new("message" => "Hello World!", "type" => type) }
   let(:index) { 10.times.collect { rand(10).to_s }.join("") }
   let(:type) { 10.times.collect { rand(10).to_s }.join("") }
@@ -82,6 +82,13 @@ describe "indexing" do
         expect(doc["_index"]).to eq(index)
       end
     end
+    
+    it "sets the correct content-type header" do
+      expect(subject.client.pool.adapter.client).to receive(:send).
+        with(anything, anything, {:headers => {"Content-Type" => "application/json"}, :body => anything}).
+        and_call_original
+      subject.multi_receive(events)
+    end
   end
 
   describe "an indexer with custom index_type", :integration => true do
@@ -105,7 +112,7 @@ describe "indexing" do
     it_behaves_like("an indexer")
   end
 
-  describe "a secured indexer", :integration => true do
+  describe "a secured indexer", :secure_integration => true do
     let(:user) { "simpleuser" }
     let(:password) { "abc123" }
     let(:cacert) { "spec/fixtures/server.crt" }

data/spec/unit/outputs/elasticsearch/http_client/manticore_adapter_spec.rb

@@ -28,6 +28,7 @@ describe LogStash::Outputs::ElasticSearch::HttpClient::ManticoreAdapter do
       allow(resp).to receive(:code).and_return(200)
       expect(subject.manticore).to receive(:get).
         with(noauth_uri, {
+          :headers => {"Content-Type" => "application/json"},
           :auth => {
             :user => user,
             :password => password,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 6.2.4
+  version: 6.2.5
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-21 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement