logstash-filter-geoip 7.1.1-java → 7.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8f972c83ce35472fe5a892d06feb1456a9ff072fb6d7807c506b2d2ea315450
-  data.tar.gz: 91b5177cb892abadb65dfb17eaea8ee662fde6e9a7ed9117a8e5313fe24cb6e0
+  metadata.gz: 1fdbefd7d67ce88da09217eba70f5c832e7028e65d7d99e0f448a24b20ffa4da
+  data.tar.gz: e5c196d95a1c6ec91344bea503fbca857bc065ba488ac9162a72544fd24dbc6e
 SHA512:
-  metadata.gz: 1bb793fafd708598ed64de4b6131bd527e5a6d7b61d4e997f025c4e251158bcabc163dd41250202957617bd0bab6e6084c5b209a823af7cd8d8e2380c0aa269d
-  data.tar.gz: a44e5bab8b0157621a274437336af8eb90dc2565047fcd2076ef0933b76b1482c0aa441164a67651f874331651bfef548fd6a554fcf6e82930bfc9accb7cf2bd
+  metadata.gz: d22461fdcd209c6e90cf11150698927b6c379a0ddd494cae2fa5d4efe713ef38c0378b2108415508c1808a416b63a7fcaf77650ea7b835caa2aa0810281926b7
+  data.tar.gz: 283774d77acecf709d5530c7c9501b8b2a26e732ce41af2924a774c4c7bcfbd8401a974b4aa0e28840af86ae00d02b22280d7c27fbf3fce0063f3349b22a9d2d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 7.1.2
+  - Remove EULA doc as MaxMind auto-update has been retargeted to a later release [#183](https://github.com/logstash-plugins/logstash-filter-geoip/pull/183)
+
 ## 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)
 

data/docs/index.asciidoc

@@ -37,25 +37,6 @@ can be https://dev.maxmind.com/geoip/geoip2/geolite2[downloaded from here].
 
 If you would like to get Autonomous System Number(ASN) information, you can use the GeoLite2-ASN database.
 
-[id="plugins-{type}s-{plugin}-database_license"]
-==== Database License
-
-https://www.maxmind.com[MaxMind] changed from releasing the GeoIP database under
-a Creative Commons (CC) license to a proprietary end-user license agreement
-(EULA).  The MaxMind EULA requires Logstash to update the MaxMind database
-within 30 days of a database update. If Logstash fails to download the database
-for 30 days, it will stop the pipeline in order to maintain compliance.
-
-The GeoIP filter plugin can manage the database for users running the Logstash default
-distribution, or you can manage
-database updates on your own. The behavior is controlled by the `database` setting.
-When you use the default `database` setting, the auto-update feature ensures that the plugin is
-using the latest version of the database.
-Otherwise, you are responsible for maintaining compliance.
-
-The Logstash open source distribution uses the MaxMind Creative Commons license
-database by default.
-
 ==== Details
 
 A `[geoip][location]` field is created if
@@ -129,16 +110,14 @@ number of cache misses and waste memory.
 ===== `database`
 
   * Value type is <<path,path>>
-  * If not specified, the database defaults to the GeoLite2 City database that ships with Logstash.
+  * There is no default value for this setting.
 
 The path to MaxMind's database file that Logstash should use. The default database is GeoLite2-City.
 GeoLite2-City, GeoLite2-Country, GeoLite2-ASN are the free databases from MaxMind that are supported.
 GeoIP2-City, GeoIP2-ISP, GeoIP2-Country are the commercial databases from MaxMind that are supported.
 
-Database auto-update applies to default distribution. When `database` points to user's database path,
-auto-update will be disabled.
-See
-<<plugins-{type}s-{plugin}-database_license,Database License>> for more information.
+If not specified, this will default to the GeoLite2 City database that ships
+with Logstash.
 
 [id="plugins-{type}s-{plugin}-default_database_type"]
 ===== `default_database_type`

data/logstash-filter-geoip.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-geoip'
-  s.version         = '7.1.1'
+  s.version         = '7.1.2'
   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/geoip_online_spec.rb

@@ -10,7 +10,7 @@ describe LogStash::Filters::GeoIP do
     ::File.delete(METADATA_PATH) if ::File.exist?(METADATA_PATH)
   end
 
-  describe "config without database path in LS >= 7.13", :aggregate_failures do
+  xdescribe "config without database path in LS >= 7.13", :aggregate_failures do
     before(:each) do
       dir_path = Stud::Temporary.directory
       File.open(dir_path + '/uuid', 'w') { |f| f.write(SecureRandom.uuid) }
@@ -61,5 +61,5 @@ describe LogStash::Filters::GeoIP do
         expect(::File.exist?(METADATA_PATH)).to be_falsey
       end
     end
-  end if MAJOR < 7 || (MAJOR == 7 && MINOR <= 12)
+  end if MAJOR < 7 || (MAJOR == 7 && MINOR <= 13)
 end

metadata

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