logstash-output-timber 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 876397ec04113baadf58af67a3f152ed8b03c3290984e519b98fda3a3d153e64
-  data.tar.gz: a2faf8c5c07eb1cbdae00b572c77b486e386d164d9f9300bd85b34d3af6edefc
+  metadata.gz: 41db80ea8dc6e0c7655f0fcc3c84101be85c8241de366ef07493dedea222b67d
+  data.tar.gz: 1c0c6e41505a4a1b4b090663d29480aee491eceb58dce58c9af5e0c47418817d
 SHA512:
-  metadata.gz: 8353f74f4f7d3802be35d728975bec9085a7704e0978d30efb2841a61f5f4a23d573581b3e19753c001ddbe74ce8c98b9a43e840560a098aa6256d6de4b073b2
-  data.tar.gz: aa31ab11e03084c657de88e951180a7e5354748e7424bb996c5055ac65aed888fa53850bdee136bf6d30a3b17dea80a53fcf0c7a5c8e7d4fa0c6e236dd52aab5
+  metadata.gz: 49fb12cb9a25669e2d270ce7b315222f9a5a5988aa51c826dfc85821ed6b116bff18dcf1740e49c3acf03e910b897bd31cd6b2d62f645d5a1be65f7006d2b3a5
+  data.tar.gz: 58c94bb43555676e76e7d11bedf0df71277c2f47f6832cfa6ec5b2e7610a15270750d7fec0672a6a661bd5cd0f87fb2a6bf33142d626e504ad66cdf430878b5b

data/lib/logstash/outputs/timber.rb

@@ -13,7 +13,7 @@ require "logstash/outputs/timber/http_client"
 class LogStash::Outputs::Timber < LogStash::Outputs::Base
   include HttpClient
 
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
   CONTENT_TYPE = "application/json".freeze
   MAX_ATTEMPTS = 3
   METHOD = :post.freeze
@@ -130,6 +130,8 @@ class LogStash::Outputs::Timber < LogStash::Outputs::Base
     def event_hash(e)
       hash = e.to_hash
       hash.delete("@version")
+      dt = hash.delete("@timestamp")
+      hash["dt"] = dt if !hash.has_key?("dt")
       hash
     end
 

data/logstash-output-timber.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-timber'
-  s.version         = "1.0.1"
+  s.version         = "1.0.2"
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output send events to the Timber.io logging service"
   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/timber_spec.rb

@@ -113,6 +113,22 @@ describe LogStash::Outputs::Timber do
       expect(requests.length).to eq(3)
     end
 
+    it "handles fatal request errors" do
+      allow(output.send(:http_client)).to receive(:post).and_raise("boom")
+
+      output.url = "http://localhost:#{port}/good"
+      result = output.send(:send_events, [event], 1)
+      expect(result).to eq(false)
+    end
+
+    it "handles retryable request errors" do
+      expect(output.send(:http_client)).to receive(:post).exactly(3).times.and_raise(::Manticore::Timeout.new)
+
+      output.url = "http://localhost:#{port}/good"
+      result = output.send(:send_events, [event], 1)
+      expect(result).to eq(false)
+    end
+
     it "returns true when the status is 200" do
       output.url = "http://localhost:#{port}/good"
       result = output.send(:send_events, [event], 1)
@@ -122,30 +138,30 @@ describe LogStash::Outputs::Timber do
       request = requests.first
       expect(request.env["CONTENT_TYPE"]).to eq("application/json")
       expect(request.env["HTTP_AUTHORIZATION"]).to eq("Basic MTIzOmFiY2QxMjM0")
-      expect(request.env["HTTP_USER_AGENT"]).to eq("Timber Logstash/1.0.1")
+      expect(request.env["HTTP_USER_AGENT"]).to eq("Timber Logstash/1.0.2")
 
       parsed_body = JSON.parse!(request.body.read)
       expect(parsed_body.length).to eq(1)
 
       body_event = parsed_body.first
       timestamp_iso8601 = event.get("@timestamp").to_iso8601
-      expect(body_event).to eq({"@timestamp"=>timestamp_iso8601, "message"=>"hi"})
+      expect(body_event).to eq({"dt"=>timestamp_iso8601, "message"=>"hi"})
     end
 
-    it "handles fatal request errors" do
-      allow(output.send(:http_client)).to receive(:post).and_raise("boom")
-
+    it "allows payloads conformed to the timber JSON schema" do
       output.url = "http://localhost:#{port}/good"
+      event = LogStash::Event.new({"$schema" => "https://raw.githubusercontent.com/timberio/log-event-json-schema/v2.4.2/schema.json", "message" => "my message", "context" => {"http" => {"path" => "/path"}}})
       result = output.send(:send_events, [event], 1)
-      expect(result).to eq(false)
-    end
+      expect(result).to eq(true)
+      expect(requests.length).to eq(1)
 
-    it "handles retryable request errors" do
-      expect(output.send(:http_client)).to receive(:post).exactly(3).times.and_raise(::Manticore::Timeout.new)
+      request = requests.first
+      parsed_body = JSON.parse!(request.body.read)
+      expect(parsed_body.length).to eq(1)
 
-      output.url = "http://localhost:#{port}/good"
-      result = output.send(:send_events, [event], 1)
-      expect(result).to eq(false)
+      body_event = parsed_body.first
+      timestamp_iso8601 = event.get("@timestamp").to_iso8601
+      expect(body_event).to eq({"$schema"=>"https://raw.githubusercontent.com/timberio/log-event-json-schema/v2.4.2/schema.json", "context"=>{"http"=>{"path"=>"/path"}}, "message"=>"my message", "dt"=>timestamp_iso8601})
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-timber
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Elastic