fluent-plugin-geoip 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f90a0511cb3b631423f10611fa9b31ce69a1ba2eb815a959ee31ea83bba7cd91
-  data.tar.gz: 0ff06245d1aa1633cebae4d3a764e24dc8a1af5c67b6c7fd7039350f55bf0067
+  metadata.gz: 35bca82d01d71c2eed7db735cf4e2394e6af0ec420baa511cfe74431fd0c88c4
+  data.tar.gz: e15c7f9fec5855d0012d97a65d0aa170338a169229e65eea5baf798c4d2d2763
 SHA512:
-  metadata.gz: 513d669a7a40673aee8329be06f1dc4d024f286e13d1760126c0fe3b6f6ad15a06aee54c3bef8ebd227a506202d4e4886425caa540efcf80bd4bb4423ed45051
-  data.tar.gz: afcb9809f98196b6de647e58111dc608caf8143c6bd966b44d412eada89404efb46b842755484768dcb9faba781de8c44ad8f2aa5cf3ccb8f62e34b8a3f42363
+  metadata.gz: c67641b18a5254169fa4c0d0fa7b32e1612c2f65c6f7ebfd5afffeaaa7c1f5a1ffa1e77334e10a7f5cecf476e0dbd6b7d64f080d93894b4b0cf8f7c4092b141d
+  data.tar.gz: c7e7fa0d170d4f451f9666bf471a76b193a7f0e466403992b85cb6051bc72b1a94e6f54ffe378cc5414d8cdf251a02402fa26c01507e58baf2b2db313690e4d3

data/README.md

@@ -31,10 +31,12 @@ before use, install dependent library as:
 # for RHEL/CentOS
 $ sudo yum groupinstall "Development Tools"
 $ sudo yum install geoip-devel --enablerepo=epel
+$ sudo yum install libmaxminddb-devel
 
 # for Ubuntu/Debian
 $ sudo apt-get install build-essential
 $ sudo apt-get install libgeoip-dev
+$ sudo apt-get install libmaxminddb-dev
 
 # for OS X
 $ brew install geoip
@@ -191,7 +193,7 @@ We can avoid this behavior changing field order in `` like following:
 
 #### Tips: nested attributes for geoip_lookup_keys
 
-See [Record Accessor Plugin](https://docs.fluentd.org/v1.0/articles/api-plugin-helper-record_accessor#syntax)
+See [Record Accessor Plugin Helper](https://docs.fluentd.org/plugin-helper-overview/api-plugin-helper-record_accessor)
 
 **NOTE** Since v1.3.0 does not interpret `host.ip` as nested attribute.
 
@@ -355,18 +357,18 @@ Note that filter version of `geoip` plugin does not have handling `tag` feature.
 
 #### Plugin helpers
 
-* [compat_parameters](https://docs.fluentd.org/v1.0/articles/api-plugin-helper-compat_parameters)
-* [inject](https://docs.fluentd.org/v1.0/articles/api-plugin-helper-inject)
+* [compat_parameters](https://docs.fluentd.org/plugin-helper-overview/api-plugin-helper-compat_parameters)
+* [inject](https://docs.fluentd.org/plugin-helper-overview/api-plugin-helper-inject)
 
-See also [Filter Plugin Overview](https://docs.fluentd.org/v1.0/articles/filter-plugin-overview)
+See also [Filter Plugin Overview](https://docs.fluentd.org/filter)
 
 #### Supported sections
 
-* [Inject section configurations](https://docs.fluentd.org/v1.0/articles/inject-section)
+* [Inject section configurations](https://docs.fluentd.org/configuration/inject-section)
 
 #### Parameters
 
-[Plugin Common Paramteters](https://docs.fluentd.org/v1.0/articles/plugin-common-parameters)
+[Plugin Common Paramteters](https://docs.fluentd.org/configuration/plugin-common-parameters)
 
 **geoip_database** (string) (optional)
 

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       = "1.3.1"
+  spec.version       = "1.3.2"
   spec.authors       = ["Kentaro Yoshida"]
   spec.email         = ["y.ken.studio@gmail.com"]
   spec.summary       = %q{Fluentd Filter plugin to add information about geographical location of IP addresses with Maxmind GeoIP databases.}

data/lib/fluent/plugin/filter_geoip.rb

@@ -169,11 +169,15 @@ module Fluent::Plugin
       addresses.each do |field, ip|
         geo = nil
         if ip
-          geo = if @geoip.respond_to?(:look_up)
-                  @geoip.look_up(ip)
-                else
-                  @geoip.lookup(ip)
-                end
+          if ip.empty?
+            log.warn "#{field} is empty string"
+          else
+            geo = if @geoip.respond_to?(:look_up)
+                    @geoip.look_up(ip)
+                  else
+                    @geoip.lookup(ip)
+                  end
+          end
         end
         geodata[field] = geo
       end

data/test/plugin/test_filter_geoip.rb

@@ -209,6 +209,26 @@ class GeoipFilterTest < Test::Unit::TestCase
       assert_equal(expected, filtered)
     end
 
+    def test_filter_with_empty_string
+      config = %[
+        backend_library   geoip2_c
+        geoip_lookup_keys host
+        <record>
+          geoip_city      '${city.names.en["host"]}'
+          geopoint        '[${location.longitude["host"]}, ${location.latitude["host"]}]'
+        </record>
+        skip_adding_null_record false
+      ]
+      messages = [
+        {'host' => '', 'message' => 'empty string ip'},
+      ]
+      expected = [
+        {'host' => '', 'message' => 'empty string ip', 'geoip_city' => nil, 'geopoint' => [nil, nil]},
+      ]
+      filtered = filter(config, messages)
+      assert_equal(expected, filtered)
+    end
+
     def test_filter_with_skip_unknown_address
       config = %[
         backend_library   geoip2_c

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-geoip
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Kentaro Yoshida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Fluentd Filter plugin to add information about geographical location of IP