logstash-filter-geoip 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30e2584417507ee61d735a0ac1561cd3da49f425
-  data.tar.gz: b336ef9064c855a6c85b3dfd186e2525296f4a2d
+  metadata.gz: 4cb9d672a670ac659f61fa7604bc57274eabd759
+  data.tar.gz: d697817443b57ce1ef55e4dbdd19caf657e90cc6
 SHA512:
-  metadata.gz: 697448b24bbf6be8bb130d39833b1ebc121ef4899af5a679407710fa4b317beb2dcd45163dc69f14d05d0e7058bc6f20180ea1db03a9d7d2eefead1570b5cc20
-  data.tar.gz: ee3689eb177b71a8a737a9b40e366d42fca22b3e72f3aa3ea513d916007ceed90eb61f4b0b4a4d58190b3bfd875cc78205d1a34677fc286a2c41c65a88daaba8
+  metadata.gz: 95c606eb5c2df267eb7476b91247bf14e9c4758ea1c27b720342fc6d624091473b754c11cf1b42ed13204e321910e288f17bc95e90e61fe4abd3a2e73083c213
+  data.tar.gz: 62ba7bd2e0a890969d6e2ca3c1a0575ab1ccdd8e84232d468bee03bcab0294e4d9850d889160ec5973093313cd6263ab4554897d47fe8c15400b2208bfdc886b

data/README.md

@@ -37,6 +37,12 @@ bundle install
 bundle install
 ```
 
+- Pull down GeoIP database files
+
+```sh
+bundle exec rake vendor
+```
+
 - Run tests
 
 ```sh

data/lib/logstash/filters/geoip.rb

@@ -109,9 +109,9 @@ class LogStash::Filters::GeoIP < LogStash::Filters::Base
       ip = ip.first if ip.is_a? Array
       geo_data = Thread.current[@threadkey].send(@geoip_type, ip)
     rescue SocketError => e
-      @logger.error("IP Field contained invalid IP address or hostname", :field => @field, :event => event)
+      @logger.error("IP Field contained invalid IP address or hostname", :field => @source, :event => event)
     rescue Exception => e
-      @logger.error("Unknown error while looking up GeoIP data", :exception => e, :field => @field, :event => event)
+      @logger.error("Unknown error while looking up GeoIP data", :exception => e, :field => @source, :event => event)
     end
 
     return if geo_data.nil? || !geo_data.respond_to?(:to_hash)

data/logstash-filter-geoip.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-geoip'
-  s.version         = '1.0.1'
+  s.version         = '1.0.2'
   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/plugin install gemname. This gem is not a stand-alone program"

data/spec/filters/geoip_spec.rb

@@ -171,4 +171,56 @@ describe LogStash::Filters::GeoIP do
       it_behaves_like "an event with a [geoip][location] field"
     end
   end
+
+  describe "an invalid IP" do
+    config <<-CONFIG
+          filter {
+            geoip {
+              source => "ip"
+              database => "#{ASNDB}"
+            }
+          }
+        CONFIG
+
+    context "should not raise an error" do
+      sample("ip" => "-") do
+        expect{
+          subject
+          }.to_not raise_error
+      end
+
+      sample("ip" => "~") do
+        expect{
+          subject
+          }.to_not raise_error
+      end
+    end
+
+    context "should return the correct source field in the logging message" do
+      sample("ip" => "-") do
+        expect(LogStash::Filters::GeoIP.logger).to receive(:error).with(anything, include(:field => "ip"))
+        subject
+      end
+    end
+
+  end
+
+  describe "an invalid database" do
+    config <<-CONFIG
+          filter {
+            geoip {
+              source => "ip"
+              database => "./Gemfile"
+            }
+          }
+        CONFIG
+
+    context "should return the correct sourcefield in the logging message" do
+      sample("ip" => "8.8.8.8") do
+        expect(LogStash::Filters::GeoIP.logger).to receive(:error).with(anything, include(:field => "ip"))
+        subject
+      end
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-geoip
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core