logstash-output-datadog_logs 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 635ef3d038ba35b57528f006e81455e20b7cd27217a8fe6188f65d5229e13fe3
-  data.tar.gz: 6b4325a4cf44791c40aa18360ba7fd9c92a451fb94b182c5a0803de711e3d462
+  metadata.gz: bbfe2fc6bf43df61e35e421486e1f7143e4acce4725386decdc05f946249009d
+  data.tar.gz: 36bdf364a1d4ae4d522712914cca7eff722b7f115bf553c6cfeee3d4869a7744
 SHA512:
-  metadata.gz: e555d642d57cd65971b9e05c2cd6d76c8919ec7413d1dab24eb9fe6eb8d9be3ce51dcfd0dc4751d77f052d87f49ea032fb6ce488c6b99350ae31b41f93908d2e
-  data.tar.gz: 2b89082813230155ebc747da6e5073aaa7f74d0ad2b1c922e8c577f670af6a2306447a0384229a0382f2c499de1741b20d11b03bc89f32f314939fee269e17c3
+  metadata.gz: 44eb1829c931dda34c65c962084d4be14ae5ef510000b32dec93e5b465a2e12dcc4ac27b7a53cb603f9c4d1e8a36c6c1262279f3c86317fef76d9448fcb0c125
+  data.tar.gz: ee06691a2c65deb5bf743f47072e35cf9615a238dd2a8f40f4db4459ff4e3fed3025908993f4ddf8f4814cd81117961919037c891d53e76b448058f838d77834

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.5.1
+  - Support using HTTP proxies, adding the `http_proxy` parameter.
+
 ## 0.5.0
   - Support Datadog v2 endpoints #28
 

data/Gemfile

@@ -1,2 +1,11 @@
 source 'https://rubygems.org'
+
 gemspec
+
+logstash_path = ENV["LOGSTASH_PATH"] || "../../logstash"
+use_logstash_source = ENV["LOGSTASH_SOURCE"] && ENV["LOGSTASH_SOURCE"].to_s == "1"
+
+if Dir.exist?(logstash_path) && use_logstash_source
+  gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
+  gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
+end

data/README.md

@@ -58,8 +58,8 @@ output {
 |  Property   |  Description                                                             |  Default value |
 |-------------|--------------------------------------------------------------------------|----------------|
 | **api_key** | The API key of your Datadog platform | nil |
-| **host** | Proxy endpoint when logs are not directly forwarded to Datadog | intake.logs.datadoghq.com |
-| **port** | Proxy port when logs are not directly forwarded to Datadog | 443 |
+| **host** | Endpoint when logs are not directly forwarded to Datadog | intake.logs.datadoghq.com |
+| **port** | Port when logs are not directly forwarded to Datadog | 443 |
 | **use_ssl** | If true, the agent initializes a secure connection to Datadog. Ensure to update the port if you disable it. | true |
 | **max_retries** | The number of retries before the output plugin stops | 5 |
 | **max_backoff** | The maximum time waited between each retry in seconds | 30 |
@@ -67,6 +67,7 @@ output {
 | **use_compression** | Enable log compression for HTTP | true |
 | **compression_level** | Set the log compression level for HTTP (1 to 9, 9 being the best ratio) | 6 |
 | **no_ssl_validation** | Disable SSL validation (useful for proxy forwarding) | false |
+| **http_proxy** | Proxy address for http proxies | none |
 
 
 

data/lib/logstash/outputs/datadog_logs.rb

@@ -35,11 +35,12 @@ class LogStash::Outputs::DatadogLogs < LogStash::Outputs::Base
   config :compression_level, :validate => :number, :required => false, :default => 6
   config :no_ssl_validation, :validate => :boolean, :required => false, :default => false
   config :force_v1_routes, :validate => :boolean, :required => false, :default => false # force using deprecated v1 routes
+  config :http_proxy, :validate => :string, :required => false, :default => ""
 
   # Register the plugin to logstash
   public
   def register
-    @client = new_client(@logger, @api_key, @use_http, @use_ssl, @no_ssl_validation, @host, @port, @use_compression, @force_v1_routes)
+    @client = new_client(@logger, @api_key, @use_http, @use_ssl, @no_ssl_validation, @host, @port, @use_compression, @force_v1_routes, @http_proxy)
   end
 
   # Logstash shutdown hook
@@ -145,9 +146,9 @@ class LogStash::Outputs::DatadogLogs < LogStash::Outputs::Base
   end
 
   # Build a new transport client
-  def new_client(logger, api_key, use_http, use_ssl, no_ssl_validation, host, port, use_compression, force_v1_routes)
+  def new_client(logger, api_key, use_http, use_ssl, no_ssl_validation, host, port, use_compression, force_v1_routes, http_proxy)
     if use_http
-      DatadogHTTPClient.new logger, use_ssl, no_ssl_validation, host, port, use_compression, api_key, force_v1_routes
+      DatadogHTTPClient.new logger, use_ssl, no_ssl_validation, host, port, use_compression, api_key, force_v1_routes, http_proxy
     else
       DatadogTCPClient.new logger, use_ssl, no_ssl_validation, host, port
     end
@@ -170,6 +171,7 @@ class LogStash::Outputs::DatadogLogs < LogStash::Outputs::Base
           retries += 1
           retry
         end
+        @logger.error("Max number of retries reached, dropping message. Last exception: #{ex.message}")
       rescue => ex
         @logger.error("Unmanaged exception while sending log to datadog #{ex.message}")
       end
@@ -194,7 +196,7 @@ class LogStash::Outputs::DatadogLogs < LogStash::Outputs::Base
         ::Manticore::ResolutionFailure
     ]
 
-    def initialize(logger, use_ssl, no_ssl_validation, host, port, use_compression, api_key, force_v1_routes)
+    def initialize(logger, use_ssl, no_ssl_validation, host, port, use_compression, api_key, force_v1_routes, http_proxy)
       @logger = logger
       protocol = use_ssl ? "https" : "http"
 
@@ -216,6 +218,9 @@ class LogStash::Outputs::DatadogLogs < LogStash::Outputs::Base
 
       config = {}
       config[:ssl][:verify] = :disable if no_ssl_validation
+      if http_proxy != ""
+        config[:proxy] = http_proxy
+      end
       @client = Manticore::Client.new(config)
     end
 

data/lib/logstash/outputs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatadogLogStashPlugin
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/logstash-output-datadog_logs.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # Files
-  s.files = Dir['lib/**/*', 'spec/**/*', 'vendor/**/*', '*.gemspec', '*.md', 'CONTRIBUTORS', 'Gemfile', 'LICENSE', 'NOTICE.TXT']
+  s.files = Dir['lib/**/*', 'spec/**/*', 'vendor/**/*', "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", '*.gemspec', '*.md', 'CONTRIBUTORS', 'Gemfile', 'LICENSE', 'NOTICE.TXT']
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
@@ -23,10 +23,10 @@ Gem::Specification.new do |s|
   s.metadata = {"logstash_plugin" => "true", "logstash_group" => "output"}
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
   s.add_runtime_dependency 'manticore', '>= 0.5.2', '< 1.0.0'
   s.add_runtime_dependency 'logstash-codec-json'
 
-  s.add_development_dependency 'logstash-devutils', "= 1.3.6"
+  s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'webmock'
 end

data/spec/outputs/datadog_logs_spec.rb

@@ -2,7 +2,7 @@
 # under the Apache License Version 2.0.
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2017 Datadog, Inc.
-
+# encoding: utf-8
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/outputs/datadog_logs"
 require 'webmock/rspec'
@@ -90,12 +90,13 @@ describe LogStash::Outputs::DatadogLogs do
   end
 
   context "when facing HTTP connection issues" do
+    http_proxy = ""
     [true, false].each do |force_v1_routes|
         it "should retry when server is returning 5XX " + (force_v1_routes ? "using v1 routes" : "using v2 routes") do
           api_key = 'XXX'
           stub_dd_request_with_return_code(api_key, 500, force_v1_routes)
           payload = '{}'
-          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes
+          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes, http_proxy
           expect { client.send(payload) }.to raise_error(LogStash::Outputs::DatadogLogs::RetryableError)
         end
 
@@ -103,7 +104,7 @@ describe LogStash::Outputs::DatadogLogs do
           api_key = 'XXX'
           stub_dd_request_with_return_code(api_key, 400, force_v1_routes)
           payload = '{}'
-          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes
+          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes, http_proxy
           expect { client.send(payload) }.to_not raise_error
         end
 
@@ -111,7 +112,7 @@ describe LogStash::Outputs::DatadogLogs do
           api_key = 'XXX'
           stub_dd_request_with_return_code(api_key, 429, force_v1_routes)
           payload = '{}'
-          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes
+          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes, http_proxy
           expect { client.send(payload) }.to raise_error(LogStash::Outputs::DatadogLogs::RetryableError)
         end
 
@@ -119,7 +120,7 @@ describe LogStash::Outputs::DatadogLogs do
           api_key = 'XXX'
           stub_dd_request_with_error(api_key, Manticore::Timeout, force_v1_routes)
           payload = '{}'
-          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes
+          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes, http_proxy
           expect { client.send(payload) }.to raise_error(LogStash::Outputs::DatadogLogs::RetryableError)
         end
 
@@ -127,7 +128,7 @@ describe LogStash::Outputs::DatadogLogs do
           api_key = 'XXX'
           stub_dd_request_with_error(api_key, Manticore::SocketException, force_v1_routes)
           payload = '{}'
-          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes
+          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes, http_proxy
           expect { client.send(payload) }.to raise_error(LogStash::Outputs::DatadogLogs::RetryableError)
         end
 
@@ -135,7 +136,7 @@ describe LogStash::Outputs::DatadogLogs do
           api_key = 'XXX'
           stub_dd_request_with_error(api_key, Manticore::ClientProtocolException, force_v1_routes)
           payload = '{}'
-          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes
+          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes, http_proxy
           expect { client.send(payload) }.to raise_error(LogStash::Outputs::DatadogLogs::RetryableError)
         end
 
@@ -143,7 +144,7 @@ describe LogStash::Outputs::DatadogLogs do
           api_key = 'XXX'
           stub_dd_request_with_error(api_key, Manticore::ResolutionFailure, force_v1_routes)
           payload = '{}'
-          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes
+          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes, http_proxy
           expect { client.send(payload) }.to raise_error(LogStash::Outputs::DatadogLogs::RetryableError)
         end
 
@@ -151,7 +152,7 @@ describe LogStash::Outputs::DatadogLogs do
           api_key = 'XXX'
           stub_dd_request_with_error(api_key, Manticore::SocketTimeout, force_v1_routes)
           payload = '{}'
-          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes
+          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes, http_proxy
           expect { client.send(payload) }.to raise_error(LogStash::Outputs::DatadogLogs::RetryableError)
         end
 
@@ -159,7 +160,7 @@ describe LogStash::Outputs::DatadogLogs do
           api_key = 'XXX'
           stub_dd_request_with_error(api_key, StandardError, force_v1_routes)
           payload = '{}'
-          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes
+          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes, http_proxy
           expect { client.send(payload) }.to raise_error(StandardError)
         end
 
@@ -167,7 +168,7 @@ describe LogStash::Outputs::DatadogLogs do
           api_key = 'XXX'
           stub_dd_request_with_error(api_key, StandardError, force_v1_routes)
           payload = '{}'
-          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes
+          client = LogStash::Outputs::DatadogLogs::DatadogHTTPClient.new Logger.new(STDOUT), false, false, "datadog.com", 80, false, api_key, force_v1_routes, http_proxy
           expect { client.send_retries(payload, 2, 2) }.to_not raise_error
         end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-datadog_logs
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Datadog
@@ -9,22 +9,28 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.99'
   name: logstash-core-plugin-api
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.60'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -35,8 +41,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
   name: manticore
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,8 +58,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-codec-json
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -62,17 +68,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -80,8 +86,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: webmock
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: DatadogLogs lets you send logs to Datadog based on LogStash events.