allow changing the default target field for host and headers data

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.0
+  - adds `request_headers_target_field` and `remote_host_target_field` configuration options with defaults to `host` and `headers` respectively
+
 ## 3.0.6
   - Fix some documentation issues
 

docs/index.asciidoc

@@ -128,6 +128,22 @@ The TCP port to bind to
 
 specify a custom set of response headers
 
+[id="plugins-{type}s-{plugin}-remote_host_target_field"]
+===== `remote_host_target_field` 
+
+  * Value type is <<string,string>>
+  * Default value is `"host"`
+
+specify a target field for the client host of the http request
+
+[id="plugins-{type}s-{plugin}-request_headers_target_field"]
+===== `request_headers_target_field` 
+
+  * Value type is <<string,string>>
+  * Default value is `"headers"`
+
+specify target field for the client host of the http request
+
 [id="plugins-{type}s-{plugin}-ssl"]
 ===== `ssl` 
 

lib/logstash/inputs/http.rb

@@ -88,6 +88,12 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
   # specify a custom set of response headers
   config :response_headers, :validate => :hash, :default => { 'Content-Type' => 'text/plain' }
 
+  # target field for the client host of the http request
+  config :remote_host_target_field, :validate => :string, :default => "host"
+
+  # target field for the client host of the http request
+  config :request_headers_target_field, :validate => :string, :default => "headers"
+
   # useless headers puma adds to the requests
   # mostly due to rack compliance
   REJECTED_HEADERS = ["puma.socket", "rack.hijack?", "rack.hijack", "rack.url_scheme", "rack.after_reply", "rack.version", "rack.errors", "rack.multithread", "rack.multiprocess", "rack.run_once", "SCRIPT_NAME", "QUERY_STRING", "SERVER_PROTOCOL", "SERVER_SOFTWARE", "GATEWAY_INTERFACE"]
@@ -138,8 +144,8 @@ def run(queue)
         req = lowercase_keys(req)
         body = req.delete("rack.input")
         @codecs.fetch(req["content_type"], @codec).decode(body.read) do |event|
-          event.set("host", remote_host)
-          event.set("headers", req)
+          event.set(@remote_host_target_field, remote_host)
+          event.set(@request_headers_target_field, req)
           decorate(event)
           queue << event
         end

logstash-input-http.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-http'
-  s.version         = '3.0.6'
+  s.version         = '3.1.0'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Logstash Input plugin that receives HTTP requests"
   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"

spec/inputs/http_spec.rb

@@ -25,19 +25,60 @@
   end
 
   describe "request handling" do
-    subject { LogStash::Inputs::Http.new }
+    subject { LogStash::Inputs::Http.new(config) }
+
     before :each do
       subject.register
       t = Thread.new { subject.run(queue) }
       sleep 0.01 until subject.instance_variable_get(:@server).running == 0
     end
 
-    it "should include remote host in \"host\" property" do
-      agent.post!("http://localhost:8080/meh.json",
-                  :headers => { "content-type" => "text/plain" },
-                  :body => "hello")
-      event = queue.pop
-      expect(event.get("host")).to eq("127.0.0.1")
+    describe "remote host" do
+      context "by default" do
+        let(:config) { {} }
+        it "is written to the \"host\" field" do
+          agent.post!("http://localhost:8080/meh.json",
+                      :headers => { "content-type" => "text/plain" },
+                      :body => "hello")
+          event = queue.pop
+          expect(event.get("host")).to eq("127.0.0.1")
+        end
+      end
+      context "when using remote_host_target_field" do
+        let(:config) { { "remote_host_target_field" => "remote_host" } }
+        it "is written to the value of \"remote_host_target_field\" property" do
+          agent.post!("http://localhost:8080/meh.json",
+                      :headers => { "content-type" => "text/plain" },
+                      :body => "hello")
+          event = queue.pop
+          expect(event.get("remote_host")).to eq("127.0.0.1")
+        end
+      end
+    end
+
+    describe "request headers" do
+      context "by default" do
+        let(:config) { {} }
+        it "are written to the \"headers\" field" do
+          agent.post!("http://localhost:8080/meh.json",
+                      :headers => { "content-type" => "text/plain" },
+                      :body => "hello")
+          event = queue.pop
+          expect(event.get("headers")).to be_a(Hash)
+          expect(event.get("headers")).to include("request_method" => "POST")
+        end
+      end
+      context "when using request_headers_target_field" do
+        let(:config) { { "request_headers_target_field" => "request_headers" } }
+        it "are written to the field set in \"request_headers_target_field\"" do
+          agent.post!("http://localhost:8080/meh.json",
+                      :headers => { "content-type" => "text/plain" },
+                      :body => "hello")
+          event = queue.pop
+          expect(event.get("request_headers")).to be_a(Hash)
+          expect(event.get("request_headers")).to include("request_method" => "POST")
+        end
+      end
     end
 
     context "with default codec" do