fluent-plugin-elb-access-log 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21a7e6d462160d816a3dfe5da025c6fb1a00694d
-  data.tar.gz: cb934a403a9f146836e33579bc6bccbcbd9f0d9e
+  metadata.gz: 693ada58a24f0ede7332179cb60e7575d93e3992
+  data.tar.gz: 07019ae76655f222c04d246ada18b9518e33bb22
 SHA512:
-  metadata.gz: e42e25afeb0fc1960e924af399d0dae9b76aab989404ebc2f3731f49778761f4dc01cc0e18a20b82d8b39e18c27d586a9b49b4d6acd4085bc27c559307a1e305
-  data.tar.gz: 6a75465ed44cdb3d39f65f67d489f2463eddb5252820fdba82800d8ca1362f0bd714b5c5af148830f2df670194882af253df9001ad1e7621f4f8d1192d13e85d
+  metadata.gz: 1b7175db9151c5f2b9095ee08cfb264e68b204a7ce28ecdf115f72ab130d069a10b0bb1e42ebc5b2855fb84d1d2c38a2483792f8fe0929bf089729a7990a1f4f
+  data.tar.gz: f7e1468f9af573261eb3ec8e2254a6d3d07828941874b1d750f6cc5c7edf35b2c32a50e773fe3e5e7a380382556c7fec2228c5fc7a7d7b8b6c317fe7623623b2

data/README.md

@@ -33,8 +33,8 @@ Or install it yourself as:
   #http_proxy http://...
 
   account_id 123456789012 # required
+  region us-west-1 # required
   s3_bucket BUCKET_NAME # required
-  s3_region us-west-1 # required
   #s3_prefix PREFIX
 
   #tag elb.access_log
@@ -81,4 +81,3 @@ Or install it yourself as:
 * It is possible to change the record tag.
 * List objects with prefix.
 * Perse request line URI.
-* It has tests other than the configuration file.

data/lib/fluent/plugin/in_elb_access_log.rb

@@ -35,8 +35,8 @@ class Fluent::ElbAccessLogInput < Fluent::Input
   config_param :credentials_path, :string,  :default => nil
   config_param :http_proxy,       :string,  :default => nil
   config_param :account_id,       :string
+  config_param :region,           :string
   config_param :s3_bucket,        :string
-  config_param :s3_region,        :string
   config_param :s3_prefix,        :string,  :default => nil
   config_param :tag,              :string,  :default => 'elb.access_log'
   config_param :tsfile_path,      :string,  :default => '/var/tmp/fluent-plugin-elb-access-log.ts'
@@ -126,7 +126,7 @@ class Fluent::ElbAccessLogInput < Fluent::Input
   end
 
   def prefixes(timestamp)
-    base_prefix = "AWSLogs/#{@account_id}/elasticloadbalancing/#{@s3_region}/"
+    base_prefix = "AWSLogs/#{@account_id}/elasticloadbalancing/#{@region}/"
     base_prefix = "#{@s3_prefix}/#{base_prefix}" if @s3_prefix
 
     [timestamp - 86400, timestamp, timestamp + 86400].map do |date|

data/lib/fluent_plugin_elb_access_log/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginElbAccessLog
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/in_elb_access_log_config_spec.rb

@@ -1,7 +1,7 @@
 describe 'Fluent::ElbAccessLogInput#configure' do
   let(:account_id) { '123456789012' }
   let(:s3_bucket) { 'my-bucket' }
-  let(:s3_region) { 'us-west-1' }
+  let(:region) { 'us-west-1' }
   let(:driver) { create_driver(fluentd_conf) }
   let(:today) { Time.parse('2015/05/24 18:30 UTC') }
 
@@ -18,7 +18,7 @@ describe 'Fluent::ElbAccessLogInput#configure' do
       {
         account_id: account_id,
         s3_bucket: s3_bucket,
-        s3_region: s3_region,
+        region: region,
         interval: nil,
       }
     end
@@ -30,7 +30,7 @@ describe 'Fluent::ElbAccessLogInput#configure' do
       expect(driver.instance.credentials_path).to be_nil
       expect(driver.instance.http_proxy).to be_nil
       expect(driver.instance.s3_bucket).to eq s3_bucket
-      expect(driver.instance.s3_region).to eq s3_region
+      expect(driver.instance.region).to eq region
       expect(driver.instance.s3_prefix).to be_nil
       expect(driver.instance.tag).to eq 'elb.access_log'
       expect(driver.instance.tsfile_path).to eq '/var/tmp/fluent-plugin-elb-access-log.ts'
@@ -61,7 +61,7 @@ describe 'Fluent::ElbAccessLogInput#configure' do
         http_proxy: http_proxy,
         account_id: account_id,
         s3_bucket: s3_bucket,
-        s3_region: s3_region,
+        region: region,
         s3_prefix: s3_prefix,
         tag: tag,
         tsfile_path: tsfile_path,
@@ -78,7 +78,7 @@ describe 'Fluent::ElbAccessLogInput#configure' do
       expect(driver.instance.credentials_path).to eq credentials_path
       expect(driver.instance.http_proxy).to eq http_proxy
       expect(driver.instance.s3_bucket).to eq s3_bucket
-      expect(driver.instance.s3_region).to eq s3_region
+      expect(driver.instance.region).to eq region
       expect(driver.instance.s3_prefix).to eq s3_prefix
       expect(driver.instance.tag).to eq tag
       expect(driver.instance.tsfile_path).to eq tsfile_path

data/spec/in_elb_access_log_spec.rb

@@ -1,7 +1,7 @@
 describe Fluent::ElbAccessLogInput do
   let(:account_id) { '123456789012' }
   let(:s3_bucket) { 'my-bucket' }
-  let(:s3_region) { 'us-west-1' }
+  let(:region) { 'us-west-1' }
   let(:driver) { create_driver(fluentd_conf) }
   let(:client){ Aws::S3::Client.new(stub_responses: true) }
 
@@ -9,7 +9,7 @@ describe Fluent::ElbAccessLogInput do
     {
       account_id: account_id,
       s3_bucket: s3_bucket,
-      s3_region: s3_region,
+      region: region,
       start_datetime: (today - 1).to_s,
     }
   end
@@ -18,9 +18,9 @@ describe Fluent::ElbAccessLogInput do
   let(:yesterday) { today - 86400 }
   let(:tomorrow) { today + 86400 }
 
-  let(:today_prefix) { "AWSLogs/#{account_id}/elasticloadbalancing/#{s3_region}/#{today.strftime('%Y/%m/%d')}/" }
-  let(:yesterday_prefix) { "AWSLogs/#{account_id}/elasticloadbalancing/#{s3_region}/#{yesterday.strftime('%Y/%m/%d')}/" }
-  let(:tomorrow_prefix) { "AWSLogs/#{account_id}/elasticloadbalancing/#{s3_region}/#{tomorrow.strftime('%Y/%m/%d')}/" }
+  let(:today_prefix) { "AWSLogs/#{account_id}/elasticloadbalancing/#{region}/#{today.strftime('%Y/%m/%d')}/" }
+  let(:yesterday_prefix) { "AWSLogs/#{account_id}/elasticloadbalancing/#{region}/#{yesterday.strftime('%Y/%m/%d')}/" }
+  let(:tomorrow_prefix) { "AWSLogs/#{account_id}/elasticloadbalancing/#{region}/#{tomorrow.strftime('%Y/%m/%d')}/" }
 
   let(:today_object_key) { "#{today_prefix}#{account_id}_elasticloadbalancing_ap-northeast-1_hoge_#{today.iso8601}_52.68.51.1_8hSqR3o4.log" }
   let(:yesterday_object_key) { "#{yesterday_prefix}#{account_id}_elasticloadbalancing_ap-northeast-1_hoge_#{yesterday.iso8601}_52.68.51.1_8hSqR3o4.log" }
@@ -221,7 +221,7 @@ describe Fluent::ElbAccessLogInput do
     {
       account_id: account_id,
       s3_bucket: s3_bucket,
-      s3_region: s3_region,
+      region: region,
       start_datetime: (today - 1).to_s,
       tag: 'any.tag'
     }

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ def create_driver(options = {})
 
   account_id = options.fetch(:account_id) || '123456789012'
   s3_bucket = options.fetch(:s3_bucket) || 'my-bucket'
-  s3_region = options.fetch(:s3_region) || 'us-west-1'
+  region = options.fetch(:region) || 'us-west-1'
 
   additional_options = options.select {|k, v| v }.map {|key, value|
     "#{key} #{value}"
@@ -31,7 +31,7 @@ def create_driver(options = {})
 type elb_access_log
 account_id #{account_id}
 s3_bucket #{s3_bucket}
-s3_region #{s3_region}
+region #{region}
 #{additional_options}
   EOS
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elb-access-log
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd