logstash-output-datadog_logs 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c708a309549e6084b60795dfc4ff3be4329d0e8f
-  data.tar.gz: c5b93168d3a46b54accb8e5aa9790550301b0318
+SHA256:
+  metadata.gz: '08332207f354cf7e2c4a6d323fd7d9641622b1a0f3d458117d229506011ce719'
+  data.tar.gz: 108516196622ab56ef6b9c86c891bb68ebd80947897ed2dc1d8e8c23893fb50c
 SHA512:
-  metadata.gz: 4fb5d1b94aa280e44b746fdcd7f5834e866a22d674c981542e7510f2dd3028a5fa3520e9ed6b03c27c58f7967548f430d00affd7f41a01d8f48326eb698cc14a
-  data.tar.gz: fe129eff08cb0c34099134fa1165236e9c9b6738a087f134e6b0171dd5274405d55a30d47605db20d762c07d9ca748e9452c014d7f612eb1ce4ff426b6c4f4d0
+  metadata.gz: 9ace4d38fa8fdda5b0d0722a3536bc39964366e41ac51fdedf9ddd2588fed2bbdc15bb9eea6ebdec1b33394faf3e3f15c72a2750f320d886782a6dd53b7f09bf
+  data.tar.gz: 36c241db3336f385aff44926ac495ad1f2c4599b756490c4195418244054589aac6b30c87411dbd3873c6cd7ce6f20ba48bd733d890c538b8a43a0c7a0969887

data/README.md

@@ -17,7 +17,7 @@ Configure `datadog_logs` plugin with your Datadog API key:
 ```
 output {
     datadog_logs {
-        api_key => "<your_datadog_api_key>"
+        api_key => "<DATADOG_API_KEY>"
     }
 }
 

data/lib/logstash/outputs/datadog_logs.rb

@@ -15,60 +15,63 @@ class LogStash::Outputs::DatadogLogs < LogStash::Outputs::Base
 
   default :codec, "json"
 
-  # Your Datadog API key
-  config :api_key, :validate => :string, :required => true
+  # Datadog configuration parameters
+  config :api_key,     :validate => :string,  :required => true
+  config :host,        :validate => :string,  :required => true, :default  => 'intake.logs.datadoghq.com'
+  config :port,        :validate => :number,  :required => true, :default  => 10516
+  config :use_ssl,     :validate => :boolean, :required => true, :default  => true
+  config :max_backoff, :validate => :number,  :required => true, :default  => 30
+  config :max_retries, :validate => :number,  :required => true, :default  => 5
 
   public
   def register
     require "socket"
-    @host = "intake.logs.datadoghq.com"
-    @port = 10516
-
-    client_socket = nil
+    client = nil
     @codec.on_event do |event, payload|
-      # open a connection if needed and send JSON payload
+      retries = 0
       begin
-        client_socket = new_client_socket unless client_socket
-        r,w,e = IO.select([client_socket], [client_socket], [client_socket], nil)
-        client_socket.sysread(16384) if r.any?
-        if w.any?
-          # send message to Datadog
+        if retries < max_retries
+          if retries > 0
+            backoff = 2 ** retries
+            backoff = max_backoff unless backoff < max_backoff
+            sleep backoff
+          end
+          client ||= new_client
           message = "#{@api_key} #{payload}\n"
-          client_socket.puts(message)
-          @logger.debug("Sent", :payload => payload)
-        end # w.any?
+          client.write(message)
+        else
+          @logger.warn("Max number of retries reached, dropping the payload", :payload => payload)
+        end
       rescue => e
         # close connection and always retry
-        @logger.warn("TCP exception", :exception => e, :backtrace => e.backtrace)
-        client_socket.close rescue nil
-        client_socket = nil
-        sleep 5
+        @logger.warn("Could not send message, retrying", :exception => e, :backtrace => e.backtrace)
+        client.close rescue nil
+        client = nil
+        retries += 1
         retry
-      end # begin
-    end # @codec.on_event
-  end # def register
+      end
+    end
+  end
 
   public
   def receive(event)
     # handle new event
     @codec.encode(event)
-  end # def receive
+  end
 
   private
-  def new_client_socket
+  def new_client
     # open a secure connection with Datadog
-    begin
+    if @use_ssl
+      @logger.info("Starting SSL connection", :host => @host, :port => @port)
       socket = TCPSocket.new @host, @port
       sslSocket = OpenSSL::SSL::SSLSocket.new socket
       sslSocket.connect
-      @logger.debug("Started SSL connection", :host => @host)
       return sslSocket
-    rescue => e
-      # always retry when the connection failed
-      @logger.warn("SSL exception", :exception => e, :backtrace => e.backtrace)
-      sleep 5
-      retry
-    end # begin
-  end # def new_client_socket
+    else
+      @logger.info("Starting plaintext connection", :host => @host, :port => @port)
+      return TCPSocket.new @host, @port
+    end
+  end
 
-end # class LogStash::Outputs::DatadogLogs
+end

data/logstash-output-datadog_logs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-datadog_logs'
-  s.version       = '0.2.1'
+  s.version       = '0.3.0'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'DatadogLogs lets you send logs to Datadog based on LogStash events.'
   s.homepage      = 'https://www.datadoghq.com/'

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-datadog_logs
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Datadog
 - Alexandre Jacquemot
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :runtime
+  name: logstash-core-plugin-api
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: logstash-devutils
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: support@datadoghq.com
 executables: []
 extensions: []
@@ -60,7 +60,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: output
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -75,9 +75,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.13
+signing_key:
 specification_version: 4
 summary: DatadogLogs lets you send logs to Datadog based on LogStash events.
 test_files: