fastly_fluent 0.0.1 → 0.0.2

data/fastly_fluent.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)\
 
 Gem::Specification.new do |spec|
   spec.name          = "fastly_fluent"
-  spec.version       = '0.0.1'
+  spec.version       = '0.0.2'
   spec.authors       = ["Benjamin Bryant"]
   spec.email         = ["benjaminhbryant@gmail.com"]
   spec.description   = %q{fluent plugin for JSON encoded fastly syslogs}

data/lib/fluent/plugin/in_fastly.rb

@@ -29,6 +29,7 @@ module Fluent
       super
       require 'cool.io'
       require 'fluent/plugin/socket_util'
+      require 'cgi'
     end
 
     config_param :port, :integer, :default => 5140
@@ -89,10 +90,35 @@ module Fluent
         tag = record.delete('tag')
 
         message = JSON.parse(record.delete('message'))
+
+        ## copy message params into message, skipping null items
         message.each do |k,v|
           record[k] = v unless v == "(null)"
         end
 
+        ## parse url
+        if message['url']
+          uri = URI.parse(message['url'])
+          record['path'] = uri.path
+
+
+          # emit query params
+          unless uri.query.nil? || uri.query == ""
+
+            CGI::parse(uri.query).each do |k,v|
+              if record[k].nil?
+                if v.count > 1
+                  record[k] = v
+                elsif v.count == 1
+                  record[k] = v.first
+                else
+                  record[k] = true
+                end
+              end
+            end
+          end
+        end
+
 
         emit(tag, time, record)
       }

data/test/plugin/test_fastly_fluent.rb

@@ -68,6 +68,43 @@ class FastlyInputTest < Test::Unit::TestCase
     }
   end
 
+  def test_param_splitting
+
+
+    configs = {'127.0.0.1' => CONFIG}
+    configs.merge!('::1' => IPv6_CONFIG) if ipv6_enabled?
+
+    configs.each_pair { |k, v|
+      d = create_driver(v)
+
+      test = "<134>2014-07-10T23:18:15Z cache-hk91 td.server.requests[11226]: {\"ip\":\"166.137.213.198\",\"client_id\":\"17a8e5f8f64a9a7c85d1ccab51bcfdf6\",\"status\":200,\"user_agent\":\"Mozilla/5.0 (iPhone; CPU iPhone OS 7_0_3 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11B511 Safari/9537.53\",\"null_val\":\"(null)\",\"url\":\"/my/path?query=param&bob=first&bob=second&sally\"}"
+
+
+
+      d.run do
+        u = Fluent::SocketUtil.create_udp_socket(k)
+        u.connect(k, PORT)
+        u.send(test, 0)
+
+        sleep 1
+      end
+
+      tag =d.emits.first[0]
+      time = d.emits.first[1]
+      record = d.emits.first[2]
+
+      assert_equal(tag, 'td.server.requests')
+      assert_equal(time, Time.new(2014,7,10,23,18,15).to_i)
+      assert_equal(record['ip'], '166.137.213.198')
+      assert_equal(record['path'], '/my/path')
+
+      assert_equal(record['query'], 'param')
+      assert_equal(record['bob'], ["first","second"])
+      assert_equal(record['sally'], true)
+
+    }
+  end
+
   def test_msg_size
     d = create_driver
     tests = create_test_case

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: fastly_fluent
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Benjamin Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-13 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,29 +30,33 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: fluent plugin for JSON encoded fastly syslogs
@@ -71,26 +78,33 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4532696612457073463
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4532696612457073463
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: ''
 test_files:
 - test/helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 908f50379a7eebc384dadea58ff75cab3452ee55
-  data.tar.gz: 4bff227b7727af33b38d45afef1600b0b1c02935
-SHA512:
-  metadata.gz: 1c4125fdf6248b2a62f5fd1916c85749e4ac3921c689f62555f3d7913c5a98cdd65f16df999f499a84dd03e74988494231be2ff75302d10ff8b2e6d7428d74ed
-  data.tar.gz: 3b33e3ed78c7bcea9c13b69ee51eea4ef764c6d4c5bce813e7af94da3bde49a7ae1488cd772c4a619ba87c763ae51ae4cd5d9e3b47220b8c86c5f533c6557011