logstash-output-loggly 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 988b81e7c80ed9063c3968da5954a960b9ecfcc224b4cce7c7bf728f0e448fae
-  data.tar.gz: 66ba1480f37747cddf0e45c01b211338549bdc868fb2551708c52dbd539aec5c
+  metadata.gz: 7e0cec0e9971901b8db8203aab5425054757e7aa55419b011168fcae88917930
+  data.tar.gz: f0c58f28c958a39190a380e0e311b2f8267b755084f5ec72f0602b25988e0ebe
 SHA512:
-  metadata.gz: ddcbc5937add05fca7b5ee677e91c3ec856dadb8edd4fb26af5b449601841d836bd96b5857a629822ce4cdcd878df4b31193a71125f6fce0cb02658c67c04b76
-  data.tar.gz: c2782d76d4dbf3005faaffb7268c2c62293f21ef9d43198abae761f8be739d82359c7183ceb2c83a630b86cc5bd23414831ae533a922afd8231b8e0bda710866
+  metadata.gz: 9eb9897a67cbf461400c899e4674bb1cc4bb8b8230021152c3ec778c570241f466640704ffdf1d1b27c9b683c0eaf7fe8d21350aea793f7bd9283e15c40d05ff
+  data.tar.gz: bbb3ec8a63196e7f2091b2eb03fa16b2717a7b85a771cf742ffeac304ff8d3fca98c8cdf514f9e58c27c177f40c280d39db2f6f9db687debfdcc2715df7552ab

data/CHANGELOG.md

