fluent-plugin-elb-access-log 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3a20dc8a60a8ce35bae8050d88f6f3cb89fd5cd
-  data.tar.gz: b9df7709325ba5f796658df242b7d04727f65f96
+  metadata.gz: 2d393cd3a65c13a516101a1a7d21b184b78fc098
+  data.tar.gz: c4576223f3281ec52b9bec0b48f9a2a9edc882d0
 SHA512:
-  metadata.gz: 41d7b97d9044b10ea91d65d20556024fa1f357e9e6ba1cb3c8e3827f553b5258ee8b96dc3e964acaba24eba0780f2078ed6517868eeaa28a2057a6efd0ecf7f1
-  data.tar.gz: 9f3f1b43320c87f24112a6187e65c1bb293975b7f3db0816eb16c987bcdf4d5b6ad594d0950235d4b164760fc22a6b9997a99820cc158185d5e433528453a721
+  metadata.gz: 70759e109befd97543bfdd58aa1067a6baa27ed8e8e3231529672c5b1253ee1ab18633aa03d8b9107b336c300950e149f97574011bbc9de8841cddf1ea3deee7
+  data.tar.gz: 2603b714eb20a852e1a4b212cb06b9028ee27f6a42818022e7f6a0c3e47aa3ac22790574b20b313f451ce747299b1cde5b747e193f35e63a6643dbd154e0f2e7

data/README.md

@@ -54,6 +54,7 @@ Or install it yourself as:
   #parse_request true
   #split_addr_port true
   #file_filter REGEXP
+  #request_separator .
 </source>
 ```
 

data/lib/fluent/plugin/in_elb_access_log.rb

@@ -85,6 +85,7 @@ class FluentPluginElbAccessLogInput < Fluent::Input
   config_param :parse_request,     :bool,    default: true
   config_param :split_addr_port,   :bool,    default: true
   config_param :file_filter,       :string,  default: nil
+  config_param :request_separator, :string,  default: '.'
 
   def configure(conf)
     super
@@ -377,9 +378,9 @@ class FluentPluginElbAccessLogInput < Fluent::Input
     return unless request
     method, uri, http_version = request.split(' ', 3)
 
-    record['request.method'] = method
-    record['request.uri'] = uri
-    record['request.http_version'] = http_version
+    record["request#{@request_separator}method"] = method
+    record["request#{@request_separator}uri"] = uri
+    record["request#{@request_separator}http_version"] = http_version
 
     begin
       uri = Addressable::URI.parse(uri)
@@ -392,7 +393,7 @@ class FluentPluginElbAccessLogInput < Fluent::Input
             value = value.to_s
           end
 
-          record["request.uri.#{key}"] = value
+          record["request#{@request_separator}uri#{@request_separator}#{key}"] = value
         end
       end
     rescue => e

data/lib/fluent_plugin_elb_access_log/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginElbAccessLog
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/spec/in_elb_access_log_alb_spec.rb

@@ -419,6 +419,29 @@ https 2015-05-25T19:55:36.000000Z hoge 14.14.124.20:57673 10.0.199.184:80 0.0000
         is_expected.to match_table expected_emits_without_request_parsing
       end
     end
+
+    context 'with request_separator' do
+      let(:fluentd_conf) do
+        {
+          interval: 0,
+          account_id: account_id,
+          s3_bucket: s3_bucket,
+          region: region,
+          start_datetime: (today - 1).to_s,
+          elb_type: 'alb',
+          request_separator: '_'
+        }
+      end
+
+      it do
+        expected_emits_with_underscore = expected_emits.map do |tag, ts, h|
+          h = Hash[h.map {|k, v| [k.gsub('.', '_'), v] }]
+          [tag, ts, h]
+        end
+
+        is_expected.to match_table expected_emits_with_underscore
+      end
+    end
   end
 
   context 'with file_filter' do

data/spec/in_elb_access_log_clb_spec.rb

@@ -385,6 +385,28 @@ describe FluentPluginElbAccessLogInput do
         is_expected.to match_table expected_emits_without_request_parsing
       end
     end
+
+    context 'with request_separator' do
+      let(:fluentd_conf) do
+        {
+          interval: 0,
+          account_id: account_id,
+          s3_bucket: s3_bucket,
+          region: region,
+          start_datetime: (today - 1).to_s,
+          request_separator: '_'
+        }
+      end
+
+      it do
+        expected_emits_with_underscore = expected_emits.map do |tag, ts, h|
+          h = Hash[h.map {|k, v| [k.gsub('.', '_'), v] }]
+          [tag, ts, h]
+        end
+
+        is_expected.to match_table expected_emits_with_underscore
+      end
+    end
   end
 
   context 'with file_filter' do

data/spec/in_elb_access_log_config_spec.rb

@@ -50,6 +50,8 @@ describe 'FluentPluginElbAccessLogInput#configure' do
       expect(driver.instance.parse_request).to be_truthy
       expect(driver.instance.split_addr_port).to be_truthy
       expect(driver.instance.filter).to be_nil
+      expect(driver.instance.file_filter).to be_nil
+      expect(driver.instance.request_separator).to eq '.'
     end
   end
 
@@ -72,6 +74,7 @@ describe 'FluentPluginElbAccessLogInput#configure' do
     let(:filter) { 'elb_status_code:^2' }
     let(:filter_operator) { 'or' }
     let(:file_filter) { '.*my-elb.*' }
+    let(:request_separator) { '_' }
 
     let(:fluentd_conf) do
       {
@@ -100,6 +103,7 @@ describe 'FluentPluginElbAccessLogInput#configure' do
         parse_request: 'false',
         split_addr_port: 'false',
         file_filter: file_filter,
+        request_separator: request_separator,
       }
     end
 
@@ -128,6 +132,7 @@ describe 'FluentPluginElbAccessLogInput#configure' do
       expect(driver.instance.parse_request).to be_falsey
       expect(driver.instance.split_addr_port).to be_falsey
       expect(driver.instance.file_filter).to eq Regexp.new(file_filter)
+      expect(driver.instance.request_separator).to eq request_separator
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elb-access-log
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd