fluent-plugin-sumologic_output 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89b0eebb156a64156ad58009ff550b01d9f78aa3
-  data.tar.gz: c49627b56d91fc0e1e51e7facab6d1d2e04e1a4f
+  metadata.gz: 129fc1c24fc6e1ac2b446b80fdfc7ac5165b7986
+  data.tar.gz: b9f01bee4b86185e306c7155c228a54cde730145
 SHA512:
-  metadata.gz: 72a0fd6a22f47a28224db09a27fe1e860d6625736e53a48b70dc8c02904ded8c592e570335ca49c3e43db598355a2dfee05215469086eb133bc9661c84885981
-  data.tar.gz: ec2c811665dd7587e459960f574ead7de4b32f4289bb124d2d7d071242abfa93b5d374860c4fb477b9efb2e9b5719d7cdb47dff3685b1b647d2cd7cc78b72b63
+  metadata.gz: e64e61a98fd1a39122b11661cdd3dd03507a0f5968700f69042604ff26ff0eb34d4d8095b46390fbc30d758570314b8b346b105a3affb9c4b63164b50a0ee953
+  data.tar.gz: 1b41b319196744540f98839e5f6d04d670fbfa492b31d6594868c76e193bf075f7c78eb180494b5e69bf1306bb174f8ab78f34cbd24ff841f681e33c12206063

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. Tracking did not begin until version 1.10.
 
+<a name="1.4.0"></a>
+# [1.4.0] (2019-01-16)
+
+* [Add timestamp_key, prefer log message when merging](https://github.com/SumoLogic/fluentd-output-sumologic/pull/37)
+
+<a name="1.3.2"></a>
+# [1.3.2] (2018-12-05)
+
+* Fix verify SSL bug
+
 <a name="1.3.1"></a>
 # [1.3.1] (2018-08-30)
 

data/README.md

@@ -31,7 +31,8 @@ Configuration options for fluent.conf are:
   * json_merge - Same as json but merge content of `log_key` into the top level and strip `log_key`
 * `log_key` - Used to specify the key when merging json or sending logs in text format (default `message`)
 * `open_timeout` - Set timeout seconds to wait until connection is opened.
-* `add_timestamp` - Add `timestamp` field to logs before sending to sumologic (default `true`)
+* `add_timestamp` - Add `timestamp` (or `timestamp_key`) field to logs before sending to sumologic (default `true`)
+* `timestamp_key` - Field name when `add_timestamp` is on (default `timestamp`)
 * `proxy_uri` - Add the `uri` of the `proxy` environment if present.
 * `metric_data_format` - The format of metrics you will be sending, either `graphite` or `carbon2` (Default is `graphite `)
 * `disable_cookies` - Option to disable cookies on the HTTP Client. (Default is `false `)

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.3.2 "
+  gem.version       = "1.4.0"
   gem.authors       = ["Steven Adams", "Frank Reno"]
   gem.email         = ["stevezau@gmail.com", "frank.reno@me.com"]
   gem.description   = %q{Output plugin to SumoLogic HTTP Endpoint}
@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0.0'
 
-  gem.add_development_dependency "bundler", "~> 1.3"
+  gem.add_development_dependency "bundler", "~> 2"
   gem.add_development_dependency "rake"
   gem.add_development_dependency 'test-unit', '~> 3.1.0'
   gem.add_development_dependency "codecov", ">= 0.1.10"

data/lib/fluent/plugin/out_sumologic.rb

@@ -80,6 +80,7 @@ class Fluent::Plugin::Sumologic < Fluent::Plugin::Output
   config_param :delimiter, :string, :default => "."
   config_param :open_timeout, :integer, :default => 60
   config_param :add_timestamp, :bool, :default => true
+  config_param :timestamp_key, :string, :default => 'timestamp'
   config_param :proxy_uri, :string, :default => nil
   config_param :disable_cookies, :bool, :default => false
 
@@ -145,7 +146,7 @@ class Fluent::Plugin::Sumologic < Fluent::Plugin::Output
       log = record[@log_key].strip
       if log[0].eql?('{') && log[-1].eql?('}')
         begin
-          record = JSON.parse(log).merge(record)
+          record = record.merge(JSON.parse(log))
           record.delete(@log_key)
         rescue JSON::ParserError
           # do nothing, ignore
@@ -255,12 +256,12 @@ class Fluent::Plugin::Sumologic < Fluent::Plugin::Output
           end
         when 'json_merge'
           if @add_timestamp
-            record = { :timestamp => sumo_timestamp(time) }.merge(record)
+            record = { @timestamp_key => sumo_timestamp(time) }.merge(record)
           end
           log = dump_log(merge_json(record))
         else
           if @add_timestamp
-            record = { :timestamp => sumo_timestamp(time) }.merge(record)
+            record = { @timestamp_key => sumo_timestamp(time) }.merge(record)
           end
           log = dump_log(record)
         end

data/test/plugin/test_out_sumologic.rb

@@ -69,6 +69,7 @@ class SumologicOutput < Test::Unit::TestCase
     assert_equal instance.delimiter, '.'
     assert_equal instance.open_timeout, 60
     assert_equal instance.add_timestamp, true
+    assert_equal instance.timestamp_key, 'timestamp'
     assert_equal instance.proxy_uri, nil
     assert_equal instance.disable_cookies, false
   end
@@ -174,7 +175,28 @@ class SumologicOutput < Test::Unit::TestCase
     end
     assert_requested :post, "https://collectors.sumologic.com/v1/receivers/http/1234",
                      headers: {'X-Sumo-Category'=>'test', 'X-Sumo-Client'=>'fluentd-output', 'X-Sumo-Host'=>'test', 'X-Sumo-Name'=>'test'},
-                     body: /\A{"foo2":"bar2","timestamp":\d+,"foo":"bar"}\z/,
+                     body: /\A{"timestamp":\d+,"foo":"bar","foo2":"bar2"}\z/,
+                     times:1
+  end
+
+  def test_emit_json_merge_timestamp
+    config = %{
+      endpoint        https://collectors.sumologic.com/v1/receivers/http/1234
+      log_format      json_merge
+      source_category test
+      source_host     test
+      source_name     test
+
+    }
+    driver = create_driver(config)
+    time = event_time
+    stub_request(:post, 'https://collectors.sumologic.com/v1/receivers/http/1234')
+    driver.run do
+      driver.feed("output.test", time, {'message' => '{"timestamp":123}'})
+    end
+    assert_requested :post, "https://collectors.sumologic.com/v1/receivers/http/1234",
+                     headers: {'X-Sumo-Category'=>'test', 'X-Sumo-Client'=>'fluentd-output', 'X-Sumo-Host'=>'test', 'X-Sumo-Name'=>'test'},
+                     body: /\A{"timestamp":123}\z/,
                      times:1
   end
 
@@ -221,6 +243,27 @@ class SumologicOutput < Test::Unit::TestCase
                      times:1
   end
 
+  def test_emit_json_timestamp_key
+    config = %{
+      endpoint        https://collectors.sumologic.com/v1/receivers/http/1234
+      log_format      json
+      source_category test
+      source_host     test
+      source_name     test
+      timestamp_key   ts
+    }
+    driver = create_driver(config)
+    time = event_time
+    stub_request(:post, 'https://collectors.sumologic.com/v1/receivers/http/1234')
+    driver.run do
+      driver.feed("output.test", time, {'message' => 'test'})
+    end
+    assert_requested :post, "https://collectors.sumologic.com/v1/receivers/http/1234",
+                     headers: {'X-Sumo-Category'=>'test', 'X-Sumo-Client'=>'fluentd-output', 'X-Sumo-Host'=>'test', 'X-Sumo-Name'=>'test'},
+                     body: /\A{"ts":\d+.,"message":"test"}\z/,
+                     times:1
+  end
+
   def test_emit_graphite
     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.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Steven Adams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-06 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Output plugin to SumoLogic HTTP Endpoint