fluent-plugin-geoip 0.1.1 → 0.2.0

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.1.0
+  - 2.1
   - 2.0.0
   - 1.9.3
 

data/README.md

@@ -44,8 +44,8 @@ $ sudo /usr/lib64/fluent/ruby/bin/fluent-gem install fluent-plugin-geoip
   # in the case of accessing nested value, delimit keys by dot like 'host.ip'.
   geoip_lookup_key  host
 
-  # Specify geoip database (using bundled GeoLiteCity databse by default)
-  geoip_database    'data/GeoLiteCity.dat'
+  # Specify optional geoip database (using bundled GeoLiteCity databse by default)
+  geoip_database    '/path/to/your/GeoIPCity.dat'
 
   # Set adding field with placeholder (more than one settings are required.)
   <record>
@@ -53,10 +53,10 @@ $ sudo /usr/lib64/fluent/ruby/bin/fluent-gem install fluent-plugin-geoip
     latitude        ${latitude['host']}
     longitude       ${longitude['host']}
     country_code3   ${country_code3['host']}
-    country         ${country['host']}
+    country         ${country_code['host']}
     country_name    ${country_name['host']}
-    dma             ${dma['host']}
-    area            ${area['host']}
+    dma             ${dma_code['host']}
+    area            ${area_code['host']}
     region          ${region['host']}
   </record>
 

data/fluent-plugin-geoip.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-geoip"
-  spec.version       = "0.1.1"
+  spec.version       = "0.2.0"
   spec.authors       = ["Kentaro Yoshida"]
   spec.email         = ["y.ken.studio@gmail.com"]
   spec.summary       = %q{Fluentd Output plugin to add information about geographical location of IP addresses with Maxmind GeoIP databases.}

data/lib/fluent/plugin/out_geoip.rb

@@ -63,13 +63,13 @@ class Fluent::GeoipOutput < Fluent::BufferedOutput
         @map[k] = v
         validate_json = Proc.new { 
           begin
-            dummy_text = '12345'
-            Yajl::Parser.parse(v.gsub(REGEXP_PLACEHOLDER_SCAN, dummy_text)) if v.match(REGEXP_JSON)
+            dummy_text = Yajl::Encoder.encode('dummy_text')
+            Yajl::Parser.parse(v.gsub(REGEXP_PLACEHOLDER_SCAN, dummy_text))
           rescue Yajl::ParseError => e
             raise Fluent::ConfigError, "geoip: failed to parse '#{v}' as json."
           end
         }
-        validate_json.call
+        validate_json.call if v.match(REGEXP_JSON)
       }
     }
     @placeholder_keys = @map.values.join.scan(REGEXP_PLACEHOLDER_SCAN).map{ |placeholder| placeholder[0] }.uniq
@@ -135,6 +135,7 @@ class Fluent::GeoipOutput < Fluent::BufferedOutput
   def get_address(record)
     address = {}
     @geoip_lookup_key.each do |field|
+      address.store(field, record[field]); next if not record[field].nil?
       key = field.split('.')
       obj = record
       key.each {|k|

data/test/plugin/test_out_geoip.rb

@@ -89,7 +89,9 @@ class GeoipOutputTest < Test::Unit::TestCase
   def test_emit_tag_option
     d1 = create_driver(%[
       geoip_lookup_key  host
-      enable_key_city   geoip_city
+      <record>
+        geoip_city      ${city['host']}
+      </record>
       remove_tag_prefix input.
       tag               geoip.${tag}
     ], 'input.access')
@@ -104,6 +106,43 @@ class GeoipOutputTest < Test::Unit::TestCase
     assert_equal nil, emits[1][2]['geoip_city']
   end
 
+  def test_emit_tag_parts
+    d1 = create_driver(%[
+      geoip_lookup_key  host
+      <record>
+        geoip_city      ${city['host']}
+      </record>
+      tag               geoip.${tag_parts[1]}.${tag_parts[2..3]}.${tag_parts[-1]}
+    ], '0.1.2.3')
+    d1.run do
+      d1.emit({'host' => '66.102.3.80'})
+    end
+    emits = d1.emits
+    assert_equal 1, emits.length
+    assert_equal 'geoip.1.2.3.3', emits[0][0] # tag
+    assert_equal 'Mountain View', emits[0][2]['geoip_city']
+  end
+
+  def test_emit_with_dot_key
+    d1 = create_driver(%[
+      geoip_lookup_key  ip.origin, ip.dest
+      <record>
+        origin_country  ${country_code['ip.origin']}
+        dest_country    ${country_code['ip.dest']}
+      </record>
+      remove_tag_prefix input.
+      tag               geoip.${tag}
+    ], 'input.access')
+    d1.run do
+      d1.emit({'ip.origin' => '66.102.3.80', 'ip.dest' => '8.8.8.8'})
+    end
+    emits = d1.emits
+    assert_equal 1, emits.length
+    assert_equal 'geoip.access', emits[0][0] # tag
+    assert_equal 'US', emits[0][2]['origin_country']
+    assert_equal 'US', emits[0][2]['dest_country']
+  end
+
   def test_emit_nested_attr
     d1 = create_driver(%[
       geoip_lookup_key  host.ip

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-geoip
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler