fluent-plugin-splunkhec 1.5 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50c536d1beb651de8fed9c640f5cd7ca52e00122
-  data.tar.gz: f3c8209e5ec60d362f5e79dfc9212f1c274fec03
+  metadata.gz: 55b9a5e86477b6fda1429bdbb9f57adbdef3688d
+  data.tar.gz: 4c06e39f92558b8e7b21acdfbda06eda1a4734f5
 SHA512:
-  metadata.gz: 83b8cfe1ec912ef74d5ffdbc93fdd2fb009fb2b5be683b3afae7b37b64d7fbb5d07efe8922878d502bb2ef7519a37418c47cbf99a85cc73a0d66bf80cc0d49fa
-  data.tar.gz: 6e5631db1d251c4eb94b2bc3ca0eee619beec69cecd0bd2c697119e926852cf15c24a5d45fb738515451793a8237cb1f858332fca31145463e2be1762daa5cdd
+  metadata.gz: afdbea0ed8ad15825cb90159600b731ad4d2160f89c0aa86430b17aaa430100708261a66f5b7ccbf4020996fd7e0ab32b1c309fa91e069b91b766a7ba2c0f760
+  data.tar.gz: 34b0f43b99e6130f9080c86eabe70545a7565c3e8b0add5b3e3adcd2d160754c9ef36b41f71e1b05a6802cb3df13195f61997b55a5154d198c24e3da15efb637

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+
+## 1.6
+
+- changed tag from sourcetype to source
+- improved ruby net HTTP implementation
+
 ## 1.5
 
 - changed yajl dependency to yajl-ruby 1.3.0 or above

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.5"
+  gem.version       = "1.6"
   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

@@ -15,8 +15,8 @@ module Fluent
     # Splunk event parameters
     config_param :index,               :string, :default => 'main'
     config_param :event_host,          :string, :default => nil
-    config_param :source,              :string, :default => 'fluentd'
-    config_param :sourcetype,          :string, :default => 'tag'
+    config_param :source,              :string, :default => 'tag'
+    config_param :sourcetype,          :string, :default => 'fluentd'
     config_param :send_event_as_json,  :bool,   :default => false
     config_param :usejson,             :bool,   :default => true
     config_param :send_batched_events, :bool,   :default => false
@@ -27,7 +27,7 @@ module Fluent
     def configure(conf)
       super
       @splunk_url = @protocol + '://' + @host + ':' + @port + '/services/collector/event'
-      log.debug 'splunkhec: sent data to ' + @splunk_url
+      log.info 'splunkhec: sent data to ' + @splunk_url
 
       if conf['event_host'] == nil
         begin
@@ -69,17 +69,17 @@ module Fluent
         else
           event = record
         end
-
-        sourcetype = @sourcetype == 'tag' ? tag : @sourcetype
+        
+        source = @source == 'tag' ? tag : @source
 
         # 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 + '"}'
+          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 + '"}'
+          body << '{"time" :' + time.to_s + ', "event" :"' + event + '", "sourcetype" :"' + sourcetype + '", "source" :"' + source + '", "index" :"' + @index + '", "host" : "' + @event_host + '"}'
         end
 
         if @send_batched_events
@@ -103,23 +103,23 @@ module Fluent
       # Create client
       http = Net::HTTP.new(uri.host, uri.port)
 
-      # Create Request
-      req = Net::HTTP::Post.new(uri)
-      # Add headers
-      req.add_field "Authorization", "Splunk #{@token}"
-      # Add headers
-      req.add_field "Content-Type", "application/json; charset=utf-8"
-      # Set body
+      # Create request
+      req = Net::HTTP::Post.new(uri, "Content-Type" => "application/json", "Authorization" => "Splunk #{@token}")
       req.body = body
+
       # Handle SSL
       if @protocol == 'https'
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
 
-      # Fetch Request
-      res = http.request(req)
-      log.debug "splunkhec: response HTTP Status Code is #{res.code}"
+      # Send Request
+      res = Net::HTTP.start(uri.hostname, uri.port) do |http|
+        http.request(req)
+      end
+
+      log.debug "splunkhec: HTTP Response Status Code is #{res.code}"
+
       if res.code.to_i != 200
         body = JSON.parse(res.body)
         raise SplunkHECOutputError.new(body['text'], body['code'], body['invalid-event-number'], res.code)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-splunkhec
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: '1.6'
 platform: ruby
 authors:
 - Coen Meerbeek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd