logstash-filter-geoip 3.0.1-java → 4.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6feb2b996162b63f647cc202d85fe853a358d3c1
-  data.tar.gz: 707152e2d98e89ac0f5a1f4a5c588cab442fe1ec
+  metadata.gz: a0d593eaa0190aff6047ca64ff4ef20e7978d5cb
+  data.tar.gz: c2038e7fbd83c2bed569db62a2e9978fd9279eb7
 SHA512:
-  metadata.gz: 7ff678eae2da7747873ba58bb65c3954edb784935c9744caf3fa6b73efc97d714ea479d33a95c784b8eca8bcb0047fb65131f0323fa74aef8c297a1843b5c4aa
-  data.tar.gz: 81163748ac22f1c3b3bd52f923c3dd9b6e6ab2e7e684fddf823b70ad34eeddecb9c53492f47da4d18768f48283ba0ea6dff2621c3e641258545905341d6725c7
+  metadata.gz: 4637a333526e7117f25c5bf51e165969893a845f1e7ee99dbd2011165f4ef08ab9b882e8ed30ae1a7d62560b3adef856ae7d92528665be5169c28e9bd071621a
+  data.tar.gz: 0c07f47a558b6e9d065341b50057dee4348984724b58903a9607c618bb4c4888f31117d9bc9251d315a32f3990981f30380ac535270608a6f281656a76496e77

data/CHANGELOG.md

@@ -1,8 +1,6 @@
-# 3.0.1
-  - [internal] fix utf-8 encoding of spec file for failing test
-
-# 3.0.0
- - GA release of GeoIP2 support to be compatible with LS 2.x
+## 4.0.0
+  - Update the plugin to the version 2.0 of the plugin api, this change is required for Logstash 5.0 compatibility. See https://github.com/elastic/logstash/issues/5141
+  - GA release for GeoIP2 database, compatible with LS 5.x
 
 # 3.0.0-beta3
  - Return empty result when IP lookup fails for location field (#70)

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
-gemspec
+
+# Specify your gem's dependencies in logstash-mass_effect.gemspec
+gemspec

data/lib/logstash/filters/geoip.rb

@@ -151,7 +151,7 @@ class LogStash::Filters::GeoIP < LogStash::Filters::Base
     return unless filter?(event)
 
     begin
-      ip = event[@source]
+      ip = event.get(@source)
       ip = ip.first if ip.is_a? Array
       geo_data_hash = Hash.new
       ip_address = InetAddress.getByName(ip)
@@ -167,7 +167,7 @@ class LogStash::Filters::GeoIP < LogStash::Filters::Base
       raise e
     end
 
-    event[@target] = geo_data_hash
+    event.set(@target, geo_data_hash)
 
     if geo_data_hash.empty?
       tag_unsuccessful_lookup(event)
@@ -229,7 +229,7 @@ class LogStash::Filters::GeoIP < LogStash::Filters::Base
   end
 
   def tag_unsuccessful_lookup(event)
-    @logger.debug? && @logger.debug("IP #{event[@source]} was not found in the database", :event => event)
+    @logger.debug? && @logger.debug("IP #{event.get(@source)} was not found in the database", :event => event)
     @tag_on_failure.each{|tag| event.tag(tag)}
   end
 

data/logstash-filter-geoip.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-geoip'
-  s.version         = '3.0.1'
+  s.version         = '4.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "$summary"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
 
   s.requirements << "jar com.maxmind.geoip2:geoip2, 2.5.0, :exclusions=> [com.google.http-client:google-http-client]"
 

data/spec/filters/geoip_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/filters/geoip"
 
@@ -24,13 +23,13 @@ describe LogStash::Filters::GeoIP do
                            latitude longitude dma_code timezone
                            location )
       expected_fields.each do |f|
-        insist { subject["geoip"] }.include?(f)
+        insist { subject.get("geoip") }.include?(f)
       end
     end
 
     sample("ip" => "127.0.0.1") do
       # assume geoip fails on localhost lookups
-      expect(subject["geoip"]).to eq({})
+      expect(subject.get("geoip")).to eq({})
     end
   end
 
@@ -56,19 +55,19 @@ describe LogStash::Filters::GeoIP do
                              latitude longitude dma_code timezone
                              location )
         expected_fields.each do |f|