@@ -1,5 +1,14 @@
+## 3.0.5
+  - [#24](https://github.com/logstash-plugins/logstash-output-loggly/pull/24)
+    Get rid of a Ruby warning from using `timeout`.
+  - [#26](https://github.com/logstash-plugins/logstash-output-loggly/pull/26)
+    Docs: Better directions for getting a key in Loggly & other cleanups.
+  - [#26](https://github.com/logstash-plugins/logstash-output-loggly/pull/26)
+    Get rid of a few `puts` and reduce the noise at logging level `info`.
+    There is no longer 1+ log/stdout line created for every event ingested.
+
 ## 3.0.4
-  - Docs: Set the default_codec doc attribute.
+  - Docs: Set the default\_codec doc attribute.
 
 ## 3.0.3
   - Update gemspec summary

data/docs/index.asciidoc

@@ -21,7 +21,6 @@ include::{include_path}/plugin_header.asciidoc[]
 
 ==== Description
 
-Ugly monkey patch to get around http://jira.codehaus.org/browse/JRUBY-5529
 Got a loggly account? Use logstash to ship logs to Loggly!
 
 This is most useful so you can use logstash to parse and structure
@@ -82,13 +81,9 @@ https://www.loggly.com/docs/http-endpoint/
   * Value type is <<string,string>>
   * There is no default value for this setting.
 
-The loggly http input key to send to.
-This is usually visible in the Loggly 'Inputs' page as something like this:
-....
-    https://logs-01.loggly.net/inputs/abcdef12-3456-7890-abcd-ef0123456789
-                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-                                          \---------->   key   <-------------/
-....
+The loggly http customer token to use for sending.
+You can find yours in "Source Setup", under "Customer Tokens".
+
 You can use `%{foo}` field lookups here if you need to pull the api key from
 the event. This is mainly aimed at multitenant hosting providers who want
 to offer shipping a customer's logs to that customer's loggly account.
@@ -164,4 +159,4 @@ https://www.loggly.com/docs/source-groups/
 [id="plugins-{type}s-{plugin}-common-options"]
 include::{include_path}/{type}.asciidoc[]
 
-:default_codec!:
+:default_codec!:

data/lib/logstash/outputs/loggly.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
+require "timeout"
 require "uri"
 # TODO(sissel): Move to something that performs better than net/http
 require "net/http"
@@ -12,7 +13,7 @@ Net::BufferedIO.class_eval do
     BUFSIZE = 1024 * 16
 
     def rbuf_fill
-      timeout(@read_timeout) {
+      ::Timeout.timeout(@read_timeout) {
         @rbuf << @io.sysread(BUFSIZE)
       }
     end
@@ -34,13 +35,9 @@ class LogStash::Outputs::Loggly < LogStash::Outputs::Base
   # https://www.loggly.com/docs/http-endpoint/
   config :host, :validate => :string, :default => "logs-01.loggly.com"
 
-  # The loggly http input key to send to.
-  # This is usually visible in the Loggly 'Inputs' page as something like this:
-  # ....
-  #     https://logs-01.loggly.net/inputs/abcdef12-3456-7890-abcd-ef0123456789
-  #                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  #                                           \---------->   key   <-------------/
-  # ....
+  # The loggly http customer token to use for sending.
+  # You can find yours in "Source Setup", under "Customer Tokens".
+  #
   # You can use `%{foo}` field lookups here if you need to pull the api key from
   # the event. This is mainly aimed at multitenant hosting providers who want
   # to offer shipping a customer's logs to that customer's loggly account.
@@ -115,7 +112,7 @@ class LogStash::Outputs::Loggly < LogStash::Outputs::Base
   private
   def send_event(url, message)
     url = URI.parse(url)
-    @logger.info("Loggly URL", :url => url)
+    @logger.debug("Loggly URL", :url => url)
 
     http = Net::HTTP::Proxy(@proxy_host,
                             @proxy_port,
@@ -127,7 +124,7 @@ class LogStash::Outputs::Loggly < LogStash::Outputs::Base
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     end
 
-    request = Net::HTTP::Post.new(url.path)
+    request = Net::HTTP::Post.new(url.path, {'Content-Type' =>'application/json'})
     request.body = message
 
     # Variable for count total retries
@@ -138,47 +135,47 @@ class LogStash::Outputs::Loggly < LogStash::Outputs::Base
       @retry_count = 1
     end
 
-    
+
     @retry_count.times do
-    begin
-      response = http.request(request)	
-      case response.code
-	  
-	    # HTTP_SUCCESS :Code 2xx
-	    when HTTP_SUCCESS					
-	      puts "Event send to Loggly"
-		  
-		# HTTP_FORBIDDEN :Code 403
-	    when HTTP_FORBIDDEN					
-	      @logger.warn("User does not have privileges to execute the action.")
-		
-		# HTTP_NOT_FOUND :Code 404
-	    when HTTP_NOT_FOUND					
-	      @logger.warn("Invalid URL. Please check URL should be http://logs-01.loggly.com/inputs/CUSTOMER_TOKEN/tag/logstash")
-	    
-		# HTTP_INTERNAL_SERVER_ERROR :Code 500
-		when HTTP_INTERNAL_SERVER_ERROR			
-	      @logger.warn("Internal Server Error")
-		
-		# HTTP_GATEWAY_TIMEOUT :Code 504
-	    when HTTP_GATEWAY_TIMEOUT				
-	      @logger.warn("Gateway Time Out")
-	    else
-	      @logger.error("Unexpected response code", :code => response.code)
-      end # case
-
-      if [HTTP_SUCCESS,HTTP_FORBIDDEN,HTTP_NOT_FOUND].include?(response.code)	# break the retries loop for the specified response code
-        break
-      end
-	  rescue StandardError => e
+      begin
+        response = http.request(request)
+        case response.code
+
+          # HTTP_SUCCESS :Code 2xx
+        when HTTP_SUCCESS
+          @logger.debug("Event sent to Loggly")
+
+          # HTTP_FORBIDDEN :Code 403
+        when HTTP_FORBIDDEN
+          @logger.warn("User does not have privileges to execute the action.")
+
+          # HTTP_NOT_FOUND :Code 404
+        when HTTP_NOT_FOUND
+          @logger.warn("Invalid URL. Please check URL should be http://logs-01.loggly.com/inputs/CUSTOMER_TOKEN/tag/logstash")
+
+          # HTTP_INTERNAL_SERVER_ERROR :Code 500
+        when HTTP_INTERNAL_SERVER_ERROR
+          @logger.warn("Internal Server Error")
+
+          # HTTP_GATEWAY_TIMEOUT :Code 504
+        when HTTP_GATEWAY_TIMEOUT
+          @logger.warn("Gateway Time Out")
+        else
+          @logger.error("Unexpected response code", :code => response.code)
+        end # case
+
+        if [HTTP_SUCCESS,HTTP_FORBIDDEN,HTTP_NOT_FOUND].include?(response.code)	# break the retries loop for the specified response code
+          break
+        end
+      rescue StandardError => e
         @logger.error("An unexpected error occurred", :exception => e.class.name, :error => e.to_s, :backtrace => e.backtrace)
       end # rescue
-     
+
       if totalRetries < @retry_count && totalRetries > 0
-        puts "Waiting for five seconds before retry..."
+        @logger.warn "Waiting for five seconds before retry..."
         sleep(5)
       end
-	  
+
       totalRetries = totalRetries + 1
     end #loop
   end # def send_event

data/logstash-output-loggly.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-loggly'
-  s.version         = '3.0.4'
+  s.version         = '3.0.5'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Ships logs to Loggly"
   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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-loggly
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Ships logs to Loggly