config: add "timestamp_key" for customizing "timestamp"

Author: bendrucker

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
 
@@ -255,12 +256,12 @@ def write(chunk)
           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

test/plugin/test_out_sumologic.rb

@@ -69,6 +69,7 @@ def test_default_configure
     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
@@ -221,6 +222,27 @@ def test_emit_json_no_timestamp
                      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