fluent-plugin-splunk-hec 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3404443a78707ec84c807cc959de100eefec4c7144f76b4587fa4c02580d300d
-  data.tar.gz: '098eb708f6093e40c59aa597c7f185403f9fb195c03758a726ebd8bcc2fc4468'
+  metadata.gz: 3fbf155dc5649294d859dbdc4bc9967681f8d4051f93e7c108bf926961f93afe
+  data.tar.gz: 1bf76e9bb39b3bbf9dc0ae87f8ca38046cbe4f30a86ae0c6c6fef4be257fbb74
 SHA512:
-  metadata.gz: b7dc521fe94e36ae9e4df51f5a32c936615228a164f76ec9391bd72033aa06d35e8292d8cc95b6025cf880943e56f48c2bebbbc5a9e606e219972528a464c9a3
-  data.tar.gz: 4d6ae8221544453debf6e0dbf1ecbdb9a0774f36ae3d1e4715781ca078a2c0d3ebd2870455ffcd75bdb292d1634a8e71d6034f620c69638d51372f010cac4d46
+  metadata.gz: 5228076cb01aa5a32c77f7d532ecb7052f57366e2dbd9d5f1e3fcae1cb7d5ca042bec12393f4c760ce05c4205068473852fdf020255b45d20679af2ee623da85
+  data.tar.gz: 82a15c018c694133cb6e5d4891413ba272087f385586582ae5b00a91b78bc455918116ee078f52f5cc26f7440852c4f2549d1b1730f2c5f3480130896f7d6fe7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-splunk-hec (1.2.8)
+    fluent-plugin-splunk-hec (1.2.9)
       fluentd (>= 1.4)
       multi_json (~> 1.13)
       net-http-persistent (~> 3.1)
@@ -131,4 +131,4 @@ DEPENDENCIES
   webmock (~> 3.5.0)
 
 BUNDLED WITH
-   2.2.30
+   2.2.33

data/VERSION

@@ -1 +1 @@
-1.2.8
+1.2.9

data/lib/fluent/plugin/out_splunk.rb

@@ -193,8 +193,8 @@ module Fluent::Plugin
           v = instance_variable_get "@#{f}"
           next unless v
 
-          if v == TAG_PLACEHOLDER
-            instance_variable_set "@#{f}", ->(tag, _) { tag }
+          if v.include? TAG_PLACEHOLDER
+            instance_variable_set "@#{f}", ->(tag, _) { v.gsub(TAG_PLACEHOLDER, tag) }
           else
             instance_variable_set "@#{f}", ->(_, _) { v }
           end

data/lib/fluent/plugin/out_splunk_hec.rb

@@ -31,13 +31,16 @@ module Fluent::Plugin
     config_param :protocol, :enum, list: %i[http https], default: :https
 
     desc 'The hostname/IP to HEC, or HEC load balancer.'
-    config_param :hec_host, :string
+    config_param :hec_host, :string, default: ''
 
     desc 'The port number to HEC, or HEC load balancer.'
     config_param :hec_port, :integer, default: 8088
 
+    desc 'Full url to connect tosplunk. Example: https://mydomain.com:8088/apps/splunk'
+    config_param :full_url, :string, default: ''
+
     desc 'The HEC token.'
-    config_param :hec_token, :string
+    config_param :hec_token, :string, secret: true
 
     desc 'If a connection has not been used for this number of seconds it will automatically be reset upon the next use to avoid attempting to send to a closed connection. nil means no timeout.'
     config_param :idle_timeout, :integer, default: 5
@@ -132,7 +135,7 @@ module Fluent::Plugin
 
     def configure(conf)
       super
-
+      raise Fluent::ConfigError, 'One of `hec_host` or `full_url` is required.' if @hec_host.empty? && @full_url.empty?
       check_metric_configs
       pick_custom_format_method
     end
@@ -279,9 +282,17 @@ module Fluent::Plugin
     end
 
     def construct_api
-      URI("#{@protocol}://#{@hec_host}:#{@hec_port}/services/collector")
+      if @full_url.empty?
+        URI("#{@protocol}://#{@hec_host}:#{@hec_port}/services/collector")
+      else
+        URI("#{@full_url.delete_suffix("/")}/services/collector")
+      end
     rescue StandardError
-      raise Fluent::ConfigError, "hec_host (#{@hec_host}) and/or hec_port (#{@hec_port}) are invalid."
+      if @full_url.empty?
+        raise Fluent::ConfigError, "hec_host (#{@hec_host}) and/or hec_port (#{@hec_port}) are invalid."
+      else
+        raise Fluent::ConfigError, "full_url (#{@full_url}) is invalid."
+      end
     end
 
     def new_connection
@@ -312,10 +323,13 @@ module Fluent::Plugin
       post.body = chunk.read
       log.debug { "[Sending] Chunk: #{dump_unique_id_hex(chunk.unique_id)}(#{post.body.bytesize}B)." }
       log.trace { "POST #{@api} body=#{post.body}" }
-
-      t1 = Time.now
-      response = @conn.request @api, post
-      t2 = Time.now
+      begin
+        t1 = Time.now
+        response = @conn.request @api, post
+        t2 = Time.now
+      rescue Net::HTTP::Persistent::Error => e
+        raise e.cause
+      end
 
       raise_err = response.code.to_s.start_with?('5') || (!@consume_chunk_on_4xx_errors && response.code.to_s.start_with?('4'))
 

data/test/fluent/plugin/out_splunk_hec_test.rb

@@ -64,7 +64,7 @@ describe Fluent::Plugin::SplunkHecOutput do
 
   describe 'hec_host validation' do
     describe 'invalid host' do
-      it 'should require hec_host' do
+      it 'should require hec_host or full_url' do
         expect { create_hec_output_driver }.must_raise Fluent::ConfigError
       end
 
@@ -78,6 +78,17 @@ describe Fluent::Plugin::SplunkHecOutput do
     end
   end
 
+  describe 'full_url validation' do
+    describe 'invalid full_url' do
+      it { expect { create_hec_output_driver(full_url: '%bad-host%.com') }.must_raise Fluent::ConfigError }
+    end
+    describe 'good full_url' do
+      it { 
+        expect(create_hec_output_driver('full_url https://splunk.com').instance.full_url).must_equal 'https://splunk.com'
+      }
+    end
+  end
+
   it 'should send request to Splunk' do
     req = verify_sent_events do |batch|
       expect(batch.size).must_equal 2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-splunk-hec
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -222,12 +222,12 @@ specification_version: 4
 summary: Fluentd plugin for Splunk HEC.
 test_files:
 - test/test_helper.rb
-- test/fluent/plugin/out_splunk_hec_test.rb
-- test/fluent/plugin/out_splunk_ingest_api_test.rb
-- test/lib/webmock/http_lib_adapters/curb_adapter.rb
-- test/lib/webmock/http_lib_adapters/em_http_request_adapter.rb
+- test/lib/webmock/http_lib_adapters/manticore_adapter.rb
 - test/lib/webmock/http_lib_adapters/http_rb_adapter.rb
 - test/lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb
-- test/lib/webmock/http_lib_adapters/manticore_adapter.rb
+- test/lib/webmock/http_lib_adapters/em_http_request_adapter.rb
 - test/lib/webmock/http_lib_adapters/excon_adapter.rb
+- test/lib/webmock/http_lib_adapters/curb_adapter.rb
 - test/lib/webmock/http_lib_adapters/patron_adapter.rb
+- test/fluent/plugin/out_splunk_ingest_api_test.rb
+- test/fluent/plugin/out_splunk_hec_test.rb