fluent-plugin-cloudwatch-logs 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ba82ca82f0ebbaf1df3fb81e42606433d99b520
-  data.tar.gz: e29e78f866b41a7623d27c3d1af5428fd23b00ce
+  metadata.gz: 78f1db9d7f30ff9acd63810f0591d7ef63a6d198
+  data.tar.gz: 6e8686feb438687d1b14abdeb090e25ba96f4b4c
 SHA512:
-  metadata.gz: 12e1b6c8596c9da1fa8945ca8cee1e553b0b5019812c55d2c082c11df74332683f61f7d07d9d99e8a0a51448ae8c92070343d37740f80cb0f1c1279dd66b3dfc
-  data.tar.gz: db5edcaa122522537ad34ec72dbeb49e9f420dc6f29ef02b7f47a24180abde671f0643904710d930e1c415d3c991d2fbf3e12b867589343e186fb9e178700c92
+  metadata.gz: d4fbe6d504e7b827d086ee786b57db5c0448fda0eb6714e23185ff485529b1dff2abbbdb4ec9b1a26f6165465aab8f9bf91fb88870d4296af1f8c0ceb72df1a2
+  data.tar.gz: b29e60c61e6b27548e18512841da8fee0332087351f015ab53e3af9ebbe76ab447b0ea84e1e6059365347a798e5fc17ba1be205c09c0ed9f7d5dec30b0ed5b3c

data/lib/fluent/plugin/cloudwatch/logs/version.rb

@@ -2,7 +2,7 @@ module Fluent
   module Plugin
     module Cloudwatch
       module Logs
-        VERSION = "0.0.2"
+        VERSION = "0.0.3"
       end
     end
   end

data/lib/fluent/plugin/out_cloudwatch_logs.rb

@@ -9,6 +9,8 @@ module Fluent
     config_param :log_stream_name, :string
     config_param :sequence_token_file, :string
     config_param :auto_create_stream, :bool, default: false
+    config_param :message_keys, :string, :default => nil
+    config_param :max_message_length, :integer, :default => nil
 
     unless method_defined?(:log)
       define_method(:log) { $log }
@@ -39,7 +41,19 @@ module Fluent
       events = []
       chunk.msgpack_each do |tag, time, record|
         time_ms = time * 1000
-        events << {timestamp: time_ms, message: record.to_json}
+
+        if @message_keys
+          message = @message_keys.split(',').map {|k| record[k].to_s }.join(' ')
+        else
+          message = record.to_json
+        end
+
+        if @max_message_length
+          message.force_encoding('ASCII-8BIT')
+          message = message.slice(0, @max_message_length)
+        end
+
+        events << {timestamp: time_ms, message: message}
       end
       put_events(events)
     end

data/test/plugin/test_out_cloudwatch_logs.rb

@@ -56,6 +56,53 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
     assert_equal('{"cloudwatch":"logs2"}', events[1].message)
   end
 
+  def test_write_with_message_keys
+    new_log_stream
+
+    d = create_driver(<<-EOC)
+    #{default_config}
+    message_keys message,cloudwatch
+    EOC
+
+    time = Time.now
+    d.emit({'cloudwatch' => 'logs1', 'message' => 'message1'}, time.to_i)
+    d.emit({'cloudwatch' => 'logs2', 'message' => 'message2'}, time.to_i + 1)
+    d.run
+
+    sleep 20
+
+    events = get_log_events
+    assert_equal(2, events.size)
+    assert_equal(time.to_i * 1000, events[0].timestamp)
+    assert_equal('message1 logs1', events[0].message)
+    assert_equal((time.to_i + 1) * 1000, events[1].timestamp)
+    assert_equal('message2 logs2', events[1].message)
+  end
+
+  def test_write_with_max_message_length
+    new_log_stream
+
+    d = create_driver(<<-EOC)
+    #{default_config}
+    message_keys message,cloudwatch
+    max_message_length 10
+    EOC
+
+    time = Time.now
+    d.emit({'cloudwatch' => 'logs1', 'message' => 'message1'}, time.to_i)
+    d.emit({'cloudwatch' => 'logs2', 'message' => 'message2'}, time.to_i + 1)
+    d.run
+
+    sleep 20
+
+    events = get_log_events
+    assert_equal(2, events.size)
+    assert_equal(time.to_i * 1000, events[0].timestamp)
+    assert_equal('message1 l', events[0].message)
+    assert_equal((time.to_i + 1) * 1000, events[1].timestamp)
+    assert_equal('message2 l', events[1].message)
+  end
+
   private
   def default_config
     <<-EOC

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-logs
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd