logstash-filter-cidrtagmap 2.2.2 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +5 -5
 - data/lib/logstash/filters/cidrtagmap.rb +6 -6
 - data/logstash-filter-cidrtagmap.gemspec +2 -2
 - metadata +14 -15
 
    
        checksums.yaml
    CHANGED
    
    | 
         @@ -1,7 +1,7 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            ---
         
     | 
| 
       2 
     | 
    
         
            -
             
     | 
| 
       3 
     | 
    
         
            -
              metadata.gz:  
     | 
| 
       4 
     | 
    
         
            -
              data.tar.gz:  
     | 
| 
      
 2 
     | 
    
         
            +
            SHA256:
         
     | 
| 
      
 3 
     | 
    
         
            +
              metadata.gz: 000faa0dca88dd9b105672fa8f1cb1e40f75672495f02cdfd749c176c56019cb
         
     | 
| 
      
 4 
     | 
    
         
            +
              data.tar.gz: 74a2aaf041450e4019a67486421f370577d82d6476229b89abce18caaf8853d5
         
     | 
| 
       5 
5 
     | 
    
         
             
            SHA512:
         
     | 
| 
       6 
     | 
    
         
            -
              metadata.gz:  
     | 
| 
       7 
     | 
    
         
            -
              data.tar.gz:  
     | 
| 
      
 6 
     | 
    
         
            +
              metadata.gz: c99b30ad7a40d52775fc87b725f01b62c37dc82d813af869df3d00324f8ad2e253fce3104920a85391a30b129056665314f94b722bae84477274dbbcfd4ebe0d
         
     | 
| 
      
 7 
     | 
    
         
            +
              data.tar.gz: 2699915546b64503d846fb7cbfde59b7619fc4b352c55c74af5100c7360c100e5d876ad2b7f8490db9ebd64c49bb41eb003b3bc66b6b050d044d33c9597859c7
         
     | 
| 
         @@ -96,10 +96,10 @@ class LogStash::Filters::CIDRTagMap < LogStash::Filters::Base 
     | 
|
| 
       96 
96 
     | 
    
         
             
            				@logger.warn("cidrtagmap: redisnamespace not defined - using cidrtagmap")
         
     | 
| 
       97 
97 
     | 
    
         
             
            				@redisnamespace = 'cidrtagmap'
         
     | 
| 
       98 
98 
     | 
    
         
             
            			end
         
     | 
| 
       99 
     | 
    
         
            -
             
     | 
| 
      
 99 
     | 
    
         
            +
                                    if @redis.get("#{@redisnamespace}.reloadmap") == '1' or @cidrMap.nil?
         
     | 
| 
       100 
100 
     | 
    
         
             
            				@mutex.synchronize {
         
     | 
| 
       101 
     | 
    
         
            -
             
     | 
| 
       102 
     | 
    
         
            -
             
     | 
| 
      
 101 
     | 
    
         
            +
                                              if @redis.get("#{@redisnamespace}.reloadmap") == '1' or @cidrMap.nil?
         
     | 
| 
      
 102 
     | 
    
         
            +
                                                @redis.set("#{@redisnamespace}.reloadmap",'0')
         
     | 
| 
       103 
103 
     | 
    
         
             
            						@logger.info("cidrtagmap: refreshing map from redis server at #{@redisserver} using namespace '#{@redisnamespace}'")
         
     | 
| 
       104 
104 
     | 
    
         
             
            						begin
         
     | 
| 
       105 
105 
     | 
    
         
             
            							rawcidrmap = @redis.hgetall("#{@redisnamespace}.cidrmap")
         
     | 
| 
         @@ -176,8 +176,8 @@ class LogStash::Filters::CIDRTagMap < LogStash::Filters::Base 
     | 
|
| 
       176 
176 
     | 
    
         
             
            					mapping = mapForIp(ipvalue)
         
     | 
| 
       177 
177 
     | 
    
         
             
            					if mapping
         
     | 
| 
       178 
178 
     | 
    
         
             
            						@logger.debug("cidrtagmap: I mapped IP address #{ipvalue} to #{mapping.tag} via range #{mapping.range.to_s}")
         
     | 
| 
       179 
     | 
    
         
            -
            						event.set("[cidrtagmap]#{fieldname}[tags]",mapping.tag)
         
     | 
| 
       180 
     | 
    
         
            -
            						event.set("[cidrtagmap]#{fieldname}[match]",mapping.range.to_s)
         
     | 
| 
      
 179 
     | 
    
         
            +
            						event.set("[cidrtagmap][#{fieldname}][tags]",mapping.tag)
         
     | 
| 
      
 180 
     | 
    
         
            +
            						event.set("[cidrtagmap][#{fieldname}][match]",mapping.range.to_s)
         
     | 
| 
       181 
181 
     | 
    
         
             
            						filter_matched(event)
         
     | 
| 
       182 
182 
     | 
    
         
             
            					end
         
     | 
| 
       183 
183 
     | 
    
         
             
            				end
         
     | 
| 
         @@ -193,7 +193,7 @@ class LogStash::Filters::CIDRTagMap < LogStash::Filters::Base 
     | 
|
| 
       193 
193 
     | 
    
         
             
            					asname = asNameForNumber(asvalue)
         
     | 
| 
       194 
194 
     | 
    
         
             
            					if asname
         
     | 
| 
       195 
195 
     | 
    
         
             
            						@logger.debug("cidrtagmap: I mapped as number #{asvalue} to #{asname}")
         
     | 
| 
       196 
     | 
    
         
            -
            						event.set("[cidrtagmap]#{fieldname}[asname]",asname)
         
     | 
| 
      
 196 
     | 
    
         
            +
            						event.set("[cidrtagmap][#{fieldname}][asname]",asname)
         
     | 
| 
       197 
197 
     | 
    
         
             
            						filter_matched(event)
         
     | 
| 
       198 
198 
     | 
    
         
             
            					end
         
     | 
| 
       199 
199 
     | 
    
         
             
            				end
         
     | 
| 
         @@ -1,6 +1,6 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            Gem::Specification.new do |s|
         
     | 
| 
       2 
2 
     | 
    
         
             
              s.name = 'logstash-filter-cidrtagmap'
         
     | 
| 
       3 
     | 
    
         
            -
              s.version         = '2. 
     | 
| 
      
 3 
     | 
    
         
            +
              s.version         = '2.3.0'
         
     | 
| 
       4 
4 
     | 
    
         
             
              s.licenses = ['Apache-2.0']
         
     | 
| 
       5 
5 
     | 
    
         
             
              s.summary = "Filter adds tags to events in logstash based on a table of cidr->name mappings  and optionally adds asn name fields"
         
     | 
| 
       6 
6 
     | 
    
         
             
              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"
         
     | 
| 
         @@ -21,5 +21,5 @@ Gem::Specification.new do |s| 
     | 
|
| 
       21 
21 
     | 
    
         
             
              s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
         
     | 
| 
       22 
22 
     | 
    
         
             
              s.add_development_dependency 'logstash-devutils'
         
     | 
| 
       23 
23 
     | 
    
         | 
| 
       24 
     | 
    
         
            -
              s.add_runtime_dependency "redis","~>  
     | 
| 
      
 24 
     | 
    
         
            +
              s.add_runtime_dependency "redis","~> 4.0"
         
     | 
| 
       25 
25 
     | 
    
         
             
            end
         
     | 
    
        metadata
    CHANGED
    
    | 
         @@ -1,57 +1,57 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            --- !ruby/object:Gem::Specification
         
     | 
| 
       2 
2 
     | 
    
         
             
            name: logstash-filter-cidrtagmap
         
     | 
| 
       3 
3 
     | 
    
         
             
            version: !ruby/object:Gem::Version
         
     | 
| 
       4 
     | 
    
         
            -
              version: 2. 
     | 
| 
      
 4 
     | 
    
         
            +
              version: 2.3.0
         
     | 
| 
       5 
5 
     | 
    
         
             
            platform: ruby
         
     | 
| 
       6 
6 
     | 
    
         
             
            authors:
         
     | 
| 
       7 
7 
     | 
    
         
             
            - svdasein
         
     | 
| 
       8 
     | 
    
         
            -
            autorequire: 
     | 
| 
      
 8 
     | 
    
         
            +
            autorequire:
         
     | 
| 
       9 
9 
     | 
    
         
             
            bindir: bin
         
     | 
| 
       10 
10 
     | 
    
         
             
            cert_chain: []
         
     | 
| 
       11 
     | 
    
         
            -
            date:  
     | 
| 
      
 11 
     | 
    
         
            +
            date: 2022-04-20 00:00:00.000000000 Z
         
     | 
| 
       12 
12 
     | 
    
         
             
            dependencies:
         
     | 
| 
       13 
13 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       14 
     | 
    
         
            -
              name: logstash-core-plugin-api
         
     | 
| 
       15 
14 
     | 
    
         
             
              requirement: !ruby/object:Gem::Requirement
         
     | 
| 
       16 
15 
     | 
    
         
             
                requirements:
         
     | 
| 
       17 
16 
     | 
    
         
             
                - - "~>"
         
     | 
| 
       18 
17 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       19 
18 
     | 
    
         
             
                    version: '2.0'
         
     | 
| 
       20 
     | 
    
         
            -
               
     | 
| 
      
 19 
     | 
    
         
            +
              name: logstash-core-plugin-api
         
     | 
| 
       21 
20 
     | 
    
         
             
              prerelease: false
         
     | 
| 
      
 21 
     | 
    
         
            +
              type: :runtime
         
     | 
| 
       22 
22 
     | 
    
         
             
              version_requirements: !ruby/object:Gem::Requirement
         
     | 
| 
       23 
23 
     | 
    
         
             
                requirements:
         
     | 
| 
       24 
24 
     | 
    
         
             
                - - "~>"
         
     | 
| 
       25 
25 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       26 
26 
     | 
    
         
             
                    version: '2.0'
         
     | 
| 
       27 
27 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       28 
     | 
    
         
            -
              name: logstash-devutils
         
     | 
| 
       29 
28 
     | 
    
         
             
              requirement: !ruby/object:Gem::Requirement
         
     | 
| 
       30 
29 
     | 
    
         
             
                requirements:
         
     | 
| 
       31 
30 
     | 
    
         
             
                - - ">="
         
     | 
| 
       32 
31 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       33 
32 
     | 
    
         
             
                    version: '0'
         
     | 
| 
       34 
     | 
    
         
            -
               
     | 
| 
      
 33 
     | 
    
         
            +
              name: logstash-devutils
         
     | 
| 
       35 
34 
     | 
    
         
             
              prerelease: false
         
     | 
| 
      
 35 
     | 
    
         
            +
              type: :development
         
     | 
| 
       36 
36 
     | 
    
         
             
              version_requirements: !ruby/object:Gem::Requirement
         
     | 
| 
       37 
37 
     | 
    
         
             
                requirements:
         
     | 
| 
       38 
38 
     | 
    
         
             
                - - ">="
         
     | 
| 
       39 
39 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       40 
40 
     | 
    
         
             
                    version: '0'
         
     | 
| 
       41 
41 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       42 
     | 
    
         
            -
              name: redis
         
     | 
| 
       43 
42 
     | 
    
         
             
              requirement: !ruby/object:Gem::Requirement
         
     | 
| 
       44 
43 
     | 
    
         
             
                requirements:
         
     | 
| 
       45 
44 
     | 
    
         
             
                - - "~>"
         
     | 
| 
       46 
45 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       47 
     | 
    
         
            -
                    version: ' 
     | 
| 
       48 
     | 
    
         
            -
               
     | 
| 
      
 46 
     | 
    
         
            +
                    version: '4.0'
         
     | 
| 
      
 47 
     | 
    
         
            +
              name: redis
         
     | 
| 
       49 
48 
     | 
    
         
             
              prerelease: false
         
     | 
| 
      
 49 
     | 
    
         
            +
              type: :runtime
         
     | 
| 
       50 
50 
     | 
    
         
             
              version_requirements: !ruby/object:Gem::Requirement
         
     | 
| 
       51 
51 
     | 
    
         
             
                requirements:
         
     | 
| 
       52 
52 
     | 
    
         
             
                - - "~>"
         
     | 
| 
       53 
53 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       54 
     | 
    
         
            -
                    version: ' 
     | 
| 
      
 54 
     | 
    
         
            +
                    version: '4.0'
         
     | 
| 
       55 
55 
     | 
    
         
             
            description: This gem is a Logstash plugin required to be installed on top of the
         
     | 
| 
       56 
56 
     | 
    
         
             
              Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This
         
     | 
| 
       57 
57 
     | 
    
         
             
              gem is not a stand-alone program.  Filter adds tags to events in logstash based
         
     | 
| 
         @@ -76,7 +76,7 @@ licenses: 
     | 
|
| 
       76 
76 
     | 
    
         
             
            metadata:
         
     | 
| 
       77 
77 
     | 
    
         
             
              logstash_plugin: 'true'
         
     | 
| 
       78 
78 
     | 
    
         
             
              logstash_group: filter
         
     | 
| 
       79 
     | 
    
         
            -
            post_install_message: 
     | 
| 
      
 79 
     | 
    
         
            +
            post_install_message:
         
     | 
| 
       80 
80 
     | 
    
         
             
            rdoc_options: []
         
     | 
| 
       81 
81 
     | 
    
         
             
            require_paths:
         
     | 
| 
       82 
82 
     | 
    
         
             
            - lib
         
     | 
| 
         @@ -91,9 +91,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement 
     | 
|
| 
       91 
91 
     | 
    
         
             
                - !ruby/object:Gem::Version
         
     | 
| 
       92 
92 
     | 
    
         
             
                  version: '0'
         
     | 
| 
       93 
93 
     | 
    
         
             
            requirements: []
         
     | 
| 
       94 
     | 
    
         
            -
             
     | 
| 
       95 
     | 
    
         
            -
             
     | 
| 
       96 
     | 
    
         
            -
            signing_key: 
         
     | 
| 
      
 94 
     | 
    
         
            +
            rubygems_version: 3.1.6
         
     | 
| 
      
 95 
     | 
    
         
            +
            signing_key:
         
     | 
| 
       97 
96 
     | 
    
         
             
            specification_version: 4
         
     | 
| 
       98 
97 
     | 
    
         
             
            summary: Filter adds tags to events in logstash based on a table of cidr->name mappings  and
         
     | 
| 
       99 
98 
     | 
    
         
             
              optionally adds asn name fields
         
     |