logstash-codec-netflow 3.11.1 → 3.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc95824b1604154205e68f462971bee07e9ff78a
-  data.tar.gz: 20c0adb6af079d138f29f32aa9317cd7204fe7be
+  metadata.gz: 77f122827b88b2cd3de0a5d33e68bebf2543b123
+  data.tar.gz: dd53ee247135f3c112105cdb44287bfd4cdff02b
 SHA512:
-  metadata.gz: 60091641ab49c7aa1383c08df19603f2ce1ab7ccdfec0f735740491cd7b966a0ad8f84552985bff90f745c38902c6825868479a27d6f65a58e0ce02165fdb312
-  data.tar.gz: 002acbfd04b707a92362483d6d8857c3edfe5d339f4a80cb8302200804f47331ef4f8a7718b0997e68064e2ae30a1c3187be2d9e5e0e318193353b14c87e91ff
+  metadata.gz: 58fb4cd257c95d1dc594908982dc680e85827109c50d30b82a20e898bc21676c0e128d66cd9bd541b65b842eba2080a2110cf41ea042b75e28292c56641e8c49
+  data.tar.gz: 010589f423fc57e4c3600c47ffd1a07fcd3a80382b7b037c4756ef27a24254ccc5fc506a3f8744263455fba6ee7e71fa6af28539fe26bf49fde99e277a41939f

data/CHANGELOG.md

@@ -1,7 +1,13 @@
+## 3.11.2
+
+  - Further improved decoding performance of ASA ACL ids
+  - Further improved decoding performance of MAC addresses
+  - Improved decoding performance of IPv4 addresses
+
 ## 3.11.1
 
-  - Improved decoding performance for ASA ACL ids
-  - Improved decoding performance for mac addresses
+  - Improved decoding performance of ASA ACL ids
+  - Improved decoding performance of mac addresses
 
 ## 3.11.0
 

data/lib/logstash/codecs/netflow/util.rb

@@ -8,17 +8,15 @@ class IP4Addr < BinData::Primitive
 
   def set(val)
     unless val.nil?
-      ip = IPAddr.new(val)
-      if ! ip.ipv4?
-        raise ArgumentError, "invalid IPv4 address '#{val}'"
-      end
-      self.storage = ip.to_i
+      self.storage = val.split('.').inject(0) {|total,value| (total << 8 ) + value.to_i}
     end
   end
 
   def get
+    # This is currently the fastest implementation
+    # For benchmarks see spec/codecs/benchmarks/IPaddr.rb
     unless self.storage.nil?
-      IPAddr.new_ntoh([self.storage].pack('N')).to_s
+      [self.storage].pack('N').unpack('C4').join('.')
     end
   end
 end
@@ -38,6 +36,9 @@ class IP6Addr < BinData::Primitive
   end
 
   def get
+    # There faster implementations, however they come with the 
+    # loss of compressed IPv6 notation.
+    # For benchmarks see spec/codecs/benchmarks/IP6Addr.rb
     unless self.storage.nil?
       IPAddr.new_ntoh((0..7).map { |i|
         (self.storage >> (112 - 16 * i)) & 0xffff
@@ -57,8 +58,10 @@ class MacAddr < BinData::Primitive
   end
 
   def get
-    hexstring = self.bytes.unpack('H*')
-    hexstring[0].scan(/../).collect { |aclid| aclid }.join(":")
+    # This is currently the fastest implementation
+    # For benchmarks see spec/codecs/benchmarks/MacAddr.rb
+    b = self.bytes.unpack('H*')[0]
+    b[0..1] + ":" + b[2..3] + ":" + b[4..5] + ":" + b[6..7] + ":" + b[8..9] + ":" + b[10..11]
   end
 end
 
@@ -102,8 +105,10 @@ class ACLIdASA < BinData::Primitive
   end
 
   def get
-    hexstring = self.bytes.unpack('H*')
-    hexstring[0].scan(/......../).collect { |aclid| aclid }.join("-")
+    # This is currently the fastest implementation
+    # For benchmarks see spec/codecs/benchmarks/ACLIdASA.rb
+    b = self.bytes.unpack('H*')[0]
+    b[0..7] + "-" + b[8..15] + "-" + b[16..23] 
   end
 end
 

data/logstash-codec-netflow.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-netflow'
-  s.version         = '3.11.1'
+  s.version         = '3.11.2'
   s.licenses        = ['Apache License (2.0)']
-  s.summary         = "Reads Netflow v5 and Netflow v9 data"
+  s.summary         = "Reads Netflow v5, Netflow v9 and IPFIX data"
   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"
   s.authors         = ["Elastic"]
   s.email           = 'info@elastic.co'
   s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
-  s.require_paths = ["lib"]
+  s.require_paths   = ["lib"]
 
   # Files
   s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION", "docs/**/*"]

data/spec/codecs/benchmarks/ACLidASA.rb

@@ -0,0 +1,36 @@
+require 'benchmark'
+
+Benchmark.bm do |x|
+  x.report {
+    # Implementation pre v3.11.0
+    bytes=[41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41]
+    2000000.times do
+      b = bytes.collect { |byte| 
+        unless byte.nil?
+          byte.to_s(16).rjust(2,'0')
+        end
+      }.join
+      b.scan(/......../).collect { |aclid| aclid }.join("-")
+    end }
+
+  x.report {
+    # Implementation as of v3.11.1
+    bytes='AAAAAAAAAAAA'
+    2000000.times do
+      b = bytes.unpack('H*')[0]
+      b.scan(/......../).collect { |aclid| aclid }.join("-")
+    end }
+
+  x.report {
+    # Implementation as of v3.11.2
+    bytes='AAAAAAAAAAAA'
+    2000000.times do
+      b = bytes.unpack('H*')[0]
+      b[0..7] + "-" + b[8..15] + "-" + b[16..23]
+    end }
+end
+
+#       user     system      total        real
+#  19.710000   0.000000  19.710000 ( 19.717288)
+#   7.000000   0.000000   7.000000 (  7.003011)
+#   3.500000   0.000000   3.500000 (  3.501547)

data/spec/codecs/benchmarks/IP6Addr.rb

@@ -0,0 +1,24 @@
+require 'benchmark'
+require 'ipaddr'
+
+Benchmark.bm do |x|
+  x.report {
+    # Implementation pre v3.11.0
+    ip = 85060308944708794891899627827609206785
+    2000000.times do
+      IPAddr.new_ntoh([ip].pack('N')).to_s
+    end }
+
+  x.report {
+    # Implementation as of v3.11.2
+    ip = 85060308944708794891899627827609206785
+    2000000.times do
+      b = "%032x" % ip
+      b[0..3] + ":" + b[4..7] + ":" + b[8..11] + ":" + b[12..15] + ":" + b[16..19] + ":" + b[20..23] + ":" + b[24..27] + ":" + b[28..31]
+    end }
+
+end
+   
+#       user     system      total        real
+#  21.800000   0.000000  21.800000 ( 21.811893)
+#  11.760000   0.000000  11.760000 ( 11.768260)

data/spec/codecs/benchmarks/IPAddr.rb

@@ -0,0 +1,32 @@
+require 'benchmark'
+require 'ipaddr'
+
+Benchmark.bm do |x|
+  x.report {
+    # Implementation pre v3.11.0
+    ip = 3232235521
+    2000000.times do
+      IPAddr.new_ntoh([ip].pack('N')).to_s
+    end }
+
+  x.report {
+    # Implementation as of v3.11.2
+    ip = 3232235521
+    2000000.times do
+      [ip].pack('N').unpack('C4').join('.')
+    end }
+
+  x.report {
+    ip = 3232235521
+    2000000.times do
+      b = "%08x" % ip
+      "%d.%d.%d.%d" % [b[0..1].to_i(16), b[2..3].to_i(16), b[4..5].to_i(16), b[6..7].to_i(16)]
+    end }
+
+end
+
+#       user     system      total        real
+#  21.330000   0.000000  21.330000 ( 21.348559)
+#   4.410000   0.000000   4.410000 (  4.411973)
+#   6.450000   0.000000   6.450000 (  6.446321)
+

data/spec/codecs/benchmarks/MacAddr.rb

@@ -0,0 +1,34 @@
+require 'benchmark'
+
+Benchmark.bm do |x|
+  x.report {
+    # Implementation pre v3.11.0
+    bytes=[41, 41, 41, 41, 41, 41]
+    2000000.times do
+      bytes.collect { |byte| 
+        unless byte.nil?
+          byte.to_s(16).rjust(2,'0')
+        end
+      }.join(":")
+    end }
+
+  x.report {
+    # Implementation as of v3.11.1
+    bytes='AAAAAA'
+    2000000.times do
+      b = bytes.unpack('H*')[0]
+      b.scan(/../).collect { |byte| byte }.join(":")
+    end }
+
+  x.report {
+    bytes='AAAAAA'
+    2000000.times do
+      b = bytes.unpack('H*')[0]
+      b[0..1] + ":" + b[2..3] + ":" + b[4..5] + ":" + b[6..7] + ":" + b[8..9] + ":" + b[10..11]
+    end }
+end
+   
+#       user     system      total        real
+#   8.400000   0.000000   8.400000 (  8.408549)
+#  10.960000   0.000000  10.960000 ( 10.959357)
+#   5.600000   0.000000   5.600000 (  5.597817)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-netflow
 version: !ruby/object:Gem::Version
-  version: 3.11.1
+  version: 3.11.2
 platform: ruby
 authors:
 - Elastic
@@ -73,6 +73,12 @@ files:
 - lib/logstash/codecs/netflow/netflow.yaml
 - lib/logstash/codecs/netflow/util.rb
 - logstash-codec-netflow.gemspec
+- spec/codecs/benchmarks/ACLidASA.rb
+- spec/codecs/benchmarks/IP6Addr.rb
+- spec/codecs/benchmarks/IPAddr.rb
+- spec/codecs/benchmarks/MacAddr.rb
+- spec/codecs/benchmarks/netflow_bench_cisco_asa.py
+- spec/codecs/benchmarks/netflow_bench_cisco_asr.py
 - spec/codecs/ipfix.dat
 - spec/codecs/ipfix_test_barracuda_data256.dat
 - spec/codecs/ipfix_test_barracuda_tpl.dat
@@ -146,8 +152,6 @@ files:
 - spec/codecs/netflow9_test_ubnt_edgerouter_tpl.dat
 - spec/codecs/netflow9_test_unknown_tpl266_292_data.dat
 - spec/codecs/netflow9_test_valid01.dat
-- spec/codecs/netflow_bench_cisco_asa.py
-- spec/codecs/netflow_bench_cisco_asr.py
 - spec/codecs/netflow_spec.rb
 - spec/codecs/netflow_stress.py
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
@@ -175,8 +179,14 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
-summary: Reads Netflow v5 and Netflow v9 data
+summary: Reads Netflow v5, Netflow v9 and IPFIX data
 test_files:
+- spec/codecs/benchmarks/ACLidASA.rb
+- spec/codecs/benchmarks/IP6Addr.rb
+- spec/codecs/benchmarks/IPAddr.rb
+- spec/codecs/benchmarks/MacAddr.rb
+- spec/codecs/benchmarks/netflow_bench_cisco_asa.py
+- spec/codecs/benchmarks/netflow_bench_cisco_asr.py
 - spec/codecs/ipfix.dat
 - spec/codecs/ipfix_test_barracuda_data256.dat
 - spec/codecs/ipfix_test_barracuda_tpl.dat
@@ -250,7 +260,5 @@ test_files:
 - spec/codecs/netflow9_test_ubnt_edgerouter_tpl.dat
 - spec/codecs/netflow9_test_unknown_tpl266_292_data.dat
 - spec/codecs/netflow9_test_valid01.dat
-- spec/codecs/netflow_bench_cisco_asa.py
-- spec/codecs/netflow_bench_cisco_asr.py
 - spec/codecs/netflow_spec.rb
 - spec/codecs/netflow_stress.py