logstash-filter-ipam 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dba543e9a08f3a88aabe5ef8aec5ec42223fb6f80a06f2e83504b8c1c2ae734c
-  data.tar.gz: 42923057db032ad34494a648eb2c236eb74f05843b1e59a32b950765f7b8578a
+  metadata.gz: c955d04a7374c6098811d3e6057b26a1bef34da67597fcc574fa8b0d5e6004db
+  data.tar.gz: ee1b6a5c5a1b4f13ed3bc6b7e01ac84cc1345dbc1b14e5e9062cad3355543f79
 SHA512:
-  metadata.gz: fdfccb1ed0f67a23420689a4be764df6c5270c87ff679ce14207b0ab1c55b5ddb6f003887f50b4e121f73a2c6fbd7f0418c0f59ae5b82241bf7e45a0dbe52536
-  data.tar.gz: 9ed4e350f9f821da3dcca4a33490d5e2a33cb0977b2ec10dd71235f83f755eb876736a9a2d8e61d0231a8afe5a878a7631fa896ebec5dc9373486ef7d1600129
+  metadata.gz: c98a7ce2512389c315eeb307010ce576f401d6a53c24e084005860f98b909509ed8d45049d5fda9b7d53136caa1e740cd049b50299f6701c2c5e614f16ccee9a
+  data.tar.gz: 386d69da57968abc09924476c0b9289286deef2fb57208e0e2a1f93f68f4601ed77766a88ea5fb241b31e9dee2d37a8c15546c6628903a9575951e58e2fb4efd

data/lib/logstash/filters/ipam.rb

@@ -23,7 +23,7 @@ class LogStash::Filters::Ipam < LogStash::Filters::Base
 
   # Mysql connection options.
   config :mysql_host, :validate => :string, :required => true
-  #config :mysql_port, :validate => :number, :default => 3306
+  config :mysql_port, :validate => :number, :default => 3306
   config :mysql_user, :validate => :string, :required => true
   config :mysql_pass, :validate => :string, :required => true
   config :mysql_db, :validate => :string, :default => "phpipam"
@@ -59,24 +59,20 @@ class LogStash::Filters::Ipam < LogStash::Filters::Base
       # Get all the subnets from the Table
       subnets = ActiveRecord::Base.connection.exec_query("SELECT id, subnet, mask, description FROM subnets")
 
-      # Parse result to create a JSON string
-      json = '{"subnets":['
+      # Set subnets into IPv4 address format
       subnets.each do |sub|
-        json += '{"id":' + sub['id'].to_s
-        sub['subnet'] = Integer(sub['subnet'])
-        if sub['subnet'] >= 0 && sub['subnet'] <= 4294967295 # Check if the subnet is an IPv4 address
-          sub['subnet'] = IPAddr.new(sub['subnet'], Socket::AF_INET).to_s
-        end
-        json += ', "subnet": "' + sub['subnet'].to_s + '"'
-        if sub['mask'].to_s.length > 0
-          json += ', "netmask": ' + sub['mask'].to_s
+        isub = Integer(sub['subnet'])
+        if isub >= 0 && isub <= 4294967295
+          sub['subnet'] = IPAddr.new(isub, Socket::AF_INET).to_s
+          sub['ipv4'] = true
         else
-          json += ', "netmask": 0'
+          sub['ipv4'] = false
+          @logger.warn("Logger : Not compatible with IPv4.", :address => sub['subnet'], :event => event)
         end
-        json += ', "description": "' + sub['description'] + '"},'
       end
-      json = json[0...-1]
-      json += ']}'
+
+      # Parse result to create a JSON string
+      return subnets.to_json
     rescue
         @logger.warn("Impossible to retrieve data from MySQL.", :address => @mysql_host, :event => event)
     end
@@ -88,8 +84,7 @@ class LogStash::Filters::Ipam < LogStash::Filters::Base
     # Reading files
     begin
       file = File.read(@file)
-      json  JSON.parse(file)
-      return json["subnets"]
+      return  JSON.parse(file)
     rescue
       @logger.warn("Impossible to read into file.", :address => @file, :event => event)
     end
@@ -99,6 +94,9 @@ class LogStash::Filters::Ipam < LogStash::Filters::Base
   def checkIpSubnets(ip, subnets)
     results = Array.new
     subnets.each do |sub|
+      if !sub['ipv4']
+        next
+      end
       if !@gateway && sub['subnet'] == "0.0.0.0"
         next
       end
@@ -128,10 +126,14 @@ class LogStash::Filters::Ipam < LogStash::Filters::Base
     #   if need reset => update content.
     checkFile(event)
 
-    # Get Subnets Checking the IP
+    # Get Subnets from updated file
     #   if can't read => Warning
-    #   if gateway is false => won't register "0.0.0.0" subnets
     ipamSubnets = getIpamSubnets(event)
+
+    # Get Subnets that contains IP
+    #   if @gateway => Get 0.0.0.0 subnets
+    #   else        => Don't get those subnets
+    #   if !ipv4 => Don't handle those subnets
     subnets = checkIpSubnets(@ip, subnets)
 
     # Set field only if there is some subnets checked.

data/logstash-filter-ipam.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-filter-ipam'
-  s.version       = '0.1.4'
+  s.version       = '0.1.5'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Correlation with IPAM.'
   s.description   = 'Filter that allows getting subnets from existing file extracted from IPAM for an IP address.'

data/spec/filters/ipam_spec.rb

@@ -13,9 +13,12 @@ describe LogStash::Filters::Ipam do
     CONFIG
     end
 
-    sample("ip" => "212.24.215.123") do
-      expect(subject).to include("subnets")
-      #expect(subject.get('subnets')).to eq('Hello World')
+    sample("ip" => "212.24.215.123",
+           "mysql_host" => "172.19.0.19",
+           "mysql_user" => "kibana",
+           "mysql_pass" => "QZQxf4XQGni6",) do
+      #expect(subject).to include("subnets")
+      #expect(subject.get('subnets')).to !eq('')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-ipam
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Corentin Dekimpe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement