fluent-plugin-geoip 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b35da517cb09039e887c3c2a4fc65878ea5c5de9
-  data.tar.gz: 69cd94d72b73b04b1f7344815c0b1aa96d98ba30
+  metadata.gz: cd066ccaec269f0423567cb6b67fb2f740bd75bf
+  data.tar.gz: 59ceed4885348c00333ae21b859311474ed1a01e
 SHA512:
-  metadata.gz: b7083fe1c2cde0d12ed5da0954c3749d914ec0a78f26d4570cb8a3e62c7623d76e4711ea33788ddded0190dfc43a9dd7bd8f6c88329fd56022adc153cf651cd4
-  data.tar.gz: c4834cea64a1fbc55ea8b01cda60b3b7cc38f1a1daaaee66b2333e3c770a02f3cbaa04096e710406b221a890702ddf2b098b5f8f4f8cda238125a771c1781112
+  metadata.gz: 7e1c15b06c1916d28656c6607e0d31c716622a0c1436a45d15eeab7d4cea049b9a728a87af7603693305399fa98180a63b43f954298feff9a7cbfa439bccf93d
+  data.tar.gz: 1699358cd3e9841ba975d07853a05a5af2ead21c42469fa892f1cce9917f08baabc711905011d6547d8bd10da00616e53b437ff4adb64dd0baddb99f0276c57b

data/README.md

@@ -16,7 +16,7 @@ before use, install dependent library as:
 
 ```bash
 # for RHEL/CentOS
-$ sudo yum group install "Development Tools"
+$ sudo yum groupinstall "Development Tools"
 $ sudo yum install geoip-devel --enablerepo=epel
 $ sudo yum install libmaxminddb-devel --enablerepo=epel
 

data/dockerfiles/Dockerfile-ruby2.1

@@ -2,7 +2,7 @@ FROM ruby:2.1-alpine
 
 ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
 
-RUN apk --no-cache --update add build-base ruby-dev libc6-compat libmaxminddb-dev geoip-dev git
+RUN apk --no-cache --update add build-base automake autoconf libtool ruby-dev libc6-compat geoip-dev git
 
 WORKDIR /app
 COPY . .

data/dockerfiles/Dockerfile-ruby2.2

@@ -2,7 +2,7 @@ FROM ruby:2.2-alpine
 
 ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
 
-RUN apk --no-cache --update add build-base ruby-dev libc6-compat libmaxminddb-dev geoip-dev git
+RUN apk --no-cache --update add build-base automake autoconf libtool ruby-dev libc6-compat geoip-dev git
 
 WORKDIR /app
 COPY . .

data/dockerfiles/Dockerfile-ruby2.3

@@ -2,7 +2,7 @@ FROM ruby:2.3-alpine
 
 ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
 
-RUN apk --no-cache --update add build-base ruby-dev libc6-compat libmaxminddb-dev geoip-dev git
+RUN apk --no-cache --update add build-base automake autoconf libtool ruby-dev libc6-compat geoip-dev git
 
 WORKDIR /app
 COPY . .

data/dockerfiles/Dockerfile-ruby2.4

@@ -2,7 +2,7 @@ FROM ruby:2.4-alpine
 
 ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
 
-RUN apk --no-cache --update add build-base ruby-dev libc6-compat libmaxminddb-dev geoip-dev git
+RUN apk --no-cache --update add build-base automake autoconf libtool ruby-dev libc6-compat geoip-dev git
 
 WORKDIR /app
 COPY . .

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.8.1"
+  spec.version       = "0.8.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

@@ -9,11 +9,11 @@ module Fluent
     config_param :geoip_lookup_key, :string, :default => 'host'
     config_param :skip_adding_null_record, :bool, :default => false
 
+    include Fluent::SetTagKeyMixin
     config_set_default :include_tag_key, false
 
     config_param :hostname_command, :string, :default => 'hostname'
 
-    config_param :flush_interval, :time, :default => 0
     config_param :log_level, :string, :default => 'warn'
 
     config_param :backend_library, :enum, :list => Fluent::GeoIP::BACKEND_LIBRARIES, :default => :geoip
@@ -27,6 +27,7 @@ module Fluent
       new_es = MultiEventStream.new
       es.each do |time, record|
         begin
+          filter_record(tag, time, record)
           filtered_record = @geoip.add_geoip_field(record)
           new_es.add(time, filtered_record) if filtered_record
         rescue => e

data/test/plugin/test_filter_geoip.rb

@@ -130,6 +130,27 @@ class GeoipFilterTest < Test::Unit::TestCase
   end
 
   sub_test_case "geoip2_c" do
+    def test_filter_with_include_tag_key
+      config = %[
+        backend_library   geoip2_c
+        geoip_lookup_key  ip.origin, ip.dest
+        <record>
+          origin_country  ${country.iso_code['ip.origin']}
+          dest_country    ${country.iso_code['ip.dest']}
+        </record>
+        include_tag_key   true
+      ]
+      messages = [
+        {'ip.origin' => '66.102.3.80', 'ip.dest' => '8.8.8.8'}
+      ]
+      expected = [
+        {'ip.origin' => '66.102.3.80', 'ip.dest' => '8.8.8.8',
+         'origin_country' => 'US', 'dest_country' => 'US', 'tag' => 'test' }
+      ]
+      filtered = filter(config, messages)
+      assert_equal(expected, filtered)
+    end
+
     def test_filter_with_dot_key
       config = %[
         backend_library   geoip2_c
@@ -717,6 +738,25 @@ class GeoipFilterTest < Test::Unit::TestCase
       end
       assert_equal(expected, filtered)
     end
+
+    def test_filter_with_include_tag_key
+      config = %[
+        backend_library geoip2_compat
+        geoip_lookup_key  host
+        enable_key_city   geoip_city
+        include_tag_key   true
+      ]
+      messages = [
+        {'host' => '66.102.3.80', 'message' => 'valid ip'},
+        {'message' => 'missing field'},
+      ]
+      expected = [
+        {'host' => '66.102.3.80', 'message' => 'valid ip', 'geoip_city' => 'Mountain View', 'tag' => 'test'},
+        {'message' => 'missing field', 'geoip_city' => nil, 'tag' => 'test'},
+      ]
+      filtered = filter(config, messages)
+      assert_equal(expected, filtered)
+    end
   end
 
   sub_test_case "geoip legacy" do
@@ -1096,6 +1136,24 @@ class GeoipFilterTest < Test::Unit::TestCase
       end
       assert_equal(expected, filtered)
     end
+
+    def test_filter_with_include_tag_key
+      config = %[
+        geoip_lookup_key  host
+        enable_key_city   geoip_city
+        include_tag_key   true
+      ]
+      messages = [
+        {'host' => '66.102.3.80', 'message' => 'valid ip'},
+        {'message' => 'missing field'},
+      ]
+      expected = [
+        {'host' => '66.102.3.80', 'message' => 'valid ip', 'geoip_city' => 'Mountain View', 'tag' => 'test'},
+        {'message' => 'missing field', 'geoip_city' => nil, 'tag' => 'test'},
+      ]
+      filtered = filter(config, messages)
+      assert_equal(expected, filtered)
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-geoip
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Kentaro Yoshida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-26 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler