fluent-plugin-elb-log 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 788c19cecdb93f06c99cfbce2d24dbe47643b0f8
-  data.tar.gz: 6324d059ad408c092b6dd6654443e890f74bc474
+  metadata.gz: d27df0130d6510caf02deafc2c329480ec516f77
+  data.tar.gz: d3c48121cfa1252092e04db635115b9bba080d6d
 SHA512:
-  metadata.gz: 28bbd93a03f59e83f605fd15dd0519e837214660ae4a6b8d91ada544deb7a55aef459ffd3ff64d57e2ccd89253d0904a3888d8d4440981fce60ba4ed6c48b182
-  data.tar.gz: e7954718e548d01487eb1668a506dd6349bf9a220e934c61f975adbbe7e776292428c5eeca52d6637d4eabed1c4192a800271fcd18b393f39572cfb4de1a38bd
+  metadata.gz: a5927766cae842616a2bcf037617a3b63fc1bad7169c3a116d5b966e7f4b85beb174d47cbe64409f57b71e0ca2240d3cd10cb0879dbc603079b5c937aae40798
+  data.tar.gz: 5d5b7f8c60d2cd5e0f029c7ce9cb80f41e1880a10f01c75a04d37fad2f341d79785da49ff6d396ec5157c0d68f0438bcc295a5cd3cd38abba1a13531d66470ef

data/README.md

@@ -56,6 +56,7 @@ SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt (If you using amazon linux)
   buf_file          <buffer file path>
   refresh_interval  <interval number by second>
   tag               <tag name(default: elb.access)>
+  delete            <boolean delete processed log files from S3(default: false)>
 
   # following attibutes are required if you don't use IAM Role
   access_key_id     <access_key>
@@ -74,6 +75,7 @@ SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt (If you using amazon linux)
   buf_file          /tmp/fluentd-elblog.tmpfile
   refresh_interval  300
   tag               elb.access
+  delete            false
   access_key_id     XXXXXXXXXXXXXXXXXXXX
   secret_access_key xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 </source>

data/fluent-plugin-elb-log.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-elb-log"
-  spec.version       = "0.5.0"
+  spec.version       = "0.6.0"
   spec.authors       = ["shinsaka"]
   spec.email         = ["shinx1265@gmail.com"]
   spec.summary       = "Amazon ELB log input plugin"

data/lib/fluent/plugin/in_elb_log.rb

@@ -24,6 +24,7 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
   config_param :buf_file, :string, default: './fluentd_elb_log_buf_file'
   config_param :http_proxy, :string, default: nil
   config_param :start_time, :string, default: nil
+  config_param :delete, :bool, default: false
 
   def configure(conf)
     super
@@ -145,6 +146,10 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
       emit_lines_from_buffer_file(record_common)
 
       put_timestamp_file(object_key[:s3_last_modified_unixtime])
+
+      if @delete
+        delete_file_from_s3(object_key[:key])
+      end
     end
   end
 
@@ -262,6 +267,16 @@ class Fluent::Plugin::Elb_LogInput < Fluent::Plugin::Input
     end
   end
 
+  def delete_file_from_s3(object_name)
+    begin
+      log.debug "deleting object from s3 name is #{object_name}"
+
+      s3_client.delete_object(bucket: @s3_bucketname, key: object_name)
+    rescue => e
+      log.warn "error occurred: #{e.message}, #{e.backtrace}"
+    end
+  end
+
   def emit_lines_from_buffer_file(record_common)
     begin
       # emit per line

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elb-log
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - shinsaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd