fluent-plugin-filter-geoip 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22375e434125aebe8277c4d7fa7f514eb7966509
-  data.tar.gz: 1e3bbf3d9fdd1d1f7346fcfa9d86363bdf535525
+  metadata.gz: a5523f7842532f6fbcdbb0f53bfcfc6aeab71472
+  data.tar.gz: 9a9b2fcc94bbdbb17dde860b8d2aac6b9cda64e8
 SHA512:
-  metadata.gz: 22fdd539a5ac12301846a33c52e160e1a5dfbdb92765aff8b08fd9bd1cfe40bfaab483844a249be5f856c7249b9268a85a25767c126ff2214a0bd503db09f767
-  data.tar.gz: e1e88ac9eb9b0fdc643cda4cd1fe4fc3103f90d7c0d1f66a32a0bebd787b08f99d94028aa18336ec61c2262eebba40cfca9ad2d640ba390494a813c97adbb9e5
+  metadata.gz: f6dd32a6bd3699dbbef1dfe2da3ba581e2b936ceef1f268583fa759b8d35521e8951193434b6ac563c41ecd995ec2f95ca1451feae220ae0bcd281aee0e87bcd
+  data.tar.gz: 635c1a0fc6fdfcdff9120282fa43f17f9b0649b0653ac23a75b9114ab1ce859c3c8349c9549930b8b245d1939338e9b8695bb54aee97c7862e27cdf8b75eadbf

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.4.0"
+  spec.version       = "0.5.0"
   spec.authors       = ["Minoru Osuka"]
   spec.email         = ["minoru.osuka@gmail.com"]
 

data/lib/fluent/plugin/filter_geoip.rb

@@ -119,6 +119,7 @@ module Fluent
         end
 
         if geoip.found? then
+          record.merge!({@output_field => {}})
           if @continent then
             continent_hash = {}
 
@@ -139,7 +140,7 @@ module Fluent
               if @flatten then
                 record.merge!(to_flatten(continent_hash, [@output_field, 'continent'], @field_delimiter))
               else
-                record[[@output_field, 'continent'].join(@field_delimiter)] = continent_hash.to_json
+                record[@output_field].merge!({'continent' => continent_hash})
               end
             end
           end
@@ -164,7 +165,7 @@ module Fluent
               if @flatten then
                 record.merge!(to_flatten(country_hash, [@output_field, 'country'], @field_delimiter))
               else
-                record[[@output_field, 'country'].join(@field_delimiter)] = country_hash.to_json
+                record[@output_field].merge!({'country' => country_hash})
               end
             end
           end
@@ -189,7 +190,7 @@ module Fluent
               if @flatten then
                 record.merge!(to_flatten(city_hash, [@output_field, 'city'], @field_delimiter))
               else
-                record[[@output_field, 'city'].join(@field_delimiter)] = city_hash.to_json
+                record[@output_field].merge!({'city' => city_hash})
               end
             end
           end
@@ -214,7 +215,7 @@ module Fluent
               if @flatten then
                 record.merge!(to_flatten(location_hash, [@output_field, 'location'], @field_delimiter))
               else
-                record[[@output_field, 'location'].join(@field_delimiter)] = location_hash.to_json
+                record[@output_field].merge!({'location' => location_hash})
               end
             end
           end
@@ -230,7 +231,7 @@ module Fluent
               if @flatten then
                 record.merge!(to_flatten(postal_hash, [@output_field, 'postal'], @field_delimiter))
               else
-                record[[@output_field, 'postal'].join(@field_delimiter)] = postal_hash.to_json
+                record[@output_field].merge!({'postal' => postal_hash})
               end
             end
           end
@@ -255,7 +256,7 @@ module Fluent
               if @flatten then
                 record.merge!(to_flatten(registered_country_hash, [@output_field, 'registered_country'], @field_delimiter))
               else
-                record[[@output_field, 'registered_country'].join(@field_delimiter)] = registered_country_hash.to_json
+                record[@output_field].merge!({'registered_country' => registered_country_hash})
               end
             end
           end
@@ -280,7 +281,7 @@ module Fluent
               if @flatten then
                 record.merge!(to_flatten(represented_country_hash, [@output_field, 'represented_country'], @field_delimiter))
               else
-                record[[@output_field, 'represented_country'].join(@field_delimiter)] = represented_country_hash.to_json
+                record[@output_field].merge!({'represented_country' => represented_country_hash})
               end
             end
           end
@@ -320,7 +321,7 @@ module Fluent
                   i = i + 1
                 end
               else
-                record[[@output_field, 'subdivisions'].join(@field_delimiter)] = subdivision_arry.to_json
+                record[@output_field].merge!({'subdivisions' => subdivision_arry})
               end
             end
           end
@@ -339,14 +340,19 @@ module Fluent
               if @flatten then
                 record.merge!(to_flatten(traits_hash, [@output_field, 'traits'], @field_delimiter))
               else
-                record[[@output_field, 'traits'].join(@field_delimiter)] = traits_hash.to_json
+                record[@output_field].merge!({'traits' => traits_hash})
               end
             end
           end
 
           if @connection_type then
             unless geoip.connection_type.nil? then
-              record[[@output_field, 'connection_type'].join(@field_delimiter)] = geoip.connection_type
+              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})
+              end
             end
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter-geoip
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Minoru Osuka