logstash-filter-geoip 4.0.0-java → 4.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0d593eaa0190aff6047ca64ff4ef20e7978d5cb
-  data.tar.gz: c2038e7fbd83c2bed569db62a2e9978fd9279eb7
+  metadata.gz: 9f13120363bb69c49ced50e21a083ce05fae4eb0
+  data.tar.gz: 4ab25721807a2ca70b8e6ce215b651f061caae92
 SHA512:
-  metadata.gz: 4637a333526e7117f25c5bf51e165969893a845f1e7ee99dbd2011165f4ef08ab9b882e8ed30ae1a7d62560b3adef856ae7d92528665be5169c28e9bd071621a
-  data.tar.gz: 0c07f47a558b6e9d065341b50057dee4348984724b58903a9607c618bb4c4888f31117d9bc9251d315a32f3990981f30380ac535270608a6f281656a76496e77
+  metadata.gz: bb80518242aa909037d97a028456f9e06bdb246a7ac59f6977338bc8d3b416c6348b268be92e7168478cf7a474ddce4f3cc295dfaee158913147a545d394d3a1
+  data.tar.gz: 08bbc4c80d99f87a74c57f74e5324a6a1b7b8fc2c651d36c8f094e9ea7f8ce4b89448eea2a9ced3fa14a25ad6e445ff42bb9b253cb1bd04f2e7f00029558325e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.0.2
+  - Recreate gem since 4.0.1 lacked jars
+
+## 4.0.1
+  - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
+
 ## 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

data/lib/logstash/filters/geoip.rb

@@ -31,10 +31,10 @@ module JavaIO
 end
 
 
-# The GeoIP2 filter adds information about the geographical location of IP addresses,
-# based on data from the Maxmind database.
+# The GeoIP filter adds information about the geographical location of IP addresses,
+# based on data from the Maxmind GeoLite2 database.
 #
-# Starting with version 1.3.0 of Logstash, a `[geoip][location]` field is created if
+# A `[geoip][location]` field is created if
 # the GeoIP lookup returns a latitude and longitude. The field is stored in
 # http://geojson.org/geojson-spec.html[GeoJSON] format. Additionally,
 # the default Elasticsearch template provided with the
@@ -46,14 +46,16 @@ end
 # and the flexibility of having GeoJSON for all other applications (like Kibana's
 # map visualization).
 #
-# This product includes GeoLite2 data created by MaxMind, available from
-# <http://dev.maxmind.com/geoip/geoip2/geolite2/>.
+# Note: This product includes GeoLite2 data created by MaxMind, available from
+# http://www.maxmind.com. This database is licensed under 
+# http://creativecommons.org/licenses/by-sa/4.0/[Creative Commons Attribution-ShareAlike 4.0 International License]
+
 class LogStash::Filters::GeoIP < LogStash::Filters::Base
   config_name "geoip"
 
-  # The path to the GeoIP2 database file which Logstash should use. Only City database is supported by now.
+  # The path to the GeoLite2 database file which Logstash should use. Only City database is supported by now.
   #
-  # If not specified, this will default to the GeoLiteCity database that ships
+  # If not specified, this will default to the GeoLite2 City database that ships
   # with Logstash.
   config :database, :validate => :path
 
@@ -66,7 +68,7 @@ class LogStash::Filters::GeoIP < LogStash::Filters::Base
   # Possible fields depend on the database type. By default, all geoip fields
   # are included in the event.
   #
-  # For the built-in GeoLiteCity database, the following are available:
+  # For the built-in GeoLite2 City database, the following are available:
   # `city_name`, `continent_code`, `country_code2`, `country_code3`, `country_name`,
   # `dma_code`, `ip`, `latitude`, `longitude`, `postal_code`, `region_name` and `timezone`.
   config :fields, :validate => :array, :default => ['city_name', 'continent_code',
@@ -76,15 +78,15 @@ class LogStash::Filters::GeoIP < LogStash::Filters::Base
                                                     'region_code', 'timezone', 'location']
 
   # Specify the field into which Logstash should store the geoip data.
-  # This can be useful, for example, if you have `src\_ip` and `dst\_ip` fields and
+  # This can be useful, for example, if you have `src_ip` and `dst_ip` fields and
   # would like the GeoIP information of both IPs.
   #
   # If you save the data to a target field other than `geoip` and want to use the
-  # `geo\_point` related functions in Elasticsearch, you need to alter the template
+  # `geo_point` related functions in Elasticsearch, you need to alter the template
   # provided with the Elasticsearch output and configure the output to use the
   # new template.
   #
-  # Even if you don't use the `geo\_point` mapping, the `[target][location]` field
+  # Even if you don't use the `geo_point` mapping, the `[target][location]` field
   # is still valid GeoJSON.
   config :target, :validate => :string, :default => 'geoip'
 
@@ -140,7 +142,7 @@ class LogStash::Filters::GeoIP < LogStash::Filters::Base
       begin
         @parser = DatabaseReader::Builder.new(db_file).withCache(CHMCache.new(@cache_size)).build();
       rescue Java::ComMaxmindDb::InvalidDatabaseException => e
-        @logger.error("The Geoip2 MMDB database provided is invalid or corrupted.", :exception => e, :field => @source)
+        @logger.error("The GeoLite2 MMDB database provided is invalid or corrupted.", :exception => e, :field => @source)
         raise e
       end
     end

data/logstash-filter-geoip.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-geoip'
-  s.version         = '4.0.0'
+  s.version         = '4.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/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.platform      = "java"
 
   # Files
-  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT', 'maxmind-db-NOTICE.txt']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -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", "~> 2.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
 
   s.requirements << "jar com.maxmind.geoip2:geoip2, 2.5.0, :exclusions=> [com.google.http-client:google-http-client]"
 

data/maxmind-db-NOTICE.txt

@@ -0,0 +1,4 @@
+This product includes GeoLite2 data created by MaxMind, available from
+<a href="http://www.maxmind.com">http://www.maxmind.com</a>.
+
+The GeoLite2 databases are distributed under the Creative Commons Attribution-ShareAlike 4.0 International License

data/spec/filters/geoip_spec.rb

@@ -188,7 +188,7 @@ describe LogStash::Filters::GeoIP do
       end
       
       context "when a IP is not found in the DB" do
-        let(:ipstring) { "113.208.89.21" }
+        let(:ipstring) { "0.0.0.0" }
 
         it "should set the target field to an empty hash" do
           expect(event.get("geoip")).to eq({})

metadata

@@ -1,33 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-geoip
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.60'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.99'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: jar-dependencies
@@ -35,13 +41,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 +55,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 +69,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
@@ -86,6 +92,7 @@ files:
 - lib/logstash-filter-geoip_jars.rb
 - lib/logstash/filters/geoip.rb
 - logstash-filter-geoip.gemspec
+- maxmind-db-NOTICE.txt
 - spec/filters/geoip_spec.rb
 - vendor/GeoLite2-City.mmdb
 - vendor/jar-dependencies/runtime-jars/geoip2-2.5.0.jar
@@ -105,20 +112,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.4.5
+rubygems_version: 2.6.3
 signing_key:
 specification_version: 4
-summary: $summary
+summary: "$summary"
 test_files:
 - spec/filters/geoip_spec.rb