logstash-output-sumologic 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6d9bc4c2957d756a60ef1aeab7f037e7ce17b4a
-  data.tar.gz: 9e2fee37103045a75c2a9d1d226ccfd7a6b34377
+  metadata.gz: 2e93fc2c3b965317a3ce2e7d4dac9400bb9ef83f
+  data.tar.gz: 63e2f08e478e46ee1e9413f983dfd3c4973aa183
 SHA512:
-  metadata.gz: 3f98566dfe28f2df44735658f0f92670498b956e707b82213b5b750f12c014e6ad92b466d6f38edba1c6ceec9034d68f1c2c3b3875041093daace936854a0f84
-  data.tar.gz: a6b18a26bdf395dc9d6ac87fba8da40cedf4a0d0aad38d3046a590089225e44359c86179469cdcd321ef79f6c00ef40ed8c2c004d2d50b8e1a8ad5719d788a6b
+  metadata.gz: d65bf23542a63ce80fe6d129bdf33d96d03b046461b344773575d9a672a8880f0f3f490a79aee8fe1d2b527ff143c39808bf0c8b05aacbcfb6e4705183cc2a2e
+  data.tar.gz: cc696890c823265d3f0b21a4cf6daf2d24dadf841f5401a80c36e0ebad6fac263582f9bafd2f4d8e628f57ec9273508bc52b2c56e4d64b44700ad33fbf69d3a5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.1.4
+ - bug fix
+
+## 1.1.3
+ - bug fix
+
 ## 1.1.0
  - Support metrics sending
 

data/lib/logstash/outputs/sumologic.rb

@@ -121,14 +121,22 @@ class LogStash::Outputs::SumoLogic < LogStash::Outputs::Base
   
   public
   def receive(event)
-    if event == LogStash::SHUTDOWN
-      finished
-      return
-    end
+    begin
+ 
+      if event == LogStash::SHUTDOWN
+        finished
+        return
+      end
 
-    content = event2content(event)
-    queue_and_send(content)
-    
+      content = event2content(event)
+      queue_and_send(content)
+
+    rescue
+      log_failure(
+        "Error when processing event",
+        :event => event
+      )
+    end
   end # def receive
 
   public
@@ -333,7 +341,9 @@ end # def dotify
 
   private
   def expand(template, event)
-    template = template.gsub("%{@json}", LogStash::Json.dump(event2hash(event))) if template.include? "%{@json}"
+    hash = event2hash(event)
+    dump = LogStash::Json.dump(hash)
+    template = template.gsub("%{@json}") { dump }
     event.sprintf(template)
   end # def expand
 
@@ -373,7 +383,7 @@ end # def dotify
 
   private
   def get_metrics_name(event, name)
-    name = @metrics_name.gsub(METRICS_NAME_PLACEHOLDER, name) if @metrics_name
+    name = @metrics_name.gsub(METRICS_NAME_PLACEHOLDER) { name } if @metrics_name
     event.sprintf(name)
   end # def get_metrics_name
 

data/logstash-output-sumologic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = "logstash-output-sumologic"
-  s.version       = "1.1.3"
+  s.version       = "1.1.4"
   s.licenses      = ["Apache-2.0"]
   s.summary       = "Deliever the log to Sumo Logic cloud service."
   s.description   = "This gem is a Logstash output plugin to deliver the log or metrics to Sumo Logic cloud service. Go to https://github.com/SumoLogic/logstash-output-sumologic for getting help, reporting issues, etc."
@@ -20,5 +20,6 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
   s.add_runtime_dependency "logstash-codec-plain", ">= 0"
+  s.add_runtime_dependency 'logstash-mixin-http_client', ">= 6.0.0", "< 7.0.0"
   s.add_development_dependency "logstash-devutils", "~> 1.3", ">= 1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-sumologic
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Sumo Logic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
+  name: logstash-mixin-http_client
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -73,7 +93,6 @@ files:
 - LICENSE
 - README.md
 - lib/logstash/outputs/sumologic.rb
