lib/fluent/plugin/out_s3.rb in fluent-plugin-s3-0.6.1 vs lib/fluent/plugin/out_s3.rb in fluent-plugin-s3-0.6.2

- old
+ new

@@ -53,10 +53,11 @@ config_param :storage_class, :string, :default => "STANDARD" config_param :format, :string, :default => 'out_file' config_param :acl, :string, :default => :private config_param :hex_random_length, :integer, :default => 4 config_param :overwrite, :bool, :default => false + config_param :ssekms_key_id, :string, :default => nil attr_reader :bucket include Fluent::Mixin::ConfigPlaceholders MAX_HEX_RANDOM_LENGTH = 16 @@ -165,9 +166,10 @@ tmp.rewind log.debug { "out_s3: write chunk: {key:#{chunk.key},tsuffix:#{tsuffix(chunk)}} to s3://#{@s3_bucket}/#{s3path}" } put_options = {:body => tmp, :content_type => @compressor.content_type, :storage_class => @storage_class} put_options[:server_side_encryption] = @use_server_side_encryption if @use_server_side_encryption + put_options[:ssekms_key_id] = @ssekms_key_id if @ssekms_key_id @bucket.object(s3path).put(put_options) @values_for_s3_object_chunk.delete(chunk.unique_id) ensure tmp.close(true) rescue nil