fluent-plugin-splunk-enterprise 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 737754c6ef96188a8f3e47f46483e8afdbbcd76e18cbd530e886f133792ce71e
-  data.tar.gz: ece8395ec3cf8a6c97fdcc1b8d3e9c24878a8349a736ce64726cf52e99b3476a
+  metadata.gz: ad554abb4e6186db6ab6a9354dfeff678bd637c0d34592d4f1788d38f75c88b0
+  data.tar.gz: 1696399b7d279981df465bb09f491ad14afc0e3a579c958c82468c2e000912b7
 SHA512:
-  metadata.gz: 8573eaec3238c68582205d7193eecc48521be4db23b4a1791b5d482f079a6fb116dd2ea85008b34565942b3d7d39b300f6b611807fe01300efc9aea73e4f89c8
-  data.tar.gz: 42a841e039ccaa59fe4aa801ca9a43b18bcd9e1a20292cedfa91e1a5a33d6679b09f9112f21c56b0404ff06867c182acc20fa4c4914b174ac696a80e89db8eba
+  metadata.gz: 5cfbdadc415eca4f236b3d23e346ab8493587ceb543998dc1fc911888c8cd2410db9e204aaea5e7713534716d54e021acc0a45072abb1c36f5d1e70c86511aca
+  data.tar.gz: acda153e664dde3752e8c63e66878d15cc857a00e7f68114366e4dba46cb069c804ed6e205ca33dcc13b8de46c36984103e96e64d7843d8f91cb56bd1b1e967b

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# Release v0.10.3 - 2026/04/30
+
+* out_splunk_hec: mask token value as secret (#43)
+* out_splunk_hec: Discard empty events - Splunk hec gives an error if the string is empty. This can lead to a retry loop. (#38)
+
+# Release v0.10.2 - 2020/03/04
+
+* out_splunk_hec: Add `auto_generate_channel` parameter
+
 # Release v0.10.1 - 2020/03/03
 
 * output: Support v1 multi-workers

data/README.hec.md

@@ -10,7 +10,7 @@
    * [token (required)](#token-required)
    * [default_host](#default_host)
    * [host_key](#host_key)
-   * [defaout_source](#defaout_source)
+   * [default_source](#default_source)
    * [source_key](#source_key)
    * [default_index](#default_index)
    * [index_key](#index_key)
@@ -22,6 +22,7 @@
    * [time_as_integer](#time_as_integer) 
    * [use_ack](#use_ack)
    * [channel](#channel)
+   * [auto_generate_channel](#auto_generate_channel)
    * [ack_interval](#ack_interval)
    * [ack_retry_limit](#ack_retry_limit)
    * [raw](#raw)
@@ -151,6 +152,11 @@ Enable/Disable [Indexer acknowledgement](https://www.google.co.jp/search?q=splun
 This is used as [channel identifier](http://dev.splunk.com/view/event-collector/SP-CAAAE8X#aboutchannels).
  When you set `use_ack` or `raw`, this parameter is required.
 
+### auto_generate_channel
+ The default: `false`
+
+ This is used as auto generate channel, channel param is ignored if this param is set to true.
+
 ### ack_interval
 
 The default: `1`

data/fluent-plugin-splunk-enterprise.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-splunk-enterprise"
-  spec.version       = "0.10.1"
+  spec.version       = "0.10.3"
   spec.authors       = ["Yuki Ito", "Masahiro Nakagawa"]
   spec.email         = ["yito@treasure-data.com", "repeatedly@gmail.com"]
 

data/lib/fluent/plugin/out_splunk_hec.rb

@@ -1,6 +1,7 @@
 require 'fluent/output'
 require 'httpclient'
 require 'json'
+require 'securerandom'
 
 # http://dev.splunk.com/view/event-collector/SP-CAAAE6P
 
@@ -10,7 +11,7 @@ module Fluent
 
     config_param :host, :string
     config_param :port, :integer
-    config_param :token, :string
+    config_param :token, :string, secret: true
 
     # for metadata
     config_param :default_host, :string, default: nil
@@ -31,6 +32,7 @@ module Fluent
     # for Indexer acknowledgement
     config_param :use_ack, :bool, default: false
     config_param :channel, :string, default: nil
+    config_param :auto_generate_channel, :bool, default: false
     config_param :ack_interval, :integer, default: 1
     config_param :ack_retry_limit, :integer, default: 3
 
@@ -51,6 +53,13 @@ module Fluent
 
     def configure(conf)
       super
+
+      if @channel && @auto_generate_channel 
+        log.warn "Both channel and auto_generate_channel are set.. ignoring channel param and auto generating channel instead"
+      end
+
+      @channel = SecureRandom.uuid if @auto_generate_channel
+
       raise ConfigError, "'channel' parameter is required when 'use_ack' is true" if @use_ack && !@channel
       raise ConfigError, "'ack_interval' parameter must be a non negative integer" if @use_ack && @ack_interval < 0
       raise ConfigError, "'event_key' parameter is required when 'raw' is true" if @raw && !@event_key
@@ -144,7 +153,12 @@ module Fluent
     end
 
     def format_event_raw(record)
-      (record[@event_key] || '') + @line_breaker
+      if record[@event_key] and not record[@event_key].strip.empty?
+        record[@event_key] + @line_breaker
+      else
+        log.debug "Discarding empty line"
+        ''
+      end
     end
 
     def post(path, body, query = {})

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-splunk-enterprise
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.3
 platform: ruby
 authors:
 - Yuki Ito
 - Masahiro Nakagawa
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -121,7 +120,6 @@ homepage: ''
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -136,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Splunk output plugin for Fluentd
 test_files: []