fluent-plugin-netflow 1.0.0.rc2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 78e9dab567c3ee1eff5d5b30e7eede743e4a4296
-  data.tar.gz: 53a5b634e3ed77404d31ccf24ed8910b27406f79
+SHA256:
+  metadata.gz: f1fd86450ab2ad4b1c125ee6b58e7aa1fceb80778d0fd693ab5b1192b8de9b28
+  data.tar.gz: c9aadcfb6475585c180baaff51732672cc67fdde183a0dc41827192bc0fecddc
 SHA512:
-  metadata.gz: 487882f6056cdd022238fa39623d92ff0d5c5460220e02d0639d58e756add067cce05516b944c29016e964c8b1946280458c76fd11d18668856098a9bae18a07
-  data.tar.gz: 92df36281eea0ac2380effed945ef0e84d48ffffd6d0a2caf5ac401ca20baaa6d3bd9e87aa42e158448b433b042fd412705ffd382754832230dd0294c6b161ed
+  metadata.gz: 3e44e5a9d7d1e672e88c99e2df9ea21d851fb6b30323a6aa1b9573d5cef5e71c5c6feeefdfac85ab1288f3c6946e7df04d92c5076686518c0da71a59a4a6478f
+  data.tar.gz: 22f41cd759942b12a6aedf19d6b4a9c6dbfa2565609c42aa432930fd0d9d56d9572c5d57458b0e9c1e9513e7d8c84348955c904749f77dc0ab06496f46cccf14

data/README.md

@@ -7,6 +7,13 @@
 
 [Fluentd](http://fluentd.org/) input plugin that acts as Netflow v5/v9 collector.
 
+## Requirements
+
+| fluent-plugin-netflow | fluentd | ruby |
+|------------------------|---------|------|
+| >= 1.0.0 | >= v0.14.0 | >= 2.1 |
+|  < 1.0.0 | >= v0.12.0 | >= 1.9 |
+
 
 ## Installation
 
@@ -58,10 +65,13 @@ When set to true, the plugin stores system uptime for ```first_switched``` and `
 
 YAML file containing Netflow field definitions to overfide pre-defined templates. Example is like below
 
-    ---
-    4:          # field value
-    - :uint8    # field length
-    - :protocol # field type
+```yaml
+---
+option:
+  4:          # field value
+  - :uint8    # field length
+  - :protocol # field type
+```
 
 
 ## Performance Evaluation

data/VERSION

@@ -1 +1 @@
-1.0.0.rc2
+1.1.0

data/fluent-plugin-netflow.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |gem|
   gem.version     = File.read("VERSION").strip
   gem.authors     = ["Masahiro Nakagawa"]
   gem.email       = "repeatedly@gmail.com"
-  gem.has_rdoc    = false
   #gem.platform    = Gem::Platform::RUBY
   gem.license     = 'Apache License (2.0)'
   gem.files       = `git ls-files`.split("\n")

data/lib/fluent/plugin/in_netflow.rb

@@ -38,6 +38,10 @@ module Fluent::Plugin
     end
     config_param :max_bytes, :integer, default: 2048
 
+    def multi_workers_ready?
+      true
+    end
+
     def configure(conf)
       super
 
@@ -68,7 +72,7 @@ module Fluent::Plugin
         end
 
         record['host'] = host
-        router.emit(@tag, time, record)
+        router.emit(@tag, Integer(time), record)
       }
     rescue => e
       log.warn "unexpected error on parsing", data: data.dump, error_class: e.class, error: e.message

data/lib/fluent/plugin/netflow_records.rb

@@ -133,8 +133,9 @@ module Fluent
             uint16 :field_type
             uint16 :field_length
           end
-        end
-        skip   length: lambda { templates.length.odd? ? 2 : 0 }
+          # 10 is byte length of fields. flowset_id, floset_length, template_id, option_scope_length, option_length
+          skip   length: lambda { flowset_length - 10 - templates[0][:scope_length] - templates[0][:option_length] }
+        end        
       end
 
       class Netflow9PDU < BinData::Record

data/lib/fluent/plugin/parser_netflow.rb

@@ -40,7 +40,16 @@ module Fluent
         if @definitions
           raise Fluent::ConfigError, "definitions file #{@definitions} doesn't exist" unless File.exist?(@definitions)
           begin
-            @template_fields['option'].merge!(YAML.load_file(@definitions))
+            template_fields_custom = YAML.load_file(@definitions)
+            if template_fields_custom.first.last.is_a?(Array) # compatibility for older definition files
+              @template_fields['option'].merge!(template_fields_custom)
+            else
+              @template_fields.each do |key, _|
+                if template_fields_custom.key?(key)
+                  @template_fields[key].merge!(template_fields_custom[key])
+                end
+              end
+            end
           rescue => e
             raise Fluent::ConfigError, "Bad syntax in definitions file #{@definitions}, error_class = #{e.class.name}, error = #{e.message}"
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-netflow
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.1.0
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2022-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -120,12 +120,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Netflow plugin for Fluentd