fluent-plugin-elb-access-log 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88a3b513a550db32f667fedc8ba75eea2e2f6199
-  data.tar.gz: 0e5dd5364065a98f38f15c54fe400e0826941ae4
+  metadata.gz: 4bcfed4ac9a254031fd9a23f2cf9439c5beeb4e8
+  data.tar.gz: f3e0a91ff1c7d76cf4d238b08863978bd181b31f
 SHA512:
-  metadata.gz: 7c3c094dff47e82717c9cf8b80d2528f35257a61dc7bcb6c64c6943433e684082638c1e13256b43ea448b1e2e40487fbfcaa73353f8fb74245b739fc8e897edb
-  data.tar.gz: 8493ec02a57fb20f8fbaf144fa8930292b9658a90438b31a56d429b04a7690e72b4273d7a37de68422f721089181e02ecc9810a43bb271b7fea1bc5f61e8e806
+  metadata.gz: 64e309331c88bf9735c27bf3d99921c37398e4c34f178dbfb067291d8973b86a45d4c7213467c68360b8192a37c63e07ca5dc57d3ef0ad183a555b76df6a7aa7
+  data.tar.gz: caecfbe52f8471cf1f061212a92511a26538dc2f72246b3d12e29af00976c739a884b70fb8e5cee32890d80acde0c69e4754f979fdbb45bac8f84a1c8a255211

data/README.md

@@ -52,6 +52,7 @@ Or install it yourself as:
   #filter_operator and # or "or"
   #type_cast true
   #parse_request true
+  #split_addr_port true
 </source>
 ```
 

data/lib/fluent/plugin/in_elb_access_log.rb

@@ -83,6 +83,7 @@ class Fluent::Plugin::ElbAccessLogInput < Fluent::Input
   config_param :filter_operator,   :string,  default: 'and'
   config_param :type_cast,         :bool,    default: true
   config_param :parse_request,     :bool,    default: true
+  config_param :split_addr_port,   :bool,    default: true
 
   def configure(conf)
     super
@@ -180,7 +181,7 @@ class Fluent::Plugin::ElbAccessLogInput < Fluent::Input
               begin
                 access_log = MultipleFilesGzipReader.new(access_log)
 
-                # check gzip formta
+                # check gzip format
                 access_log.first
                 access_log.rewind
               rescue Zlib::Error => e
@@ -270,7 +271,9 @@ class Fluent::Plugin::ElbAccessLogInput < Fluent::Input
 
       if @type_cast
         access_log_fields.each do |name, conv|
-          record[name] = record[name].send(conv) if conv
+          if conv and (value = record[name])
+            record[name] = value.send(conv)
+          end
         end
       end
 
@@ -349,9 +352,15 @@ class Fluent::Plugin::ElbAccessLogInput < Fluent::Input
   def split_address_port!(record, prefix)
     address_port = record["#{prefix}_port"]
     return unless address_port
-    address, port = address_port.split(':', 2)
-    record[prefix] = address
-    record["#{prefix}_port"] = port
+
+    if @split_addr_port
+      address, port = address_port.split(':', 2)
+      record[prefix] = address
+      record["#{prefix}_port"] = port
+    else
+      record[prefix] = address_port
+      record.delete("#{prefix}_port")
+    end
   end
 
   def parse_request!(record)

data/lib/fluent_plugin_elb_access_log/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginElbAccessLog
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/spec/in_elb_access_log_alb_spec.rb

@@ -369,7 +369,6 @@ https 2015-05-25T19:55:36.000000Z hoge 14.14.124.20:57673 10.0.199.184:80 0.0000
       end
     end
 
-
     context 'without request parsing' do
       let(:fluentd_conf) do
         {
@@ -392,6 +391,34 @@ 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 'without addr/port splitting' 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',
+          split_addr_port: 'false',
+        }
+      end
+
+      it do
+        expected_emits_without_request_parsing = expected_emits.map do |tag, ts, h|
+          h.keys.select {|k| k =~ /_port\z/ }.each do |prefix_port|
+            prefix, _ = prefix_port.split('_', 2)
+            h[prefix] = h[prefix] + ':' + h[prefix_port].to_s
+            h.delete(prefix_port)
+          end
+
+          [tag, ts, h]
+        end
+
+        is_expected.to match_table expected_emits_without_request_parsing
+      end
+    end
   end
 
   context 'when include bad URI' do

data/spec/in_elb_access_log_clb_spec.rb

@@ -358,6 +358,33 @@ describe Fluent::Plugin::ElbAccessLogInput do
         is_expected.to match_table expected_emits_without_request_parsing
       end
     end
+
+    context 'without addr/port splitting' do
+      let(:fluentd_conf) do
+        {
+          interval: 0,
+          account_id: account_id,
+          s3_bucket: s3_bucket,
+          region: region,
+          start_datetime: (today - 1).to_s,
+          split_addr_port: 'false',
+        }
+      end
+
+      it do
+        expected_emits_without_request_parsing = expected_emits.map do |tag, ts, h|
+          h.keys.select {|k| k =~ /_port\z/ }.each do |prefix_port|
+            prefix, _ = prefix_port.split('_', 2)
+            h[prefix] = h[prefix] + ':' + h[prefix_port].to_s
+            h.delete(prefix_port)
+          end
+
+          [tag, ts, h]
+        end
+
+        is_expected.to match_table expected_emits_without_request_parsing
+      end
+    end
   end
 
   context 'when include bad URI' do

data/spec/in_elb_access_log_config_spec.rb

@@ -48,6 +48,7 @@ describe 'Fluent::Plugin::ElbAccessLogInput#configure' do
       expect(driver.instance.filter_operator).to eq 'and'
       expect(driver.instance.type_cast).to be_truthy
       expect(driver.instance.parse_request).to be_truthy
+      expect(driver.instance.split_addr_port).to be_truthy
     end
   end
 
@@ -95,6 +96,7 @@ describe 'Fluent::Plugin::ElbAccessLogInput#configure' do
         filter_operator: filter_operator,
         type_cast: 'false',
         parse_request: 'false',
+        split_addr_port: 'false',
       }
     end
 
@@ -121,6 +123,7 @@ describe 'Fluent::Plugin::ElbAccessLogInput#configure' do
       expect(driver.instance.filter_operator).to eq filter_operator
       expect(driver.instance.type_cast).to be_falsey
       expect(driver.instance.parse_request).to be_falsey
+      expect(driver.instance.split_addr_port).to be_falsey
     end
   end
 

metadata

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