fluent-plugin-splunkhec 1.6 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55b9a5e86477b6fda1429bdbb9f57adbdef3688d
-  data.tar.gz: 4c06e39f92558b8e7b21acdfbda06eda1a4734f5
+  metadata.gz: 64bafb9078216f8761e88b562441c73861fa0b20
+  data.tar.gz: 79933b686c1619ac6ddd79789df0034fd2ec8403
 SHA512:
-  metadata.gz: afdbea0ed8ad15825cb90159600b731ad4d2160f89c0aa86430b17aaa430100708261a66f5b7ccbf4020996fd7e0ab32b1c309fa91e069b91b766a7ba2c0f760
-  data.tar.gz: 34b0f43b99e6130f9080c86eabe70545a7565c3e8b0add5b3e3adcd2d160754c9ef36b41f71e1b05a6802cb3df13195f61997b55a5154d198c24e3da15efb637
+  metadata.gz: 89d43832331ea520882e0129cddaea6942a0cc1c9453d3a4ea6997d174f47791f86663797c8966cdcf1785b370354f12945ead0933c02fbaedda34c551cefa0b
+  data.tar.gz: 9ffe57c6011cdf2a349695a05534513c2d216eba7e984a6d980ab43a63cfd79825bf48ed11877aa3d265d18a3abe48435faba86d6ccbe222245885d21c197545

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.4
+script:
+  - "bundle exec rake"

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.7
+
+- Fixed HTTP request (removed verify none)
+- udpated testscript
+- implemented travis.yml
 
 ## 1.6
 

data/Gemfile.lock

@@ -0,0 +1,62 @@
+PATH
+  remote: .
+  specs:
+    fluent-plugin-splunkhec (1.5)
+      fluentd (>= 0.10.58, < 2)
+      yajl-ruby (>= 1.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    cool.io (1.5.3)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    dig_rb (1.0.1)
+    fluentd (1.2.0)
+      cool.io (>= 1.4.5, < 2.0.0)
+      dig_rb (~> 1.0.0)
+      http_parser.rb (>= 0.5.1, < 0.7.0)
+      msgpack (>= 0.7.0, < 2.0.0)
+      serverengine (>= 2.0.4, < 3.0.0)
+      sigdump (~> 0.2.2)
+      strptime (>= 0.2.2, < 1.0.0)
+      tzinfo (~> 1.0)
+      tzinfo-data (~> 1.0)
+      yajl-ruby (~> 1.0)
+    hashdiff (0.3.7)
+    http_parser.rb (0.6.0)
+    msgpack (1.2.4)
+    power_assert (1.1.1)
+    public_suffix (3.0.2)
+    rake (0.9.6)
+    safe_yaml (1.0.4)
+    serverengine (2.0.6)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    strptime (0.2.3)
+    test-unit (3.2.7)
+      power_assert
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2018.5)
+      tzinfo (>= 1.0.0)
+    webmock (3.4.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    yajl-ruby (1.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fluent-plugin-splunkhec!
+  rake (~> 0.9, >= 0.9.2)
+  test-unit (~> 3.1, >= 3.1.0)
+  webmock (>= 3.0)
+
+BUNDLED WITH
+   1.16.1

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.6"
+  gem.version       = "1.7"
   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

@@ -58,7 +58,7 @@ module Fluent
       chunk.msgpack_each {|(tag,time,record)|
         # Parse record to Splunk event format
         case record
-        when Fixnum
+        when Integer
           event = record.to_s
         when Hash
           if @send_event_as_json
@@ -69,7 +69,7 @@ module Fluent
         else
           event = record
         end
-        
+
         source = @source == 'tag' ? tag : @source
 
         # Build body for the POST request
@@ -104,19 +104,16 @@ module Fluent
       http = Net::HTTP.new(uri.host, uri.port)
 
       # Create request
-      req = Net::HTTP::Post.new(uri, "Content-Type" => "application/json", "Authorization" => "Splunk #{@token}")
+      req = Net::HTTP::Post.new(uri, "Content-Type" => "application/json; charset=utf-8", "Authorization" => "Splunk #{@token}")
       req.body = body
 
       # Handle SSL
       if @protocol == 'https'
         http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
 
       # Send Request
-      res = Net::HTTP.start(uri.hostname, uri.port) do |http|
-        http.request(req)
-      end
+      res = http.request(req)
 
       log.debug "splunkhec: HTTP Response Status Code is #{res.code}"
 

data/test/plugin/test_out_splunkhec.rb

@@ -48,8 +48,8 @@ class SplunkHECOutputTest < Test::Unit::TestCase
     assert_equal '8088', d.instance.port
     assert_equal 'main', d.instance.index
     assert_equal `hostname`.delete!("\n"), d.instance.event_host
-    assert_equal 'fluentd', d.instance.source
-    assert_equal 'tag', d.instance.sourcetype
+    assert_equal 'fluentd', d.instance.sourcetype
+    assert_equal 'tag', d.instance.source
     assert_equal false, d.instance.send_event_as_json
     assert_equal true, d.instance.usejson
     assert_equal false, d.instance.send_batched_events
@@ -73,7 +73,7 @@ class SplunkHECOutputTest < Test::Unit::TestCase
                          .with(
                              headers: {
                                  'Authorization' => "Splunk #{TOKEN}",
-                                 'Content-Type' => 'application/json; charset=utf-8'
+                                 'Content-Type' => 'application/json; charset=utf-8',
                              },
                              body: {
                                  'time' => time,
@@ -95,7 +95,7 @@ class SplunkHECOutputTest < Test::Unit::TestCase
   def test_should_use_tag_as_sourcetype_when_configured
     splunk_request = stub_request(:post, SPLUNK_URL).with(body: hash_including({'sourcetype' => 'test'}))
 
-    d = create_driver_splunkhec(CONFIG + %[sourcetype tag])
+    d = create_driver_splunkhec(CONFIG + %[sourcetype test])
     d.run do
       d.emit({'message' => 'data'}, 123456)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-splunkhec
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: '1.7'
 platform: ruby
 authors:
 - Coen Meerbeek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -104,8 +104,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile