logstash-filter-ipam 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa73397a601bf30ef7770ae0acbdbca481597337b99d4e5645fecddbd3b644da
-  data.tar.gz: eaeb7ce6e8ef074f38805f18783092f1b4a41e322740881db07a786888907170
+  metadata.gz: dba543e9a08f3a88aabe5ef8aec5ec42223fb6f80a06f2e83504b8c1c2ae734c
+  data.tar.gz: 42923057db032ad34494a648eb2c236eb74f05843b1e59a32b950765f7b8578a
 SHA512:
-  metadata.gz: c9c1c7939ececb9984e9aa85e6d411324958b9c7e38b680bbef37e7308d5a530ec89e121e064c074aaf6acf69888cae7304a3940588f162df4f12ea0bb6c5cf9
-  data.tar.gz: 55868dcf04026c5e36f3942439f904322c55db2ab740227aebd2ff006eb3642980ccf10f826bd3f85e761d1a579b4a81919171bbc3345ec4bd6ed6bc29c117c7
+  metadata.gz: fdfccb1ed0f67a23420689a4be764df6c5270c87ff679ce14207b0ab1c55b5ddb6f003887f50b4e121f73a2c6fbd7f0418c0f59ae5b82241bf7e45a0dbe52536
+  data.tar.gz: 9ed4e350f9f821da3dcca4a33490d5e2a33cb0977b2ec10dd71235f83f755eb876736a9a2d8e61d0231a8afe5a878a7631fa896ebec5dc9373486ef7d1600129

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 gemspec
-
+gem "activerecord-jdbcmysql-adapter", :platform => :jruby

data/lib/logstash/filters/ipam.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
+require "active_record"
+require "activerecord-jdbcmysql-adapter"
 require "logstash/filters/base"
 require "logstash/namespace"
 require "ipaddr"
-require "mysql"
 require "json"
 
 # This  filter will replace the contents of the default
@@ -22,6 +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_user, :validate => :string, :required => true
   config :mysql_pass, :validate => :string, :required => true
   config :mysql_db, :validate => :string, :default => "phpipam"
@@ -45,16 +47,40 @@ class LogStash::Filters::Ipam < LogStash::Filters::Base
   private
   def downloadIpamSubnets(event)
     begin
-      client = Mysql::Client.new(:host => @mysql_host,
-                                 :username => @mysql_user,
-                                 :password => @mysql_pass,
-                                 :database => @mysql_db)
-      result = client.query("SELECT id,  FROM subnets")
-      client.close()
-      return JSON.parse(result)
+      # Create connection to the MySQL Database
+      ActiveRecord::Base.establish_connection ({
+          :adapter => "mysql",
+          :host => @mysql_host,
+          :username => @mysql_user,
+          :password => @mysql_pass,
+          :database => @mysql_db
+      })
+
+      # 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":['
+      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
+        else
+          json += ', "netmask": 0'
+        end
+        json += ', "description": "' + sub['description'] + '"},'
+      end
+      json = json[0...-1]
+      json += ']}'
     rescue
-        @logger.warn("Impossible to retrieve data from Mysql.", :address => @mysql_host, :event => event)
+        @logger.warn("Impossible to retrieve data from MySQL.", :address => @mysql_host, :event => event)
     end
+    return json
   end
 
   private
@@ -103,8 +129,8 @@ class LogStash::Filters::Ipam < LogStash::Filters::Base
     checkFile(event)
 
     # Get Subnets Checking the IP
-    # if can't read => Warning
-    # if gateway is false => won't register "0.0.0.0" subnets
+    #   if can't read => Warning
+    #   if gateway is false => won't register "0.0.0.0" subnets
     ipamSubnets = getIpamSubnets(event)
     subnets = checkIpSubnets(@ip, subnets)
 

data/logstash-filter-ipam.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-filter-ipam'
-  s.version       = '0.1.2'
+  s.version       = '0.1.4'
   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.'
@@ -19,5 +19,6 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
+  s.add_runtime_dependency "activerecord", "~> 4.0.0"
   s.add_development_dependency 'logstash-devutils'
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-ipam
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Corentin Dekimpe
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  name: activerecord
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: