fluent-plugin-splunk-hec 1.2.9 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fbf155dc5649294d859dbdc4bc9967681f8d4051f93e7c108bf926961f93afe
-  data.tar.gz: 1bf76e9bb39b3bbf9dc0ae87f8ca38046cbe4f30a86ae0c6c6fef4be257fbb74
+  metadata.gz: d894794bebe383deedf31c9e928543c90c5353ac880e5ec9b70c681f2186113f
+  data.tar.gz: f1eb6d50647ac6acb6c6bd3e4671089d042b14c1f8237160e5928804981509e0
 SHA512:
-  metadata.gz: 5228076cb01aa5a32c77f7d532ecb7052f57366e2dbd9d5f1e3fcae1cb7d5ca042bec12393f4c760ce05c4205068473852fdf020255b45d20679af2ee623da85
-  data.tar.gz: 82a15c018c694133cb6e5d4891413ba272087f385586582ae5b00a91b78bc455918116ee078f52f5cc26f7440852c4f2549d1b1730f2c5f3480130896f7d6fe7
+  metadata.gz: a935f7f94dc580bf1ccacfc7055eb7a9e9d0d5f7193bb7a326b690e3c8c1d1b510c8c38443304b7c80b663fc8f17ce2ebd5939a963bc333303a78c3f2f563bd2
+  data.tar.gz: b1012167010f85a9124c072f0a8fdf10a2d9dd143dd4d0d2dd96495107b9dcb0d8454103581ea881afacd7e41e861b45f821562e327368da68c4fc03eec6c3fa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-splunk-hec (1.2.9)
+    fluent-plugin-splunk-hec (1.2.12)
       fluentd (>= 1.4)
       multi_json (~> 1.13)
       net-http-persistent (~> 3.1)
@@ -11,31 +11,30 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activesupport (6.1.4.1)
+    activemodel (7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       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.9)
+    concurrent-ruby (1.1.10)
     connection_pool (2.2.5)
     cool.io (1.7.1)
     crack (0.4.5)
       rexml
     docile (1.4.0)
-    fluentd (1.14.2)
+    fluentd (1.14.5)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.8.0)
+      http_parser.rb (>= 0.5.1, < 0.9.0)
       msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.2.2, < 3.0.0)
+      serverengine (>= 2.2.5, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
@@ -43,9 +42,9 @@ GEM
       webrick (>= 1.4.2, < 1.8.0)
       yajl-ruby (~> 1.0)
     hashdiff (1.0.1)
-    http_parser.rb (0.7.0)
+    http_parser.rb (0.8.0)
     httpclient (2.8.3)
-    i18n (1.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     json-jwt (1.13.0)
       activesupport (>= 4.2)
@@ -54,8 +53,8 @@ GEM
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     mini_mime (1.1.2)
-    minitest (5.14.4)
-    msgpack (1.4.2)
+    minitest (5.15.0)
+    msgpack (1.4.5)
     multi_json (1.15.0)
     net-http-persistent (3.1.0)
       connection_pool (~> 2.2)
@@ -70,7 +69,7 @@ GEM
       validate_url
       webfinger (>= 1.0.1)
     power_assert (2.0.1)
-    prometheus-client (2.1.0)
+    prometheus-client (4.0.0)
     public_suffix (4.0.6)
     rack (2.2.3)
     rack-oauth2 (1.19.0)
@@ -81,7 +80,7 @@ GEM
       rack (>= 2.1.0)
     rake (13.0.6)
     rexml (3.2.5)
-    serverengine (2.2.4)
+    serverengine (2.2.5)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     simplecov (0.21.2)
@@ -95,11 +94,11 @@ GEM
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
-    test-unit (3.5.0)
+    test-unit (3.5.3)
       power_assert
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.5)
+    tzinfo-data (1.2022.1)
       tzinfo (>= 1.0.0)
     validate_email (0.1.6)
       activemodel (>= 3.0)
@@ -116,7 +115,6 @@ GEM
       hashdiff
     webrick (1.7.0)
     yajl-ruby (1.4.1)
-    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -131,4 +129,4 @@ DEPENDENCIES
   webmock (~> 3.5.0)
 
 BUNDLED WITH
-   2.2.33
+   2.3.10

data/README.md

@@ -401,6 +401,7 @@ The following parameters can be used for tuning HTTP connections:
 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. 
 
 #### read_timeout (integer)
+
 The amount of time allowed between reading two chunks from the socket. The default value is `nil`, which means no timeout. 
 
 #### open_timeout (integer)
@@ -421,11 +422,11 @@ The private key for this client.
 
 #### ca_file (string)
 
-The path to a file containing a PEM-format CA certificate.
+The path to a file containing CA cerificates in PEM format. The plugin will verify the TLS server certificate presented by Splunk against the certificates in this file, unless verification is disabled by the `ssl_insecure` option.
 
 #### ca_path (string)
 
-The path to a directory containing CA certificates in PEM format.
+The path to a directory containing CA certificates in PEM format. The plugin will verify the TLS server certificate presented by Splunk against the certificates in this file, unless verification is disabled by the `ssl_insecure` option.
 
 #### ciphers (array)
 
@@ -433,15 +434,15 @@ List of SSl ciphers allowed.
 
 #### insecure_ssl (bool)
 
-Specifies whether an insecure SSL connection is allowed. If set to false, Splunk does not verify an insecure server certificate. This parameter is set to `false` by default. Ensure parameter `ca_file` is not configured in order to allow insecure SSL connections when this value is set to `true`.
+Specifies whether an insecure SSL connection is allowed. If set to `false` (the default), the plugin will verify the TLS server certificate presented by Splunk against the CA certificates provided by the `ca_file`/`ca_path` options, and reject the certificate if if verification fails.
 
 #### require_ssl_min_version (bool)
 
-When set to true, TLS version 1.1 and above is required.
+When set to `true` (the default), the plugin will require TLSv1.1 or later for its connection to Splunk.
 
 #### consume_chunk_on_4xx_errors (bool)
 
-Specifies whether any 4xx HTTP response status code consumes the buffer chunks. If set to false, Splunk will fail to flush the buffer on such status codes. This parameter is set to `true` by default for backwards compatibility.
+Specifies whether any 4xx HTTP response status code consumes the buffer chunks. If set to `false`, Splunk will fail to flush the buffer on such status codes. This parameter is set to `true` by default for backwards compatibility.
 
 ## About Buffer
 

data/VERSION

@@ -1 +1 @@
-1.2.9
+1.2.12

data/lib/fluent/plugin/out_splunk.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require 'fluent/output'
 require 'fluent/plugin/output'
 require 'fluent/plugin/formatter'
 require 'prometheus/client'
 require 'benchmark'
 
 module Fluent::Plugin
-  class SplunkOutput < Fluent::BufferedOutput
+  class SplunkOutput < Fluent::Plugin::Output
     helpers :formatter
 
     autoload :VERSION, 'fluent/plugin/out_splunk/version'
@@ -100,9 +99,9 @@ module Fluent::Plugin
         write_to_splunk(chunk)
       end
 
-      @metrics[:record_counter].increment(labels: metric_labels, by: chunk.size_of_events)
+      @metrics[:record_counter].increment(labels: metric_labels, by: chunk.size)
       @metrics[:bytes_counter].increment(labels: metric_labels, by: chunk.bytesize)
-      @metrics[:write_records_histogram].observe(chunk.size_of_events, labels: metric_labels)
+      @metrics[:write_records_histogram].observe(chunk.size, labels: metric_labels)
       @metrics[:write_bytes_histogram].observe(chunk.bytesize, labels: metric_labels, )
       @metrics[:write_latency_histogram].observe(t, labels: metric_labels, )
     end

data/lib/fluent/plugin/out_splunk_hec.rb

@@ -140,6 +140,10 @@ module Fluent::Plugin
       pick_custom_format_method
     end
 
+    def write(chunk)
+      super
+    end
+
     def start
       super
       @conn = Net::HTTP::Persistent.new.tap do |c|

data/lib/fluent/plugin/out_splunk_ingest_api.rb

@@ -41,6 +41,10 @@ module Fluent::Plugin
       super
     end
 
+    def write(chunk)
+      super
+    end
+
     def construct_api
       uri = "https://#{@ingest_api_host}/#{@ingest_api_tenant}#{@ingest_api_events_endpoint}"
       URI(uri)
@@ -101,7 +105,7 @@ module Fluent::Plugin
     end
 
     def write_to_splunk(chunk)
-      log.trace "#{self.class}: In write() with #{chunk.size_of_events} records and #{chunk.bytesize} bytes "
+      log.trace "#{self.class}: In write() with #{chunk.size} records and #{chunk.bytesize} bytes "
       # ingest API is an array of json objects
       body = "[#{chunk.read.chomp(',')}]"
       @conn ||= new_connection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-splunk-hec
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.12
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2022-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -221,13 +221,13 @@ signing_key:
 specification_version: 4
 summary: Fluentd plugin for Splunk HEC.
 test_files:
+- test/fluent/plugin/out_splunk_ingest_api_test.rb
+- test/fluent/plugin/out_splunk_hec_test.rb
 - test/test_helper.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/em_http_request_adapter.rb
 - test/lib/webmock/http_lib_adapters/excon_adapter.rb
+- test/lib/webmock/http_lib_adapters/em_http_request_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/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
+- test/lib/webmock/http_lib_adapters/http_rb_adapter.rb