-          expect(subject["src_ip"]).to include(f)
+          expect(subject.get("src_ip")).to include(f)
         end
       end
 
       sample("ip" => "127.0.0.1") do
         # assume geoip fails on localhost lookups
-        expect(subject["src_ip"]).to eq({})
+        expect(subject.get("src_ip")).to eq({})
       end
     end
 
     context "when specifying add_tag" do
       sample("ip" => "8.8.8.8") do
-        expect(subject["tags"]).to include("done")
+        expect(subject.get("tags")).to include("done")
       end
     end
   end
@@ -88,9 +87,9 @@ describe LogStash::Filters::GeoIP do
     sample("ip" => "1.1.1.1") do
       checked = 0
       expected_fields.each do |f|
-        next unless subject["geoip"][f]
+        next unless subject.get("geoip")[f]
         checked += 1
-        insist { subject["geoip"][f].encoding } == Encoding::UTF_8
+        insist { subject.get("geoip")[f].encoding } == Encoding::UTF_8
       end
       insist { checked } > 0
     end
@@ -98,9 +97,9 @@ describe LogStash::Filters::GeoIP do
     sample("ip" => "189.2.0.0") do
       checked = 0
       expected_fields.each do |f|
-        next unless subject["geoip"][f]
+        next unless subject.get("geoip")[f]
         checked += 1
-        insist { subject["geoip"][f].encoding } == Encoding::UTF_8
+        insist { subject.get("geoip")[f].encoding } == Encoding::UTF_8
       end
       insist { checked } > 0
     end
@@ -118,7 +117,7 @@ describe LogStash::Filters::GeoIP do
       end
 
       it "should have a location field" do
-        expect(event["[geoip][location]"]).not_to(be_nil)
+        expect(event.get("[geoip][location]")).not_to(be_nil)
       end
     end
 
@@ -171,11 +170,11 @@ describe LogStash::Filters::GeoIP do
         let(:ipstring) { "N/A" }
 
         it "should set the target field to an empty hash" do
-          expect(event["geoip"]).to eq({})
+          expect(event.get("geoip")).to eq({})
         end
 
         it "should add failure tags" do
-          expect(event["tags"]).to include("_geoip_lookup_failure")
+          expect(event.get("tags")).to include("_geoip_lookup_failure")
         end
       end
 
@@ -184,7 +183,7 @@ describe LogStash::Filters::GeoIP do
         let(:ipstring) { "123.45.67.89,61.160.232.222" }
 
         it "should set the target field to an empty hash" do
-          expect(event["geoip"]).to eq({})
+          expect(event.get("geoip")).to eq({})
         end
       end
       
@@ -192,8 +191,8 @@ describe LogStash::Filters::GeoIP do
         let(:ipstring) { "113.208.89.21" }
 
         it "should set the target field to an empty hash" do
-          expect(event["geoip"]).to eq({})
-          expect(event["tags"]).to include("_geoip_lookup_failure")
+          expect(event.get("geoip")).to eq({})
+          expect(event.get("tags")).to include("_geoip_lookup_failure")
         end
       end
       
@@ -201,7 +200,7 @@ describe LogStash::Filters::GeoIP do
         let(:ipstring) { "::1" }
 
         it "should set the target field to an empty hash" do
-          expect(event["geoip"]).to eq({})
+          expect(event.get("geoip")).to eq({})
         end
       end
       
@@ -209,8 +208,8 @@ describe LogStash::Filters::GeoIP do
         let(:ipstring) { "2607:f0d0:1002:51::4" }
 
         it "should set the target field to an empty hash" do
-          expect(event["geoip"]).not_to be_empty
-          expect(event["geoip"]["city_name"]).not_to be_nil
+          expect(event.get("geoip")).not_to be_empty
+          expect(event.get("geoip")["city_name"]).not_to be_nil
         end
       end
       
@@ -243,4 +242,4 @@ describe LogStash::Filters::GeoIP do
     end
   end
 
-end
+end

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-geoip
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   name: jar-dependencies
@@ -35,13 +35,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
   name: ruby-maven
@@ -49,13 +49,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-devutils
@@ -63,7 +63,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program
@@ -105,20 +105,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - jar com.maxmind.geoip2:geoip2, 2.5.0, :exclusions=> [com.google.http-client:google-http-client]
 rubyforge_project:
-rubygems_version: 2.6.3
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
-summary: "$summary"
+summary: $summary
 test_files:
 - spec/filters/geoip_spec.rb