logstash-filter-geoip 7.1.0-java → 7.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3997f6af427481c6a4b2831a3253a98609c0105054182fd32ad7a1815497072
-  data.tar.gz: 6e9ba6c58d7ccfa8049a8702018422441e003607633072ad6359c700b8dce8ed
+  metadata.gz: a8f972c83ce35472fe5a892d06feb1456a9ff072fb6d7807c506b2d2ea315450
+  data.tar.gz: 91b5177cb892abadb65dfb17eaea8ee662fde6e9a7ed9117a8e5313fe24cb6e0
 SHA512:
-  metadata.gz: 44d7f9debe16a4245b7044b4dba632d1478f5216852b5ae0d2a919e797dce0d06c080a27bf82c081295819a84fd86dd3931ddc626a344624529c9255ac3dc645
-  data.tar.gz: 929c2867ab360f704123daac8536ec1f5775bd0081ba797bf563111a9ac40729f94b269e026e2f11d8367e7f3d59f446868f57ace6ddee34cb992fc5420de786
+  metadata.gz: 1bb793fafd708598ed64de4b6131bd527e5a6d7b61d4e997f025c4e251158bcabc163dd41250202957617bd0bab6e6084c5b209a823af7cd8d8e2380c0aa269d
+  data.tar.gz: a44e5bab8b0157621a274437336af8eb90dc2565047fcd2076ef0933b76b1482c0aa441164a67651f874331651bfef548fd6a554fcf6e82930bfc9accb7cf2bd

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 7.1.1
+  - Changed the behaviour of database expiry. Instead of stopping the pipeline, it adds a tag `_geoip_expired_database` [#182](https://github.com/logstash-plugins/logstash-filter-geoip/pull/182)
+
 ## 7.1.0
   - Add ECS compatibility [#179](https://github.com/logstash-plugins/logstash-filter-geoip/pull/179)
 

data/lib/logstash/filters/geoip.rb

@@ -112,6 +112,8 @@ class LogStash::Filters::GeoIP < LogStash::Filters::Base
   public
   def filter(event)
     return unless filter?(event)
+    return event.tag("_geoip_expired_database") unless @healthy_database
+
     if @geoipfilter.handleEvent(event)
       filter_matched(event)
     else
@@ -144,11 +146,23 @@ class LogStash::Filters::GeoIP < LogStash::Filters::Base
 
 
   def setup_filter(database_path)
+    @healthy_database = true
     @database = database_path
-    @logger.info("Using geoip database", :path => @database)
+    @logger.info("Using geoip database", :path => @database, :healthy_database => @healthy_database)
     @geoipfilter = org.logstash.filters.geoip.GeoIPFilter.new(@source, @target, @fields, @database, @cache_size, ecs_compatibility.to_s)
   end
 
+  # call by DatabaseManager
+  def expire_action
+    fail_filter
+  end
+
+  def fail_filter
+    @healthy_database = false
+    @logger.warn("geoip plugin will stop filtering and will tag all events with the '_geoip_expired_database' tag.",
+                 :healthy_database => @healthy_database)
+  end
+
   def terminate_filter
     @logger.info("geoip plugin is terminating")
     pipeline_id = execution_context.pipeline_id

data/logstash-filter-geoip.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-geoip'
-  s.version         = '7.1.0'
+  s.version         = '7.1.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Adds geographical information about an IP address"
   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"

data/spec/filters/test_helper.rb

@@ -1,12 +1,16 @@
 require "logstash-core/logstash-core"
 require "digest"
 
-def get_vendor_path
-  ::File.expand_path("../../vendor/", ::File.dirname(__FILE__))
+def get_vendor_path(filename)
+  ::File.join(::File.expand_path("../../vendor/", ::File.dirname(__FILE__)), filename)
+end
+
+def get_data_dir
+  ::File.join(LogStash::SETTINGS.get_value("path.data"), "plugins", "filters", "geoip")
 end
 
 def get_file_path(filename)
-  ::File.join(get_vendor_path, filename)
+  ::File.join(get_data_dir, filename)
 end
 
 def get_metadata_database_name
@@ -14,8 +18,8 @@ def get_metadata_database_name
 end
 
 METADATA_PATH = get_file_path("metadata.csv")
-DEFAULT_CITY_DB_PATH = get_file_path("GeoLite2-City.mmdb")
-DEFAULT_ASN_DB_PATH = get_file_path("GeoLite2-ASN.mmdb")
+DEFAULT_CITY_DB_PATH = get_vendor_path("GeoLite2-City.mmdb")
+DEFAULT_ASN_DB_PATH = get_vendor_path("GeoLite2-ASN.mmdb")
 
 major, minor = LOGSTASH_VERSION.split(".")
 MAJOR = major.to_i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-geoip
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.1.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement