fluent-plugin-splunk-hec 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23746f631e5a9217fca76160c200155878aecdc2402dcaa0dec2b7447f7f5986
-  data.tar.gz: 43e704a9048113bbc9070972a809ab2d689e05ba63c2a1739d35abad1ea7ba08
+  metadata.gz: 95692f6f46749b89d1afb9d2c0f353e210c3a75bdb301e666a514461a921f144
+  data.tar.gz: bd2e18ac48003d0a7fe0e66ec01978b0f7fc8008488490a08eb0c3fe823ef5fa
 SHA512:
-  metadata.gz: 531cb324fcfdbdd81b89abca06d39ec324776dd973c23118eda9df697160980f87f43dd1beded8adec71103f9ed1bcf43ced51b60b30f6ebce032516524c3424
-  data.tar.gz: 27cdfef7e22314183999e93651275da29ca4c473b44d68c8873c458f9fcbf1d7213b1632690d4dd7b923699822cf7b57fd4fdea0b6a48b7dc51767d9785a1176
+  metadata.gz: 73a5f400dd4c5465ec673d909f4a11f4db4eeed4a9e2fa99198ea9535c603878f194ef5a7ec770717300d65e0b18c4fbecfd898c37946b922d574185fb8020c8
+  data.tar.gz: 0d74186b33138347b2ab9833cd2df57ad0ee5fcae053ba7db59b2feb351c014dbeb6665b527281967ce7dcdc6454dc186b80068b9e07c0a8734de658bf1e20c3

data/Gemfile.lock

@@ -1,19 +1,21 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-splunk-hec (1.3.0)
+    fluent-plugin-splunk-hec (1.3.2)
       fluentd (>= 1.5)
+      json-jwt (~> 1.15.0)
       multi_json (~> 1.13)
       net-http-persistent (~> 4.0)
       openid_connect (~> 1.1.8)
       prometheus-client (>= 2.1.0)
+      rack-oauth2 (~> 1.19)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.3)
-      activesupport (= 7.0.3)
-    activesupport (7.0.3)
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -22,15 +24,21 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     aes_key_wrap (1.1.0)
     attr_required (1.0.1)
-    bindata (2.4.10)
-    concurrent-ruby (1.1.10)
-    connection_pool (2.2.5)
+    bindata (2.4.14)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.3.0)
     cool.io (1.7.1)
     crack (0.4.5)
       rexml
     digest (3.1.0)
     docile (1.4.0)
-    fluentd (1.15.1)
+    faraday (2.7.1)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-net_http (3.0.2)
+    fluentd (1.15.3)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
@@ -45,18 +53,19 @@ GEM
     hashdiff (1.0.1)
     http_parser.rb (0.8.0)
     httpclient (2.8.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     io-wait (0.2.1)
-    json-jwt (1.13.0)
+    json-jwt (1.15.3)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
+      httpclient
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     mini_mime (1.1.2)
     minitest (5.15.0)
-    msgpack (1.5.4)
+    msgpack (1.6.0)
     multi_json (1.15.0)
     net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
@@ -80,8 +89,8 @@ GEM
     power_assert (2.0.1)
     prometheus-client (4.0.0)
     public_suffix (4.0.6)
-    rack (2.2.3.1)
-    rack-oauth2 (1.19.0)
+    rack (3.0.6.1)
+    rack-oauth2 (1.21.2)
       activesupport
       attr_required
       httpclient
@@ -89,6 +98,7 @@ GEM
       rack (>= 2.1.0)
     rake (13.0.6)
     rexml (3.2.5)
+    ruby2_keywords (0.0.5)
     serverengine (2.3.0)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
@@ -99,16 +109,17 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
     strptime (0.2.5)
-    swd (1.3.0)
+    swd (2.0.2)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
-      httpclient (>= 2.4)
+      faraday (~> 2.0)
+      faraday-follow_redirects
     test-unit (3.5.3)
       power_assert
     timeout (0.2.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.2)
+    tzinfo-data (1.2022.6)
       tzinfo (>= 1.0.0)
     validate_email (0.1.6)
       activemodel (>= 3.0)
@@ -116,9 +127,10 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    webfinger (1.2.0)
+    webfinger (2.1.2)
       activesupport
-      httpclient (>= 2.4)
+      faraday (~> 2.0)
+      faraday-follow_redirects
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -140,4 +152,4 @@ DEPENDENCIES
   webmock (~> 3.5.0)
 
 BUNDLED WITH
-   2.3.20
+   2.4.9

data/README.md

@@ -1,3 +1,7 @@
+# End of Support
+
+**Important:** The fluent-plugin-splunk-hec will reach End of Support on January 1, 2024. After that date, this repository will no longer receive updates from Splunk and will no longer be supported by Splunk. Until then, only critical security fixes and bug fixes will be provided.
+
 # fluent-plugin-splunk-hec
 
 [Fluentd](https://fluentd.org/) output plugin to send events and metrics to [Splunk](https://www.splunk.com) in 2 modes:<br/>
@@ -288,6 +292,10 @@ Splunk app name using this plugin (default to `hec_plugin_gem`)
 
 The version of Splunk app using this this plugin (default to plugin version)
 
+### custom_headers (Hash) (Optional)
+
+Hash of custom headers to be added to the HTTP request. Used to populate [`override_headers`](https://docs.seattlerb.org/net-http-persistent/Net/HTTP/Persistent.html#attribute-i-override_headers) attribute of the underlying `Net::HTTP::Persistent` connection.
+
 #### When `data_type` is `event`
 
 In this case, parameters inside `<fields>` are used as indexed fields and removed from the original input events. Please see the "Add a "fields" property at the top JSON level" [here](http://dev.splunk.com/view/event-collector/SP-CAAAFB6) for details. Given we have configuration like
@@ -400,6 +408,9 @@ Specifies which formatter to use.
 
 The following parameters can be used for tuning HTTP connections:
 
+#### gzip_compression (boolean)
+Whether to use gzip compression on outbound posts. This parameter is set to `false` by default for backwards compatibility.
+
 #### idle_timeout (integer)
 
 The default is five seconds. If a connection has not been used for five seconds, it is automatically reset at next use, in order to avoid attempting to send to a closed connection. Specifiy `nil` to prohibit any timeouts.

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.2

data/fluent-plugin-splunk-hec.gemspec

@@ -38,6 +38,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'net-http-persistent', '~> 4.0'
   spec.add_runtime_dependency 'openid_connect', '~> 1.1.8'
   spec.add_runtime_dependency 'prometheus-client', '>= 2.1.0'
+  spec.add_runtime_dependency 'json-jwt', '~> 1.15.0'
+  spec.add_runtime_dependency 'rack-oauth2', '~> 1.19'
+
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '>= 12.0'

data/lib/fluent/plugin/out_splunk_hec.rb

@@ -134,6 +134,9 @@ module Fluent::Plugin
     DESC
     config_param :non_utf8_replacement_string, :string, :default => ' '
 
+    desc 'Any custom headers to include alongside requests made to Splunk'
+    config_param :custom_headers, :hash, :default => {}
+    
     def initialize
       super
       @default_host = Socket.gethostname
@@ -168,7 +171,9 @@ module Fluent::Plugin
         c.override_headers['Authorization'] = "Splunk #{@hec_token}"
         c.override_headers['__splunk_app_name'] = "#{@app_name}"
         c.override_headers['__splunk_app_version'] = "#{@app_version}"
-
+        @custom_headers.each do |header, value|
+          c.override_headers[header] = value
+        end
       end
     end
 

data/test/fluent/plugin/out_splunk_hec_test.rb

@@ -66,6 +66,13 @@ describe Fluent::Plugin::SplunkHecOutput do
     it 'should support enabling gzip' do
       expect(create_hec_output_driver('hec_host hec_token', 'gzip_compression true').instance.gzip_compression).must_equal true
     end
+    it 'should define custom_headers as {} (hash) initially' do
+      assert_empty(create_hec_output_driver('hec_host hec_token').instance.custom_headers)
+      expect(create_hec_output_driver('hec_host hec_token').instance.custom_headers).is_a? Hash
+    end
+    it 'should allow setting custom_headers' do
+      assert_equal(create_hec_output_driver('hec_host hec_token', 'custom_headers {"custom":"header"}').instance.custom_headers, {"custom" => "header"})
+    end
   end
 
   describe 'hec_host validation' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-splunk-hec
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: json-jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+- !ruby/object:Gem::Dependency
+  name: rack-oauth2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -221,13 +249,13 @@ signing_key:
 specification_version: 4
 summary: Fluentd plugin for Splunk HEC.
 test_files:
-- test/test_helper.rb
 - test/lib/webmock/http_lib_adapters/excon_adapter.rb
+- test/lib/webmock/http_lib_adapters/patron_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/curb_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/em_http_request_adapter.rb
-- test/lib/webmock/http_lib_adapters/patron_adapter.rb
-- test/fluent/plugin/out_splunk_hec_test.rb
+- test/test_helper.rb
 - test/fluent/plugin/out_splunk_ingest_api_test.rb
+- test/fluent/plugin/out_splunk_hec_test.rb