fluent-plugin-splunkhec 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9180a1fe84fc9e92e0bd1cc7f190030fc66ac82
-  data.tar.gz: 14530543bf7ad149b53c698ffde814717fa87ffa
+  metadata.gz: 73ac781b3d7ac398bb6a036ac69e24a4d874a5ba
+  data.tar.gz: 23b30525291f733e9fd87f6a3e6c286154a8aeca
 SHA512:
-  metadata.gz: 6d9c296da32fa4c7c5905e62d912a9459fbdefb5f513c92b19caac58f08630ebba80552f6d36474359edfb380c8093d0adb5e43d1d532fda335cab7757af70ba
-  data.tar.gz: b473a7be07fd74d4f50ab81218a8e9dc07cfb598f70637fdb9e5a0c25d8361c0ee199382b90af3964dd097e281e311dd21df2f150ee670849935854324df7155
+  metadata.gz: 59cec44df59a2c92ed4b5ca31303fa653c35658aadf9ea5b2b1704b8fa23c15e1397a6b6261ab4b65ce43f93aafbf52094064ba608dea999516956581ed45958
+  data.tar.gz: 2ae83c18ee9e770f3e0e77e4d5221e986dcbe1718caf8f09b869df383baff3535b22a96e36004a8b6e505f78f3d5483cd7161acdc66b575ae6581c9073dbdf13

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3
+
+In case of error in the connection exception is raised and fluent will retry.
+
 ## 1.2
 
 - Improved unit test coverage

data/fluent-plugin-splunkhec.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-splunkhec"
-  gem.version       = "1.2"
+  gem.version       = "1.3"
   gem.authors       = "Coen Meerbeek"
   gem.email         = "cmeerbeek@gmail.com"
   gem.description   = %q{Output plugin for the Splunk HTTP Event Collector.}

data/lib/fluent/plugin/out_splunkhec.rb

@@ -54,49 +54,44 @@ module Fluent
 
     # Loop through all records and sent them to Splunk
     def write(chunk)
-      begin
-        body = ''
-        chunk.msgpack_each {|(tag,time,record)|
-          # Parse record to Splunk event format
-          case record
-          when Fixnum
-            event = record.to_s
-          when Hash
-            if @send_event_as_json
-              event = record.to_json
-            else
-              event = record.to_json.gsub("\"", %q(\\\"))
-            end
+      body = ''
+      chunk.msgpack_each {|(tag,time,record)|
+        # Parse record to Splunk event format
+        case record
+        when Fixnum
+          event = record.to_s
+        when Hash
+          if @send_event_as_json
+            event = record.to_json
           else
-            event = record
+            event = record.to_json.gsub("\"", %q(\\\"))
           end
+        else
+          event = record
+        end
 
-          sourcetype = @sourcetype == 'tag' ? tag : @sourcetype
-
-          # Build body for the POST request
-          if !@usejson
-            event = record["time"]+ " " + record["message"].to_json.gsub(/^"|"$/,"")
-            body << '{"time":"'+ DateTime.parse(record["time"]).strftime("%Q") +'", "event":"' + event + '", "sourcetype" :"' + sourcetype + '", "source" :"' + @source + '", "index" :"' + @index + '", "host" : "' + @event_host + '"}'
-          elsif @send_event_as_json
-            body << '{"time" :' + time.to_s + ', "event" :' + event + ', "sourcetype" :"' + sourcetype + '", "source" :"' + @source + '", "index" :"' + @index + '", "host" : "' + @event_host + '"}'
-          else
-            body << '{"time" :' + time.to_s + ', "event" :"' + event + '", "sourcetype" :"' + sourcetype + '", "source" :"' + @source + '", "index" :"' + @index + '", "host" : "' + @event_host + '"}'
-          end
+        sourcetype = @sourcetype == 'tag' ? tag : @sourcetype
 
-          if @send_batched_events
-            body << "\n"
-          else
-            send_to_splunk(body)
-            body = ''
-          end
-        }
+        # Build body for the POST request
+        if !@usejson
+          event = record["time"]+ " " + record["message"].to_json.gsub(/^"|"$/,"")
+          body << '{"time":"'+ DateTime.parse(record["time"]).strftime("%Q") +'", "event":"' + event + '", "sourcetype" :"' + sourcetype + '", "source" :"' + @source + '", "index" :"' + @index + '", "host" : "' + @event_host + '"}'
+        elsif @send_event_as_json
+          body << '{"time" :' + time.to_s + ', "event" :' + event + ', "sourcetype" :"' + sourcetype + '", "source" :"' + @source + '", "index" :"' + @index + '", "host" : "' + @event_host + '"}'
+        else
+          body << '{"time" :' + time.to_s + ', "event" :"' + event + '", "sourcetype" :"' + sourcetype + '", "source" :"' + @source + '", "index" :"' + @index + '", "host" : "' + @event_host + '"}'
+        end
 
         if @send_batched_events
+          body << "\n"
+        else
           send_to_splunk(body)
+          body = ''
         end
-      rescue => err
-        log.fatal("splunkhec: caught exception; exiting")
-        log.fatal(err)
+      }
+
+      if @send_batched_events
+        send_to_splunk(body)
       end
     end
 
@@ -126,8 +121,16 @@ module Fluent
       res = http.request(req)
       log.debug "splunkhec: response HTTP Status Code is #{res.code}"
       if res.code.to_i != 200
-        log.debug "splunkhec: response body is #{res.body}"
+        body = JSON.parse(res.body)
+        raise SplunkHECOutputError.new(body['text'], body['code'], body['invalid-event-number'], res.code)
       end
     end
   end
+
+  class SplunkHECOutputError < StandardError
+    def initialize(message, status_code, invalid_event_number, http_status_code)
+      super("#{message} (http status code #{http_status_code}, status code #{status_code}, invalid event number #{invalid_event_number})")
+    end
+  end
+
 end

data/test/plugin/test_out_splunkhec.rb

@@ -162,4 +162,15 @@ class SplunkHECOutputTest < Test::Unit::TestCase
     assert_requested(splunk_request)
   end
 
+  def test_should_raise_exception_when_splunk_returns_error_to_make_fluentd_retry_later
+    stub_request(:any, SPLUNK_URL).to_return(status: 403, body: {'text' => 'Token disabled', 'code' => 1}.to_json)
+
+    assert_raise Fluent::SplunkHECOutputError do
+      d = create_driver_splunkhec
+      d.run do
+        d.emit({'message' => 'data'})
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-splunkhec
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Coen Meerbeek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd