logstash-output-http 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb4ed46a005d9af73da085335c1f1f516cd54f1b
-  data.tar.gz: ea8ded7326eef70f098bbcab8e910d9e3cfe7b2a
+  metadata.gz: 96be92dd03ba701e5c21af44559f567fe9e9d00e
+  data.tar.gz: eee63a9d3a744b0e298116cf5842b6efa60ab5a4
 SHA512:
-  metadata.gz: 7c7e3a3e18f434a3d575f280cd5f8f6502833338a270519facf6d6f9115f78e033df68bcbfb6d050fcda56230a914cab22f61a1c06854203af51ce8d54e3dc03
-  data.tar.gz: 7e8b34fc4f8872a4754bc2868d48dbd57e7db5bee7006bfc2f6d6be116457e36a6d50edcb7a8fd8a3fb8747b7e2c0b022a387c8642f599e44bcc621dbf878a16
+  metadata.gz: 259ba5e8cd221de83656a1c04a3c032cfd93de96930cc1a7e9ff80a014356bb180e28e47a5c8dfeae3decc5bc59c2e29f391e49561834903f98405f14e21cfeb
+  data.tar.gz: 3a33c97b68551e0a335bdac609de359124027314cc6350d5ebbef6537d508f9a8f91ebea06b261316d7c9110d89acba2d659b89e22e3ec52546ef8657fd5450b

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.1.0
+ - Allow nested field definitions in `mappings`
+
 ## 4.0.0
  - Major overhaul of internals, adds new retry options
  - Allow users to specify non-standard response codes as ignorable

data/lib/logstash/outputs/http.rb

@@ -66,7 +66,7 @@ class LogStash::Outputs::Http < LogStash::Outputs::Base
   #
   # For example:
   # [source,ruby]
-  #    mapping => {"foo" => "%{host}" 
+  #    mapping => {"foo" => "%{host}"
   #               "bar" => "%{type}"}
   config :mapping, :validate => :hash
 
@@ -305,11 +305,27 @@ class LogStash::Outputs::Http < LogStash::Outputs::Base
     end
   end
 
+  def reduce_hash(hash, event)
+    hash.reduce({}) do |acc, kv|
+      k, v = kv
+      if v.is_a?(Hash)
+        acc[k] = reduce_hash(v, event)
+      else
+        acc[k] = event.sprintf(v)
+      end
+      acc
+    end
+  end
+
   def map_event(event)
     if @mapping
       @mapping.reduce({}) do |acc,kv|
         k,v = kv
-        acc[k] = event.sprintf(v)
+        if v.is_a?(Hash)
+          acc[k] = reduce_hash(v, event)
+        else
+          acc[k] = event.sprintf(v)
+        end
         acc
       end
     else

data/logstash-output-http.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-http'
-  s.version         = '4.0.0'
+  s.version         = '4.1.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output lets you `PUT` or `POST` events to a generic HTTP(S) endpoint"
   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/outputs/http_spec.rb

@@ -102,7 +102,9 @@ describe LogStash::Outputs::Http do
   # Requires pool_max to be 1
 
   let(:port) { PORT }
-  let(:event) { LogStash::Event.new("message" => "hi") }
+  let(:event) {
+    LogStash::Event.new({"message" => "hi"})
+  }
   let(:url) { "http://localhost:#{port}/good" }
   let(:method) { "post" }
 
@@ -225,7 +227,9 @@ describe LogStash::Outputs::Http do
 
   describe "integration tests" do
     let(:url) { "http://localhost:#{port}/good" }
-    let(:event) { LogStash::Event.new("foo" => "bar", "baz" => "bot")}
+    let(:event) {
+      LogStash::Event.new("foo" => "bar", "baz" => "bot", "user" => "McBest")
+    }
 
     subject { LogStash::Outputs::Http.new(config) }
 
@@ -265,12 +269,39 @@ describe LogStash::Outputs::Http do
 
     describe "sending a mapped event" do
       let(:config) {
-        {"url" => url, "http_method" => "post", "pool_max" => 1, "mapping" => {"blah" => "X %{foo}"}}
+        {"url" => url, "http_method" => "post", "pool_max" => 1, "mapping" => {"blah" => "X %{foo}"} }
       }
       let(:expected_body) { LogStash::Json.dump("blah" => "X #{event.get("foo")}") }
       let(:expected_content_type) { "application/json" }
 
       include_examples("a received event")
     end
+
+    describe "sending a mapped, nested event" do
+      let(:config) {
+        {
+          "url" => url,
+          "http_method" => "post",
+          "pool_max" => 1,
+          "mapping" => {
+            "host" => "X %{foo}",
+            "event" => {
+              "user" => "Y %{user}"
+            }
+          }
+        }
+      }
+      let(:expected_body) {
+        LogStash::Json.dump({
+          "host" => "X #{event.get("foo")}",
+          "event" => {
+            "user" => "Y #{event.get("user")}"
+          }
+        })
+      }
+      let(:expected_content_type) { "application/json" }
+
+      include_examples("a received event")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-http
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Elastic