fluent-plugin-splunkhec 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73ac781b3d7ac398bb6a036ac69e24a4d874a5ba
-  data.tar.gz: 23b30525291f733e9fd87f6a3e6c286154a8aeca
+  metadata.gz: 5ff30fbb8035137dcc3b486433f913d6bcfa0304
+  data.tar.gz: 1d0a89977149e5f35ec79118e810f3411b8b02b5
 SHA512:
-  metadata.gz: 59cec44df59a2c92ed4b5ca31303fa653c35658aadf9ea5b2b1704b8fa23c15e1397a6b6261ab4b65ce43f93aafbf52094064ba608dea999516956581ed45958
-  data.tar.gz: 2ae83c18ee9e770f3e0e77e4d5221e986dcbe1718caf8f09b869df383baff3535b22a96e36004a8b6e505f78f3d5483cd7161acdc66b575ae6581c9073dbdf13
+  metadata.gz: fa3fe65d909e44d36c3e5584932d9edd9273e4cc1bb8f477c82dadf23b7d49a38cad74f5aa06e5e8894c293798be048e52f581cd97846ef9cf5259e9d752057e
+  data.tar.gz: a7709397537d2a9d3227299a053d1c523f34e80052e573fa3298c307ac020af77cda99e42f3c38a5925ac272780515c2ba0c134ffd86d74d29ca9334f84e3402

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.4
+
+Fixed undefined conversion error from ASCII-8BIT to UTF-8 by swapping json gem for yajl as used by fluentd
+
 ## 1.3
 
 In case of error in the connection exception is raised and fluent will retry.

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.3"
+  gem.version       = "1.4"
   gem.authors       = "Coen Meerbeek"
   gem.email         = "cmeerbeek@gmail.com"
   gem.description   = %q{Output plugin for the Splunk HTTP Event Collector.}
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   
   gem.add_dependency "fluentd", [">= 0.10.58", "< 2"]
-  gem.add_dependency "json", '~> 2.0', '>= 2.0.2'
+  gem.add_dependency "yajl", '>= 0.3'
   gem.add_development_dependency "rake", '~> 0.9', '>= 0.9.2'
   gem.add_development_dependency "test-unit", '~> 3.1', '>= 3.1.0'
   gem.add_development_dependency "webmock", '>= 3.0'

data/lib/fluent/plugin/out_splunkhec.rb

@@ -1,6 +1,6 @@
 require 'fluent/output'
 require 'net/http'
-require 'json'
+require 'yajl/json_gem'
 
 module Fluent
   class SplunkHECOutput < BufferedOutput

data/test/plugin/test_out_splunkhec.rb

@@ -173,4 +173,17 @@ class SplunkHECOutputTest < Test::Unit::TestCase
     end
   end
 
+  def test_should_handle_ascii_8bit_encoded_message_with_utf8_chars_correctly
+    record = {'message' => "\xC2\xA92017".b}
+
+    splunk_request = stub_request(:post, SPLUNK_URL).with(body: hash_including({'event' => {'message' => '©2017'}}))
+
+    d = create_driver_splunkhec(CONFIG + %[send_event_as_json true])
+    d.run do
+      d.emit(record)
+    end
+
+    assert_requested(splunk_request)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-splunkhec
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Coen Meerbeek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -31,25 +31,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: yajl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement