fluent-plugin-sumologic_output 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 8fd43e4a8259784985b70eaac09c43346525f61d08c0383912f6434887a9aa03
-  data.tar.gz: 7f8a58eee2a297ca40cb7d599371040bf7225632de7dbc561710050e01d692a0
+SHA1:
+  metadata.gz: dcbd216a8cf0562bb6f63671fce22866b5742712
+  data.tar.gz: d45c48d3e5ea07f541658be70d85feffd1d910e6
 SHA512:
-  metadata.gz: e6436be0d5af2de4521319e7bee494cae41fc4b2052a54256317268ca02c2873bfc48060755ca7b361e21e69f633cca1a38aa255449ff72b21c0dfe2451b50ef
-  data.tar.gz: 5ee85c23b49b9608754e76342508ce9d4a7df0f1a35b4a82f8686b9eafb7264f8c09d1c736c8975b5fb61fa420b9efcb016bb6790aeb6f30f54c8b5e12a73500
+  metadata.gz: 7fa72775f5b1d684f1b7c89b24f546faca6d764e489dd35f06300724794a81534f1948b522b909c9d7ed9d516a17b9febd60c3b47cc2b2e83fe96815bc647b58
+  data.tar.gz: 6512a6a8835c8f81846d5f1c90c3330435b3b9f4eec286e24cf24ea6953835b01bc571c9a827ac9af0ea7e85144d17d644aa4bcb13beeada305b850e36196b4f

data/.travis.yml

@@ -0,0 +1,5 @@
+lang: ruby
+
+script: bundle exec rake
+
+rvm: 2.3

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file. Tracking did not begin until version 1.10.
 
+<a name="1.1.1"></a>
+# [1.1.1] (2018-07-12)
+
+  * if `record[@log_key]` is json, parse it as JSON and not as string.  
+
 <a name="1.1.0"></a>
 # [1.1.0] (2018-06-29)
 

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 group :test do
+  gem 'codecov'
   gem 'simplecov'
   gem 'webmock'
 end

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/SumoLogic/fluentd-output-sumologic.svg?branch=master)](https://travis-ci.org/SumoLogic/fluentd-output-sumologic) ![](https://ruby-gem-downloads-badge.herokuapp.com/fluent-plugin-sumologic_output?type=total) [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/SumoLogic/fluentd-output-sumologic/issues)
+
 # fluent-plugin-sumologic_output, a plugin for [Fluentd](http://fluentd.org)
 
 This plugin has been designed to output logs or metrics to [SumoLogic](http://www.sumologic.com) via a [HTTP collector endpoint](http://help.sumologic.com/Send_Data/Sources/02Sources_for_Hosted_Collectors/HTTP_Source)
@@ -7,7 +9,10 @@ This plugin has been designed to output logs or metrics to [SumoLogic](http://ww
 | In keeping with industry standard security best practices, as of May 31, 2018, the Sumo Logic service will only support TLS version 1.2 going forward. Verify that all connections to Sumo Logic endpoints are made from software that supports TLS 1.2. |
 
 ## Support
-The code in this repository has been contributed by the Sumo Logic community and is not officially supported by Sumo Logic. For any issues or questions please submit an issue through GitHub or start a conversation within the [Sumo Logic Community](https://community.sumologic.com) forums.  The maintainers of this project will work directly with the community to answer any questions, address bugs, or review any requests for new features. 
+The code in this repository has been developed in collaboration with the Sumo Logic community and is not supported via standard Sumo Logic Support channels. For any issues or questions please submit an issue directly on GitHub. The maintainers of this project will work directly with the community to answer any questions, address bugs, or review any requests for new features.
+
+## License
+Released under Apache 2.0 License. 
 
 ## Installation
 

data/fluent-plugin-sumologic_output.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-sumologic_output"
-  gem.version       = "1.1.0"
+  gem.version       = "1.1.1"
   gem.authors       = ["Steven Adams", "Frank Reno"]
   gem.email         = ["stevezau@gmail.com", "frank.reno@me.com"]
   gem.description   = %q{Output plugin to SumoLogic HTTP Endpoint}
@@ -22,7 +22,8 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "bundler", "~> 1.3"
   gem.add_development_dependency "rake"
-  gem.add_runtime_dependency "fluentd", ">= 0.14.0"
   gem.add_development_dependency 'test-unit', '~> 3.1.0'
+  gem.add_development_dependency "codecov", ">= 0.1.10"
+  gem.add_runtime_dependency "fluentd", ">= 0.14.0"
   gem.add_runtime_dependency 'httpclient', '~> 2.8.0'
 end

data/lib/fluent/plugin/out_sumologic.rb

@@ -150,7 +150,14 @@ class Fluent::Plugin::Sumologic < Fluent::Plugin::Output
   # Strip sumo_metadata and dump to json
   def dump_log(log)
     log.delete('_sumo_metadata')
-    Yajl.dump(log)
+    begin
+      parser = Yajl::Parser.new
+      hash = parser.parse(log[@log_key])
+      log[@log_key] = hash
+      Yajl.dump(log)
+    rescue
+      Yajl.dump(log)
+    end
   end
 
   def format(tag, time, record)

data/test/helper.rb

@@ -1,3 +1,11 @@
+require 'simplecov'
+SimpleCov.start
+
+if ENV['CI'] == 'true'
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+end
+
 $LOAD_PATH.unshift(File.expand_path("../../", __FILE__))
 require "test-unit"
 require "fluent/test"

data/test/plugin/test_out_sumologic.rb

@@ -161,6 +161,48 @@ class SumologicOutput < Test::Unit::TestCase
                      times:1
   end
 
+  def test_emit_json_double_encoded
+    config = %{
+      endpoint        https://endpoint3.collection.us2.sumologic.com/receiver/v1/http/1234
+      log_format      json
+      source_category test
+      source_host     test
+      source_name     test
+
+    }
+    driver = create_driver(config)
+    time = event_time
+    stub_request(:post, 'https://endpoint3.collection.us2.sumologic.com/receiver/v1/http/1234')
+    driver.run do
+      driver.feed("output.test", time, {'message' => '{"bar":"foo"}'})
+    end
+    assert_requested :post, "https://endpoint3.collection.us2.sumologic.com/receiver/v1/http/1234",
+                     headers: {'X-Sumo-Category'=>'test', 'X-Sumo-Client'=>'fluentd-output', 'X-Sumo-Host'=>'test', 'X-Sumo-Name'=>'test'},
+                     body: /\A{"timestamp":\d+.,"message":{"bar":"foo"}}\z/,
+                     times:1
+  end
+
+  def test_emit_text_format_as_json
+    config = %{
+      endpoint        https://endpoint3.collection.us2.sumologic.com/receiver/v1/http/1234
+      log_format      json
+      source_category test
+      source_host     test
+      source_name     test
+
+    }
+    driver = create_driver(config)
+    time = event_time
+    stub_request(:post, 'https://endpoint3.collection.us2.sumologic.com/receiver/v1/http/1234')
+    driver.run do
+      driver.feed("output.test", time, {'message' => 'some message'})
+    end
+    assert_requested :post, "https://endpoint3.collection.us2.sumologic.com/receiver/v1/http/1234",
+                     headers: {'X-Sumo-Category'=>'test', 'X-Sumo-Client'=>'fluentd-output', 'X-Sumo-Host'=>'test', 'X-Sumo-Name'=>'test'},
+                     body: /\A{"timestamp":\d+.,"message":"some message"}\z/,
+                     times:1
+  end
+
   def test_emit_json_merge
     config = %{
       endpoint        https://collectors.sumologic.com/v1/receivers/http/1234

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sumologic_output
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Steven Adams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,33 +40,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fluentd
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :runtime
+        version: 0.1.10
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.1.10
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
+        version: 0.14.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +104,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -119,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Output plugin to SumoLogic HTTP Endpoint