fluent-plugin-netflow 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d48e590e8c0d4358dbec1e7fb8613cd828a2eff
-  data.tar.gz: 9245b86b319963bf4ea64573028003ac195b7ebe
+  metadata.gz: 9dc74b8e02addf45039fb1a007eb294a2a12d5e5
+  data.tar.gz: fd17e359f2840a2fa13157b75485ff882b635727
 SHA512:
-  metadata.gz: e18722b820dfc5d0e28846ee42722407d3cd1d276758e9930f1305ca5fb06e23bf2257b715dd6e17111e33c9319957d6f86e5843fb9140747afb66b0b1da3cb9
-  data.tar.gz: 9b6a67536069dd3f9f17f76fecd384f91b1d24ba403ff09838ea28480069246075b0a3f41ebb1a8404da7f20c27a95907b11cb0fa71333179dc539758acdec07
+  metadata.gz: 41c9bf911cc335d22fa696976483334e548efb98dbfa03e5bd3e5d73ed277084fe3860799e88bb519ed731c3ccbd8837a686537618b5ba3a22757572ca940c53
+  data.tar.gz: aff98859ff756a1b85b7a43da91313d3c1a495ea794f076d12f6057bf1f1132459af79319b4e459883c19fd074b45b294fe3671e1c22ad2a5be7160c967e7b6d

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 
 rvm:
-  - 2.0.0
   - 2.1
   - 2.2
-  - 2.3.0
+  - 2.3.1
   - ruby-head
   - rbx
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/fluent/plugin/netflow_records.rb

@@ -112,7 +112,7 @@ module Fluent
         array  :templates, read_until: lambda { array.num_bytes == flowset_length - 4 } do
           uint16 :template_id
           uint16 :field_count
-          array  :fields, initial_length: :field_count do
+          array  :template_fields, initial_length: :field_count do
             uint16 :field_type
             uint16 :field_length
           end

data/lib/fluent/plugin/parser_netflow.rb

@@ -31,7 +31,7 @@ module Fluent
         filename = File.expand_path('../netflow_fields.yaml', __FILE__)
 
         begin
-          @fields = YAML.load_file(filename)
+          @template_fields = YAML.load_file(filename)
         rescue => e
           raise ConfigError, "Bad syntax in definitions file #{filename}, error_class = #{e.class.name}, error = #{e.message}"
         end
@@ -40,7 +40,7 @@ module Fluent
         if @definitions
           raise ConfigError, "definitions file #{@definitions} doesn't exist" unless File.exist?(@definitions)
           begin
-            @fields['option'].merge!(YAML.load_file(@definitions))
+            @template_fields['option'].merge!(YAML.load_file(@definitions))
           rescue => e
             raise ConfigError, "Bad syntax in definitions file #{@definitions}, error_class = #{e.class.name}, error = #{e.message}"
           end
@@ -201,16 +201,16 @@ module Fluent
       def handle_v9_flowset_template(host, pdu, flowset)
         flowset.flowset_data.templates.each do |template|
           catch (:field) do
-            fields = []
-            template.fields.each do |field|
+            template_fields = []
+            template.template_fields.each do |field|
               entry = netflow_field_for(field.field_type, field.field_length)
               throw :field unless entry
 
-              fields += entry
+              template_fields += entry
             end
             # We get this far, we have a list of fields
             key = "#{host}|#{pdu.source_id}|#{template.template_id}"
-            @templates[key, @cache_ttl] = BinData::Struct.new(endian: :big, fields: fields)
+            @templates[key, @cache_ttl] = BinData::Struct.new(endian: :big, fields: template_fields)
             # Purge any expired templates
             @templates.cleanup!
           end
@@ -222,20 +222,20 @@ module Fluent
       def handle_v9_flowset_options_template(host, pdu, flowset)
         flowset.flowset_data.templates.each do |template|
           catch (:field) do
-            fields = []
+            template_fields = []
 
             NETFLOW_V9_FIELD_CATEGORIES.each do |category|
               template["#{category}_fields"].each do |field|
                 entry = netflow_field_for(field.field_type, field.field_length, category)
                 throw :field unless entry
 
-                fields += entry
+                template_fields += entry
               end
             end
 
             # We get this far, we have a list of fields
             key = "#{host}|#{pdu.source_id}|#{template.template_id}"
-            @templates[key, @cache_ttl] = BinData::Struct.new(endian: :big, fields: fields)
+            @templates[key, @cache_ttl] = BinData::Struct.new(endian: :big, fields: template_fields)
             # Purge any expired templates
             @templates.cleanup!
           end
@@ -265,8 +265,8 @@ module Fluent
 
         array = BinData::Array.new(type: template, initial_length: length / template.num_bytes)
 
-        fields = array.read(flowset.flowset_data)
-        fields.each do |r|
+        template_fields = array.read(flowset.flowset_data)
+        template_fields.each do |r|
           if is_sampler?(r)
             sampler_key = "#{host}|#{pdu.source_id}|#{r.flow_sampler_id}"
             register_sampler_v9 sampler_key, r
@@ -307,7 +307,7 @@ module Fluent
       end
 
       def netflow_field_for(type, length, category='option')
-        unless field = @fields[category][type]
+        unless field = @template_fields[category][type]
           $log.warn "Skip unsupported field", type: type, length: length
           return [:skip, nil, {length: length}]
         end

data/test/test_parser_netflow.rb

@@ -20,7 +20,7 @@ class NetflowParserTest < Test::Unit::TestCase
   test 'parse v5 binary data, dumped by netflow-generator' do
     # generated by https://github.com/mshindo/NetFlow-Generator
     parser = create_parser
-    raw_data = File.open(File.expand_path('../dump/netflow.v5.dump', __FILE__)){|f| f.read }
+    raw_data = File.binread(File.join(__dir__, "dump/netflow.v5.dump"))
     bytes_for_1record = 72
     assert_equal bytes_for_1record, raw_data.size
     parsed = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-netflow
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Netflow plugin for Fluentd