-- lib/logstash/plugin_mixins/http_client.rb
 - logstash-output-sumologic.gemspec
 - spec/outputs/sumologic_spec.rb
 - spec/spec_helper.rb

data/lib/logstash/plugin_mixins/http_client.rb

@@ -1,187 +0,0 @@
-# encoding: utf-8
-require "logstash/config/mixin"
-
-# This module makes it easy to add a very fully configured HTTP client to logstash
-# based on [Manticore](https://github.com/cheald/manticore).
-# For an example of its usage see https://github.com/logstash-plugins/logstash-input-http_poller
-module LogStash::PluginMixins::HttpClient
-  class InvalidHTTPConfigError < StandardError; end
-
-  def self.included(base)
-    require 'manticore'
-    base.extend(self)
-    base.setup_http_client_config
-  end
-
-  public
-  def setup_http_client_config
-    # Timeout (in seconds) for the entire request
-    config :request_timeout, :validate => :number, :default => 60
-
-    # Timeout (in seconds) to wait for data on the socket. Default is `10s`
-    config :socket_timeout, :validate => :number, :default => 10
-
-    # Timeout (in seconds) to wait for a connection to be established. Default is `10s`
-    config :connect_timeout, :validate => :number, :default => 10
-
-    # Should redirects be followed? Defaults to `true`
-    config :follow_redirects, :validate => :boolean, :default => true
-
-    # Max number of concurrent connections. Defaults to `50`
-    config :pool_max, :validate => :number, :default => 50
-
-    # Max number of concurrent connections to a single host. Defaults to `25`
-    config :pool_max_per_route, :validate => :number, :default => 25
-
-    # Turn this on to enable HTTP keepalive support. We highly recommend setting `automatic_retries` to at least
-    # one with this to fix interactions with broken keepalive implementations.
-    config :keepalive, :validate => :boolean, :default => true
-
-    # How many times should the client retry a failing URL. We highly recommend NOT setting this value
-    # to zero if keepalive is enabled. Some servers incorrectly end keepalives early requiring a retry!
-    # Note: if `retry_non_idempotent` is set only GET, HEAD, PUT, DELETE, OPTIONS, and TRACE requests will be retried.
-    config :automatic_retries, :validate => :number, :default => 1
-
-    # If `automatic_retries` is enabled this will cause non-idempotent HTTP verbs (such as POST) to be retried.
-    config :retry_non_idempotent, :validate => :boolean, :default => false
-
-    # How long to wait before checking if the connection is stale before executing a request on a connection using keepalive.
-    # # You may want to set this lower, possibly to 0 if you get connection errors regularly
-    # Quoting the Apache commons docs (this client is based Apache Commmons):
-    # 'Defines period of inactivity in milliseconds after which persistent connections must be re-validated prior to being leased to the consumer. Non-positive value passed to this method disables connection validation. This check helps detect connections that have become stale (half-closed) while kept inactive in the pool.'
-    # See https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.html#setValidateAfterInactivity(int)[these docs for more info]
-    config :validate_after_inactivity, :validate => :number, :default => 200
-
-    config :ssl_certificate_validation, :deprecated => "This never worked correctly and is now deprecated and a noop"
-
-    # If you need to use a custom X.509 CA (.pem certs) specify the path to that here
-    config :cacert, :validate => :path
-
-    # If you'd like to use a client certificate (note, most people don't want this) set the path to the x509 cert here
-    config :client_cert, :validate => :path
-    # If you're using a client certificate specify the path to the encryption key here
-    config :client_key, :validate => :path
-
-    # If you need to use a custom keystore (`.jks`) specify that here. This does not work with .pem keys!
-    config :keystore, :validate => :path
-
-    # Specify the keystore password here.
-    # Note, most .jks files created with keytool require a password!
-    config :keystore_password, :validate => :password
-
-    # Specify the keystore type here. One of `JKS` or `PKCS12`. Default is `JKS`
-    config :keystore_type, :validate => :string, :default => "JKS"
-
-    # If you need to use a custom truststore (`.jks`) specify that here. This does not work with .pem certs!
-    config :truststore, :validate => :path
-
-    # Specify the truststore password here.
-    # Note, most .jks files created with keytool require a password!
-    config :truststore_password, :validate => :password
-
-    # Specify the truststore type here. One of `JKS` or `PKCS12`. Default is `JKS`
-    config :truststore_type, :validate => :string, :default => "JKS"
-
-    # Enable cookie support. With this enabled the client will persist cookies
-    # across requests as a normal web browser would. Enabled by default
-    config :cookies, :validate => :boolean, :default => true
-
-    # If you'd like to use an HTTP proxy . This supports multiple configuration syntaxes:
-    #
-    # 1. Proxy host in form: `http://proxy.org:1234`
-    # 2. Proxy host in form: `{host => "proxy.org", port => 80, scheme => 'http', user => 'username@host', password => 'password'}`
-    # 3. Proxy host in form: `{url =>  'http://proxy.org:1234', user => 'username@host', password => 'password'}`
-    config :proxy
-
-    # Username to use for HTTP auth.
-    config :user, :validate => :string
-
-    # Password to use for HTTP auth
-    config :password, :validate => :password
-  end
-
-  public
-  def client_config
-    c = {
-      connect_timeout: @connect_timeout,
-      socket_timeout: @socket_timeout,
-      request_timeout: @request_timeout,
-      follow_redirects: @follow_redirects,
-      automatic_retries: @automatic_retries,
-      retry_non_idempotent: @retry_non_idempotent,
-      check_connection_timeout: @validate_after_inactivity,
-      pool_max: @pool_max,
-      pool_max_per_route: @pool_max_per_route,
-      cookies: @cookies,
-      keepalive: @keepalive
-    }
-
-    if @proxy
-      # Symbolize keys if necessary
-      c[:proxy] = @proxy.is_a?(Hash) ?
-        @proxy.reduce({}) {|memo,(k,v)| memo[k.to_sym] = v; memo} :
-        @proxy
-    end
-
-    if @user
-      if !@password || !@password.value
-        raise ::LogStash::ConfigurationError, "User '#{@user}' specified without password!"
-      end
-
-      # Symbolize keys if necessary
-      c[:auth] = {
-        :user => @user,
-        :password => @password.value,
-        :eager => true
-      }
-    end
-
-    c[:ssl] = {}
-    if @cacert
-      c[:ssl][:ca_file] = @cacert
-    end
-
-    if @truststore
-      c[:ssl].merge!(
-        :truststore => @truststore,
-        :truststore_type => @truststore_type,
-        :truststore_password => @truststore_password.value
-      )
-      
-      if c[:ssl][:truststore_password].nil?
-        raise LogStash::ConfigurationError, "Truststore declared without a password! This is not valid, please set the 'truststore_password' option"
-      end
-    end
-
-    if @keystore
-      c[:ssl].merge!(
-        :keystore => @keystore,
-        :keystore_type => @keystore_type,
-        :keystore_password => @keystore_password.value
-      )
-
-      if c[:ssl][:keystore_password].nil?
-        raise LogStash::ConfigurationError, "Keystore declared without a password! This is not valid, please set the 'keystore_password' option"
-      end
-    end
-
-    if @client_cert && @client_key
-      c[:ssl][:client_cert] = @client_cert
-      c[:ssl][:client_key] = @client_key
-    elsif !!@client_cert ^ !!@client_key
-      raise InvalidHTTPConfigError, "You must specify both client_cert and client_key for an HTTP client, or neither!"
-    end
-
-    c
-  end
-
-  private
-  def make_client
-    Manticore::Client.new(client_config)
-  end
-
-  public
-  def client
-    @client ||= make_client
-  end
-end