logstash-filter-cidrtagmap 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 33b9265423d1404259c0f09c39b60037d9320a0f
-  data.tar.gz: 68e7a6a92a928855534f2b4415d27090505519dc
+SHA256:
+  metadata.gz: 000faa0dca88dd9b105672fa8f1cb1e40f75672495f02cdfd749c176c56019cb
+  data.tar.gz: 74a2aaf041450e4019a67486421f370577d82d6476229b89abce18caaf8853d5
 SHA512:
-  metadata.gz: 919b0c6f601a7e815a0a7534b9acd84b0ed3b92c1715c67dba0344e2978dfb1f092be1a6d2229a86784ddcdfb2bce6ca3d686325c566c22a19bf2c8142eaeff5
-  data.tar.gz: 4b5789a1add66f0eaa07e3cd2d955528c506719eb8ec0939ac4cc89b2e18825862c37121f71f759cab4062978b37378a592083113f09bb8444e5c13d2d727d76
+  metadata.gz: c99b30ad7a40d52775fc87b725f01b62c37dc82d813af869df3d00324f8ad2e253fce3104920a85391a30b129056665314f94b722bae84477274dbbcfd4ebe0d
+  data.tar.gz: 2699915546b64503d846fb7cbfde59b7619fc4b352c55c74af5100c7360c100e5d876ad2b7f8490db9ebd64c49bb41eb003b3bc66b6b050d044d33c9597859c7

data/CHANGELOG.md

@@ -2,4 +2,9 @@
  - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
  - Dependency on logstash-core update to 2.0
+## 2.2.0
+ - Altered tag logic to accept and use multiple tags per match.
+ - Tag field name has changed - it is now "tags" rather than "tag"
+## 2.2.1
+ - Updated CHANGELOG
 

data/lib/logstash/filters/cidrtagmap.rb

@@ -96,10 +96,10 @@ class LogStash::Filters::CIDRTagMap < LogStash::Filters::Base
 				@logger.warn("cidrtagmap: redisnamespace not defined - using cidrtagmap")
 				@redisnamespace = 'cidrtagmap'
 			end
-			if @redis["#{@redisnamespace}.reloadmap"] == '1' or @cidrMap.nil?
+                        if @redis.get("#{@redisnamespace}.reloadmap") == '1' or @cidrMap.nil?
 				@mutex.synchronize {
-					if @redis["#{@redisnamespace}.reloadmap"] == '1' or @cidrMap.nil?
-						@redis["#{@redisnamespace}.reloadmap"] = '0'
+                                  if @redis.get("#{@redisnamespace}.reloadmap") == '1' or @cidrMap.nil?
+                                    @redis.set("#{@redisnamespace}.reloadmap",'0')
 						@logger.info("cidrtagmap: refreshing map from redis server at #{@redisserver} using namespace '#{@redisnamespace}'")
 						begin
 							rawcidrmap = @redis.hgetall("#{@redisnamespace}.cidrmap")
@@ -176,8 +176,8 @@ class LogStash::Filters::CIDRTagMap < LogStash::Filters::Base
 					mapping = mapForIp(ipvalue)
 					if mapping
 						@logger.debug("cidrtagmap: I mapped IP address #{ipvalue} to #{mapping.tag} via range #{mapping.range.to_s}")
-						event.set("[cidrtagmap]#{fieldname}[tags]",mapping.tag)
-						event.set("[cidrtagmap]#{fieldname}[match]",mapping.range.to_s)
+						event.set("[cidrtagmap][#{fieldname}][tags]",mapping.tag)
+						event.set("[cidrtagmap][#{fieldname}][match]",mapping.range.to_s)
 						filter_matched(event)
 					end
 				end
@@ -193,7 +193,7 @@ class LogStash::Filters::CIDRTagMap < LogStash::Filters::Base
 					asname = asNameForNumber(asvalue)
 					if asname
 						@logger.debug("cidrtagmap: I mapped as number #{asvalue} to #{asname}")
-						event.set("[cidrtagmap]#{fieldname}[asname]",asname)
+						event.set("[cidrtagmap][#{fieldname}][asname]",asname)
 						filter_matched(event)
 					end
 				end

data/logstash-filter-cidrtagmap.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-cidrtagmap'
-  s.version         = '2.2.0'
+  s.version         = '2.3.0'
   s.licenses = ['Apache-2.0']
   s.summary = "Filter adds tags to events in logstash based on a table of cidr->name mappings  and optionally adds asn name fields"
   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.  Filter adds tags to events in logstash based on a table of cidr->name mappings  and optionally adds asn name fields"
   s.authors = ["svdasein"]
   s.email = 'daveparker01@gmail.com'
-  s.homepage = "https://github.com/svdasein/cidrtagmap"
+  s.homepage = "https://gitlab.com/svdasein/cidrtagmap"
   s.require_paths = ["lib"]
 
   # Files
@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
   s.add_development_dependency 'logstash-devutils'
 
-  s.add_runtime_dependency "redis","~> 3.0"
+  s.add_runtime_dependency "redis","~> 4.0"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-cidrtagmap
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - svdasein
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :runtime
+  name: logstash-core-plugin-api
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: logstash-devutils
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: '4.0'
+  name: redis
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.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.  Filter adds tags to events in logstash based
@@ -70,13 +70,13 @@ files:
 - logstash-filter-cidrtagmap.gemspec
 - spec/filters/example_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/svdasein/cidrtagmap
+homepage: https://gitlab.com/svdasein/cidrtagmap
 licenses:
 - Apache-2.0
 metadata:
   logstash_plugin: 'true'
   logstash_group: filter
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,13 +91,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Filter adds tags to events in logstash based on a table of cidr->name mappings  and
   optionally adds asn name fields
 test_files:
 - spec/filters/example_spec.rb
 - spec/spec_helper.rb
-has_rdoc: