logstash-output-timber 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bf83aa2d2c4239a019db421f39fe16b87f0ede8613a6126b9d8ce7aa17742f9
-  data.tar.gz: 29ab8df17494515feec2301af889b2ec5d277564ae2594ce03f965dc4413d8ba
+  metadata.gz: 876397ec04113baadf58af67a3f152ed8b03c3290984e519b98fda3a3d153e64
+  data.tar.gz: a2faf8c5c07eb1cbdae00b572c77b486e386d164d9f9300bd85b34d3af6edefc
 SHA512:
-  metadata.gz: 02b47b2a374880b263f0fbbb733b363785ade764cee499e226eda5ccc4b66b163b9bea50f5ff741d439962ea30ba6e1b3700a5ff64113d9006a231f974ac6f68
-  data.tar.gz: 74d986e655bddaf3d3008221fb01abb7c1c82ea272c3289ea303d651e739e13298c740a5cd747ed2949bd95058ade00bd9938f9900d0c30f02a4b2a022825bcf
+  metadata.gz: 8353f74f4f7d3802be35d728975bec9085a7704e0978d30efb2841a61f5f4a23d573581b3e19753c001ddbe74ce8c98b9a43e840560a098aa6256d6de4b073b2
+  data.tar.gz: aa31ab11e03084c657de88e951180a7e5354748e7424bb996c5055ac65aed888fa53850bdee136bf6d30a3b17dea80a53fcf0c7a5c8e7d4fa0c6e236dd52aab5

data/CHANGELOG.md

@@ -1,66 +1,5 @@
-## 4.3.3
- - Docs: Add plugin description.
+## 1.0.1
+ - Drop the @version field since it is not useful to external systems
 
-## 4.3.2
- - Docs: Update plugin title.
-
-## 4.3.1
- - Fix deadlock that could occur in certain situations. All users should upgrade to the latest version.
-   This deadlock was caused by certain async HTTP APIs being called out of order thus creating a race.
-
-## 4.3.0
- - Add `user` and `password` options to support HTTP basic auth
- 
-## 4.2.0
- - Allow nested array in field definition, See https://github.com/logstash-plugins/logstash-output-http/pull/53
-
-## 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
- - Set concurrency level to shared allowing for greater efficiency across threads
- 
-## 3.1.1
-  - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
-
-## 3.1.0
- - breaking,config: Remove deprecated config 'verify_ssl'. Please use 'ssl_certificate_validation'.
-
-## 3.0.1
- - Republish all the gems under jruby.
-
-## 3.0.0
- - Update the plugin to the version 2.0 of the plugin api, this change is required for Logstash 5.0 compatibility. See https://github.com/elastic/logstash/issues/5141
-
-## 2.1.3
- - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
-
-## 2.1.2
- - New dependency requirements for logstash-core for the 5.0 release
-
-## 2.1.1
- - Require http_client mixin with better keepalive handling
-
-
-## 2.1.0
- - Properly close the client on #close
- - Optimized execution for Logstash 2.2 ng pipeline
-
-## 2.0.5
- - fixed memory leak
-
-## 2.0.3
- - fixed potential race condition on async callbacks
- - silenced specs equest logs and other spec robustness fixes
-
-## 2.0.0
- - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully,
-   instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
- - Dependency on logstash-core update to 2.0
-
-## 1.1.0
- - Concurrent execution
- - Add many HTTP options via the http_client mixin
- - Switch to manticore as HTTP Client
+## 1.0.0
+ - Initial release

data/README.md

@@ -1,6 +1,6 @@
 # Logstash Plugin
 
-[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-output-http.svg)](https://travis-ci.org/logstash-plugins/logstash-output-http)
+[![Travis Build Status](https://travis-ci.org/timberio/logstash-output-timber.svg)](https://travis-ci.org/timberio/logstash-output-timber)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
@@ -74,7 +74,7 @@ You can use the same **2.1** method to run your plugin in an installed Logstash
 
 - Build your plugin gem
 ```sh
-gem build logstash-output-http.gemspec
+gem build logstash-output-timber.gemspec
 ```
 - Install the plugin from the Logstash home
 ```sh

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.0".freeze
+  VERSION = "1.0.1".freeze
   CONTENT_TYPE = "application/json".freeze
   MAX_ATTEMPTS = 3
   METHOD = :post.freeze
@@ -79,7 +79,7 @@ class LogStash::Outputs::Timber < LogStash::Outputs::Base
 
       response =
         begin
-          hash_events = events.collect(&:to_hash)
+          hash_events = events.collect { |e| event_hash(e) }
           body = LogStash::Json.dump(hash_events)
           http_client.post(@url, :body => body, :headers => @headers)
         rescue Exception => e
@@ -127,6 +127,12 @@ class LogStash::Outputs::Timber < LogStash::Outputs::Base
       end
     end
 
+    def event_hash(e)
+      hash = e.to_hash
+      hash.delete("@version")
+      hash
+    end
+
     def retryable_exception?(e)
       RETRYABLE_MANTICORE_EXCEPTIONS.any? do |exception_class|
         e.is_a?(exception_class)

data/logstash-output-timber.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-timber'
-  s.version         = "1.0.0"
+  s.version         = "1.0.1"
   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

@@ -1,7 +1,9 @@
+require "json"
+require "thread"
+
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/outputs/timber"
 require "logstash/codecs/plain"
-require "thread"
 require "sinatra"
 
 PORT = rand(65535-1024) + 1025
@@ -120,10 +122,14 @@ 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.0")
+      expect(request.env["HTTP_USER_AGENT"]).to eq("Timber Logstash/1.0.1")
+
+      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(request.body.read).to eq("[{\"@timestamp\":\"#{timestamp_iso8601}\",\"@version\":\"1\",\"message\":\"hi\"}]")
+      expect(body_event).to eq({"@timestamp"=>timestamp_iso8601, "message"=>"hi"})
     end
 
     it "handles fatal request errors" do

metadata

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