logstash-filter-phpipam 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1958f973db608ec8a6d334f5ac17e7cdcc086090ec98edaa47581171ce69cd43
-  data.tar.gz: 6cdd9bf4973d25c9e6436a8738841c906d59bf2ae92cd59097c06770fa04ba74
+  metadata.gz: 5e6e9aa1f1006988029b971ee9b1fe5ca0659d13e33551781a742ca24d8289bf
+  data.tar.gz: 85c6e272503003fafe0abf85a64f5acd04ae9abe5cb8bbb2d285303348bee2c2
 SHA512:
-  metadata.gz: def36e7c9853d630b10f6bd483efdfcf60eff8be42462bb2bdbe75cfb6a5e0ed33bda0344d7f58b6176d379e1e3b25abb584b67662a71a106287309059916ab4
-  data.tar.gz: b40a8985553daab7f1cba3321ffbcc786823dabf85e5a4977682bc1d5d0bb10fb2ccc7451ac885563a48a93eef08355d166a2a63f7112e9fcfc958125cf6c78f
+  metadata.gz: 60a7da9f65e044265062848f8fc12ac33c836192893095cb56fb06d7f0daba058774f11abc88c27954caaef39aa3be4e96b77bbd7486bbce0f5d6eb9e1448d50
+  data.tar.gz: 3cdad24d903bb7922b666fbc890a0a7d6e64813f7f0ba7dbc6dc00cdc89e23ba8e266b6465a504d6a7e699e97af10ee5e7c8e628a6af35ca0fdefb4a41391731

data/lib/logstash/filters/phpipam.rb

@@ -218,17 +218,21 @@ class LogStash::Filters::Phpipam < LogStash::Filters::Base
       base['device']['name']        = device_data['hostname'] unless nil_or_empty?(device_data['hostname'])
       base['device']['description'] = device_data['description'] unless nil_or_empty?(device_data['description'])
       base['device']['type']        = type['tname'] unless nil_or_empty?(type['tname'])
+    end
 
-      # If the IP doesn't have the location directly, use the one from the device (if that has one)
-      unless okay?(location_data)
-        location_data = send_rest_request('GET', "api/#{@app_id}/tools/locations/#{device_data['location']}/") unless device_data['location'] == '0' || nil_or_empty?(device_data['location'])
-      end
+    # If the IP doesn't have the location directly, try to get it from the device or subnet
+    unless okay?(location_data)
+      location_data = if okay?(device_data) && device_data['location'] != '0' && !nil_or_empty?(device_data['location'])
+                        send_rest_request('GET', "api/#{@app_id}/tools/locations/#{device_data['location']}/")
+                      elsif okay?(subnet_data) && subnet_data['location'] != '0' && !nil_or_empty?(subnet_data['location'])
+                        send_rest_request('GET', "api/#{@app_id}/tools/locations/#{subnet_data['location']}/")
+                      end
     end
 
     # Location information
     if okay?(location_data)
       base['location']                = {}
-      base['location']['id']          = ip_data['location'].to_i
+      base['location']['id']          = location_data['id'].to_i
       base['location']['address']     = location_data['address'] unless nil_or_empty?(location_data['address'])
       base['location']['name']        = location_data['name'] unless nil_or_empty?(location_data['name'])
       base['location']['description'] = location_data['description'] unless nil_or_empty?(location_data['description'])

data/logstash-filter-phpipam.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'logstash-filter-phpipam'
-  s.version       = '0.7.1'
+  s.version       = '0.7.2'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'A Logstash filter that returns results from phpIPAM'
   s.description   = 'A Logstash filter that looks up an IP-address, and returns results from phpIPAM'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-phpipam
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - magnuslarsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api