changing depracted api in ES6

Author: ibinyami

lib/logstash/outputs/elasticsearch/common.rb

@@ -43,7 +43,7 @@ def event_action_tuple(event)
         :_id => @document_id ? event.sprintf(@document_id) : nil,
         :_index => event.sprintf(@index),
         :_type => get_event_type(event),
-        :_routing => @routing ? event.sprintf(@routing) : nil
+        :routing => @routing ? event.sprintf(@routing) : nil
       }
 
       if @pipeline
@@ -55,7 +55,7 @@ def event_action_tuple(event)
           join_value = event.get(@join_field)
           parent_value = event.sprintf(@parent)
           event.set(@join_field, { "name" => join_value, "parent" => parent_value })
-          params[:_routing] = event.sprintf(@parent)
+          params[:routing] = event.sprintf(@parent)
         else
           params[:parent] = event.sprintf(@parent)
         end
@@ -64,7 +64,7 @@ def event_action_tuple(event)
       if action == 'update'
         params[:_upsert] = LogStash::Json.load(event.sprintf(@upsert)) if @upsert != ""
         params[:_script] = event.sprintf(@script) if @script != ""
-        params[:_retry_on_conflict] = @retry_on_conflict
+        params[:retry_on_conflict] = @retry_on_conflict
       end
 
       if @version

spec/integration/outputs/retry_spec.rb

@@ -4,9 +4,9 @@
 describe "failures in bulk class expected behavior", :integration => true do
   let(:template) { '{"template" : "not important, will be updated by :index"}' }
   let(:event1) { LogStash::Event.new("somevalue" => 100, "@timestamp" => "2014-11-17T20:37:17.223Z", "@metadata" => {"retry_count" => 0}) }
-  let(:action1) { ["index", {:_id=>nil, :_routing=>nil, :_index=>"logstash-2014.11.17", :_type=>"doc"}, event1] }
+  let(:action1) { ["index", {:_id=>nil, :routing=>nil, :_index=>"logstash-2014.11.17", :_type=>"doc"}, event1] }
   let(:event2) { LogStash::Event.new("geoip" => { "location" => [ 0.0, 0.0] }, "@timestamp" => "2014-11-17T20:37:17.223Z", "@metadata" => {"retry_count" => 0}) }
-  let(:action2) { ["index", {:_id=>nil, :_routing=>nil, :_index=>"logstash-2014.11.17", :_type=>"doc"}, event2] }
+  let(:action2) { ["index", {:_id=>nil, :routing=>nil, :_index=>"logstash-2014.11.17", :_type=>"doc"}, event2] }
   let(:invalid_event) { LogStash::Event.new("geoip" => { "location" => "notlatlon" }, "@timestamp" => "2014-11-17T20:37:17.223Z") }
 
   def mock_actions_with_response(*resp)

spec/unit/outputs/elasticsearch_spec.rb

@@ -355,7 +355,7 @@
 
       it "should not set the retry_on_conflict parameter when creating an event_action_tuple" do
         action, params, event_data = subject.event_action_tuple(event)
-        expect(params).not_to include({:_retry_on_conflict => num_retries})
+        expect(params).not_to include({:retry_on_conflict => num_retries})
       end
     end
 
@@ -364,7 +364,7 @@
 
       it "should set the retry_on_conflict parameter when creating an event_action_tuple" do
         action, params, event_data = subject.event_action_tuple(event)
-        expect(params).to include({:_retry_on_conflict => num_retries})
+        expect(params).to include({:retry_on_conflict => num_retries})
       end
     end
 
@@ -373,7 +373,7 @@
 
       it "should set the retry_on_conflict parameter when creating an event_action_tuple" do
         action, params, event_data = subject.event_action_tuple(event)
-        expect(params).to include({:_retry_on_conflict => num_retries})
+        expect(params).to include({:retry_on_conflict => num_retries})
         expect(action).to eq("update")
       end
     end

spec/unit/outputs/error_whitelist_spec.rb

@@ -4,7 +4,7 @@
 describe "whitelisting error types in expected behavior" do
   let(:template) { '{"template" : "not important, will be updated by :index"}' }
   let(:event1) { LogStash::Event.new("somevalue" => 100, "@timestamp" => "2014-11-17T20:37:17.223Z") }
-  let(:action1) { ["index", {:_id=>1, :_routing=>nil, :_index=>"logstash-2014.11.17", :_type=>"doc"}, event1] }
+  let(:action1) { ["index", {:_id=>1, :routing=>nil, :_index=>"logstash-2014.11.17", :_type=>"doc"}, event1] }
   let(:settings) { {"manage_template" => true, "index" => "logstash-2014.11.17", "template_overwrite" => true, "hosts" => get_host_port() } }
 
   subject { LogStash::Outputs::ElasticSearch.new(settings) }