fluent-plugin-filter-geoip 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5523f7842532f6fbcdbb0f53bfcfc6aeab71472
-  data.tar.gz: 9a9b2fcc94bbdbb17dde860b8d2aac6b9cda64e8
+  metadata.gz: a2a57f588b7e2d42cbd09351534106951450cba7
+  data.tar.gz: 9bcad934b659525194d165664e06fa87196e9b11
 SHA512:
-  metadata.gz: f6dd32a6bd3699dbbef1dfe2da3ba581e2b936ceef1f268583fa759b8d35521e8951193434b6ac563c41ecd995ec2f95ca1451feae220ae0bcd281aee0e87bcd
-  data.tar.gz: 635c1a0fc6fdfcdff9120282fa43f17f9b0649b0653ac23a75b9114ab1ce859c3c8349c9549930b8b245d1939338e9b8695bb54aee97c7862e27cdf8b75eadbf
+  metadata.gz: ddb690229c803f1ada3479f9313bd325074eabc778698e5787cf2a494839a84ac2aac0358e03880ba381366c23db89738ba644fcc23b50982ec8f890170f1db5
+  data.tar.gz: adef0e6bac3b902ec836335de51d85f0c97f3911fa6f6a4fe36f0da6f2a4cbee7cfa97b764c6524dc353144598c07a0d3b2c1d140451bac3d1960c9548976582

data/README.md

@@ -86,10 +86,10 @@ field_delimiter .
 
 ### flatten
 
-If true, to flatten the result using field_delimiter (default: true).
+If true, to flatten the result using field_delimiter (default: false).
 
 ```
-flatten true
+flatten false
 ```
 
 ### locale
@@ -192,10 +192,10 @@ connection_type true
   md5_path ./geoip/database/GeoLite2-City.md5
   database_path ./geoip/database/GeoLite2-City.mmdb
 
-  lookup_field host
+  lookup_field clientip
   field_prefix geoip
   field_delimiter .
-  flatten true
+  flatten false
 
   locale en
 
@@ -216,14 +216,7 @@ Assuming following inputs are coming:
 
 ```javascript
 {
-  "host":"180.195.25.228",
-  "user":"-",
-  "method":"GET",
-  "path":"/category/giftcards?from=20",
-  "code":"200",
-  "size":"63",
-  "referer":"-",
-  "agent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:9.0.1) Gecko/20100101 Firefox/9.0.1"
+  "clientip": "200.114.49.218"
 }
 ```
 
@@ -231,35 +224,38 @@ then output bocomes as belows:
 
 ```javascript
 {
-  "host":"180.195.25.228",
-  "user":"-",
-  "method":"GET",
-  "path":"/category/giftcards?from=20",
-  "code":"200",
-  "size":"63",
-  "referer":"-",
-  "agent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:9.0.1) Gecko/20100101 Firefox/9.0.1",
-  "geoip.continent.code":"AS",
-  "geoip.continent.geoname_id":6255147,
-  "geoip.continent.name":"Asia",
-  "geoip.country.geoname_id":1694008,
-  "geoip.country.iso_code":"PH",
-  "geoip.country.name":"Philippines",
-  "geoip.city.geoname_id":1728893,
-  "geoip.city.name":"Bagumbayan",
-  "geoip.location.latitude":13.45,
-  "geoip.location.longitude":123.6667,
-  "geoip.location.time_zone":"Asia/Manila",
-  "geoip.postal.code":"4513",
-  "geoip.registered_country.geoname_id":1694008,
-  "geoip.registered_country.iso_code":"PH",
-  "geoip.registered_country.name":"Philippines",
-  "geoip.subdivisions.0.geoname_id":7521310,
-  "geoip.subdivisions.0.iso_code":"05",
-  "geoip.subdivisions.0.name":"Bicol",
-  "geoip.subdivisions.1.geoname_id":1731616,
-  "geoip.subdivisions.1.iso_code":"ALB",
-  "geoip.subdivisions.1.name":"Province of Albay",
+  "clientip": "200.114.49.218",
+  "geoip": {
+    "continent": {
+      "code": "SA",
+      "geoname_id": 6255150,
+      "name": "South America"
+    },
+    "country": {
+      "geoname_id": 3686110,
+      "iso_code": "CO",
+      "name": "Colombia"
+    },
+    "city": {
+      "geoname_id": 3674962,
+      "name": "Medellín"
+    },
+    "location": {
+      "latitude": 6.2518,
+      "longitude": -75.5636,
+      "time_zone": "America/Bogota"
+    },
+    "registered_country": {
+      "geoname_id": 3686110,
+      "iso_code": "CO",
+      "name": "Colombia"
+    },
+    "subdivisions": [{
+      "geoname_id": 3689815,
+      "iso_code": "ANT",
+      "name": "Antioquia"
+    }]
+  }
 }
 ```
 

data/fluent-plugin-filter-geoip.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-filter-geoip"
-  spec.version       = "0.5.0"
+  spec.version       = "0.5.1"
   spec.authors       = ["Minoru Osuka"]
   spec.email         = ["minoru.osuka@gmail.com"]
 

data/lib/fluent/plugin/filter_geoip.rb

@@ -119,7 +119,11 @@ module Fluent
         end
 
         if geoip.found? then
-          record.merge!({@output_field => {}})
+
+          unless @flatten then
+            record.merge!({@output_field => {}})
+          end
+
           if @continent then
             continent_hash = {}
 
@@ -348,7 +352,6 @@ module Fluent
           if @connection_type then
             unless geoip.connection_type.nil? then
               if @flatten then
-                #record[[@output_field, 'connection_type'].join(@field_delimiter)] = geoip.connection_type
                 record.merge!(to_flatten(geoip.connection_type, [@output_field, 'connection_type'], @field_delimiter))
               else
                 record[@output_field].merge!({'connection_type' => geoip.connection_type})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter-geoip
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Minoru Osuka
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fluent filter plugin for adding GeoIP data to record.