fluent-plugin-sumologic_output 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbc3e6090c1c01b886a60cfa29ffc2d378aa1151a2cfeb1e192bf067810d15eb
-  data.tar.gz: 7a3c9f00aab9018734c01b1df56b4cac7727fe9612796cedd626eb07ab8c8865
+  metadata.gz: ee7eb500042638028434c901c3c3e652de4d35f4ba1c8cb761cbfcdb4389b3e8
+  data.tar.gz: 73f39ef5c7b68b87ef9f905112db5f0b5d486e22949805d434a642ea4e705be9
 SHA512:
-  metadata.gz: 2052a8867e338718c573a5d62760bd700d6fc859933bdd704ed9de85105aaae02082cd4204892ffc17358389d485de8709ccb2583c1b40493401098d3be375f0
-  data.tar.gz: 0b301be091e054f5c37b29e7913d77f96e61886aa810a49c917df221079b2beaf7c20cb684baa642abd7c83c4c7e6a7ae770d8f0060998f24616873632fa1b10
+  metadata.gz: efc15f8cbcfb7dd359aade9136acb15fcd517e5ca1c337cf20a9b6d9eb62b0aad24ffc042abfc7ad45563704f83958e51d004520115abef758ef03bd08ee6fc7
+  data.tar.gz: 0dba800ca871ae625e56ea69133bcd7ec937f15ba2f685cd1a5dc2699d082565d9319796b507d4dc09612bcca0d8bc4caf3969f57ecf1df8ce34100c01210134

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file. Tracking did not begin until version 1.10.
 
+<a name="1.3.0"></a>
+# [1.3.0] (2018-08-08)
+
 <a name="1.2.0"></a>
 # [1.2.0] (2018-07-18)
 

data/README.md

@@ -38,6 +38,7 @@ Configuration options for fluent.conf are:
 * `add_timestamp` - Add `timestamp` field to logs before sending to sumologic (default `true`)
 * `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 `)
 
 ### Example Configuration
 Reading from the JSON formatted log files with `in_tail` and wildcard filenames:

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.2.0"
+  gem.version       = "1.3.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}

data/lib/fluent/plugin/out_sumologic.rb

@@ -7,9 +7,9 @@ class SumologicConnection
 
   attr_reader :http
 
-  def initialize(endpoint, verify_ssl, connect_timeout, proxy_uri)
+  def initialize(endpoint, verify_ssl, connect_timeout, proxy_uri, disable_cookies)
     @endpoint = endpoint
-    create_http_client(verify_ssl, connect_timeout, proxy_uri)
+    create_http_client(verify_ssl, connect_timeout, proxy_uri, disable_cookies)
   end
 
   def publish(raw_data, source_host=nil, source_category=nil, source_name=nil, data_type, metric_data_type)
@@ -43,10 +43,13 @@ class SumologicConnection
     verify_ssl ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
   end
 
-  def create_http_client(verify_ssl, connect_timeout, proxy_uri)
+  def create_http_client(verify_ssl, connect_timeout, proxy_uri, disable_cookies)
     @http                        = HTTPClient.new(proxy_uri)
     @http.ssl_config.verify_mode = ssl_options(verify_ssl)
     @http.connect_timeout        = connect_timeout
+    if disable_cookies
+      @http.cookie_manager       = nil
+    end
   end
 end
 
@@ -78,6 +81,7 @@ class Fluent::Plugin::Sumologic < Fluent::Plugin::Output
   config_param :open_timeout, :integer, :default => 60
   config_param :add_timestamp, :bool, :default => true
   config_param :proxy_uri, :string, :default => nil
+  config_param :disable_cookies, :bool, :default => false
 
   config_section :buffer do
     config_set_default :@type, DEFAULT_BUFFER_TYPE
@@ -121,7 +125,7 @@ class Fluent::Plugin::Sumologic < Fluent::Plugin::Output
       end
     end
 
-    @sumo_conn = SumologicConnection.new(conf['endpoint'], conf['verify_ssl'], conf['open_timeout'].to_i, conf['proxy_uri'])
+    @sumo_conn = SumologicConnection.new(conf['endpoint'], conf['verify_ssl'], conf['open_timeout'].to_i, conf['proxy_uri'], conf['disable_cookies'])
     super
   end
 

data/test/plugin/test_out_sumologic.rb

@@ -70,6 +70,7 @@ class SumologicOutput < Test::Unit::TestCase
     assert_equal instance.open_timeout, 60
     assert_equal instance.add_timestamp, true
     assert_equal instance.proxy_uri, nil
+    assert_equal instance.disable_cookies, false
   end
 
   def test_emit_text
@@ -185,6 +186,7 @@ class SumologicOutput < Test::Unit::TestCase
     driver = create_driver(config)
     time = event_time
     stub_request(:post, 'https://collectors.sumologic.com/v1/receivers/http/1234')
+    ENV['HOST'] = "foo"
     driver.run do
       driver.feed("output.test", time, {'foo' => 'bar', 'message' => 'test', '_sumo_metadata' => {
           "host": "#{ENV['HOST']}",
@@ -193,7 +195,7 @@ 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'=>'', 'X-Sumo-Name'=>'output.test'},
+                     headers: {'X-Sumo-Category'=>'test', 'X-Sumo-Client'=>'fluentd-output', 'X-Sumo-Host'=>'foo', 'X-Sumo-Name'=>'output.test'},
                      body: /\A{"timestamp":\d+.,"foo":"bar","message":"test"}\z/,
                      times:1
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sumologic_output
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Steven Adams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-18 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler