fluent-plugin-elb-access-log 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6df223556ac6d0e817804ee03aa63403bc3bd33f
-  data.tar.gz: e25d57033fe58bde5b24d13bfff67b7ae848e684
+  metadata.gz: 708a7b3cc210ec51adf16b678c510529335d9659
+  data.tar.gz: 81a788c178174442d67752d883c03afbf6c44605
 SHA512:
-  metadata.gz: 0b2b2c56a9ae17ec2452c36f32a1297809b0e51cedbc901757e0af089ae13b78e5f767f18ec68b77f330a803822a379276dfcd8089e540ab3faab3333c87aab4
-  data.tar.gz: 1f98ee986f5de353aeceb3e8e1baf196aa1322c17887f5f42df69a96aa9e4b68cb357f47524aa9f44b25078e5b160bfd0b2988b4f07cafeb5846b8198956bfe0
+  metadata.gz: b39bfbb3267a1472decb677a86e230b03376df6aacc4a6b91ab491f2ebbb13849a9da5e5e8e547ddf62a235a42846461abdf583692dd415469b843c697073eb8
+  data.tar.gz: f317d442e2ca203561f5cb0037eef80b50e18d2945d68a3d7e9b234eec57c738753d363fb3038664d5769cd9cf5a12e1aee13c236b47106c2c6bef108591738d

data/README.md

@@ -2,7 +2,7 @@
 
 Fluentd input plugin for [AWS ELB Access Logs](http://docs.aws.amazon.com/ElasticLoadBalancing/latest/DeveloperGuide/access-log-collection.html).
 
-[![Gem Version](https://badge.fury.io/rb/fluent-plugin-elb-access-log.png)](http://badge.fury.io/rb/fluent-plugin-elb-access-log)
+[![Gem Version](https://badge.fury.io/rb/fluent-plugin-elb-access-log.svg)](http://badge.fury.io/rb/fluent-plugin-elb-access-log)
 [![Build Status](https://travis-ci.org/winebarrel/fluent-plugin-elb-access-log.svg?branch=master)](https://travis-ci.org/winebarrel/fluent-plugin-elb-access-log)
 
 ## Installation
@@ -30,6 +30,7 @@ Or install it yourself as:
   #aws_sec_key YOUR_SECRET_ACCESS_KEY
   #profile PROFILE_NAME
   #credentials_path path/to/credentials_file
+  #http_proxy http://...
 
   account_id 123456789012 # required
   s3_bucket BUCKET_NAME # required
@@ -73,3 +74,11 @@ Or install it yourself as:
   "request.uri.fragment":null
 }
 ```
+
+# Difference with [fluent-plugin-elb-log](https://github.com/shinsaka/fluent-plugin-elb-log)
+
+* Use AWS SDK for Ruby V2.
+* 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

@@ -33,6 +33,7 @@ class Fluent::ElbAccessLogInput < Fluent::Input
   config_param :aws_sec_key,      :string,  :default => nil
   config_param :profile,          :string,  :default => nil
   config_param :credentials_path, :string,  :default => nil
+  config_param :http_proxy,       :string,  :default => nil
   config_param :account_id,       :string
   config_param :s3_bucket,        :string
   config_param :s3_region,        :string
@@ -176,6 +177,7 @@ class Fluent::ElbAccessLogInput < Fluent::Input
 
     options = {:user_agent_suffix => USER_AGENT_SUFFIX}
     options[:region] = @region if @region
+    options[:http_proxy] = @http_proxy if @http_proxy
 
     if @aws_key_id and @aws_sec_key
       options[:access_key_id] = @aws_key_id

data/lib/fluent_plugin_elb_access_log/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginElbAccessLog
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/in_elb_access_log_config_spec.rb

@@ -0,0 +1,88 @@
+describe 'Fluent::ElbAccessLogInput#configure' do
+  let(:account_id) { '123456789012' }
+  let(:s3_bucket) { 'my-bucket' }
+  let(:s3_region) { 'us-west-1' }
+  let(:driver) { create_driver(fluentd_conf) }
+  let(:today) { Time.parse('2015/05/24 18:30 UTC') }
+
+  subject { create_driver(fluentd_conf).instance }
+
+  before do
+    Timecop.freeze(today)
+  end
+
+  context 'when default' do
+    let(:fluentd_conf) do
+      {
+        account_id: account_id,
+        s3_bucket: s3_bucket,
+        s3_region: s3_region,
+        interval: nil,
+      }
+    end
+
+    it do
+      expect(driver.instance.aws_key_id).to be_nil
+      expect(driver.instance.aws_sec_key).to be_nil
+      expect(driver.instance.profile).to be_nil
+      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.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'
+      expect(driver.instance.interval).to eq 300
+      expect(driver.instance.start_datetime).to eq today
+      expect(driver.instance.debug).to be_falsey
+    end
+  end
+
+  context 'when pass params' do
+    let(:aws_key_id) { 'YOUR_ACCESS_KEY_ID' }
+    let(:aws_sec_key) { 'YOUR_SECRET_ACCESS_KEY' }
+    let(:profile) { 'PROFILE_NAME' }
+    let(:credentials_path) { 'path/to/credentials_file' }
+    let(:http_proxy) { 'http://example.net' }
+    let(:s3_prefix) { 's3-prefix' }
+    let(:tag) { 'any.tag' }
+    let(:tsfile_path) { '/tmp/foo' }
+    let(:interval) { 500 }
+    let(:start_datetime) { today - 3600 }
+
+    let(:fluentd_conf) do
+      {
+        aws_key_id: aws_key_id,
+        aws_sec_key: aws_sec_key,
+        profile: profile,
+        credentials_path: credentials_path,
+        http_proxy: http_proxy,
+        account_id: account_id,
+        s3_bucket: s3_bucket,
+        s3_region: s3_region,
+        s3_prefix: s3_prefix,
+        tag: tag,
+        tsfile_path: tsfile_path,
+        interval: interval,
+        start_datetime: start_datetime,
+        debug: true,
+      }
+    end
+
+    it do
+      expect(driver.instance.aws_key_id).to eq aws_key_id
+      expect(driver.instance.aws_sec_key).to eq aws_sec_key
+      expect(driver.instance.profile).to eq profile
+      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.s3_prefix).to eq s3_prefix
+      expect(driver.instance.tag).to eq tag
+      expect(driver.instance.tsfile_path).to eq tsfile_path
+      expect(driver.instance.interval).to eq interval
+      expect(driver.instance.start_datetime).to eq start_datetime
+      expect(driver.instance.debug).to be_truthy
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elb-access-log
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Genki Sugawara
@@ -111,6 +111,7 @@ files:
 - fluent-plugin-elb-access-log.gemspec
 - lib/fluent/plugin/in_elb_access_log.rb
 - lib/fluent_plugin_elb_access_log/version.rb
+- spec/in_elb_access_log_config_spec.rb
 - spec/in_elb_access_log_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/winebarrel/fluent-plugin-elb-access-log
@@ -138,5 +139,6 @@ signing_key:
 specification_version: 4
 summary: Fluentd input plugin for AWS ELB Access Logs.
 test_files:
+- spec/in_elb_access_log_config_spec.rb
 - spec/in_elb_access_log_spec.rb
 - spec/spec_helper.rb