fluent-plugin-netflow 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e16d08272207f9bb57f074bd023ec7953a518e4b
-  data.tar.gz: 7381ce759465a95b680c52fe5888d47fd0c5b486
+SHA256:
+  metadata.gz: f1fd86450ab2ad4b1c125ee6b58e7aa1fceb80778d0fd693ab5b1192b8de9b28
+  data.tar.gz: c9aadcfb6475585c180baaff51732672cc67fdde183a0dc41827192bc0fecddc
 SHA512:
-  metadata.gz: e8f6755e304f32faadd3dd99e458708650d9259ced9d3f87b7df4ad3943158b39831e9824dd2c9bb951024cb6f97f918eb5a52343482164b5918f589fed2eacf
-  data.tar.gz: dc4bed2b89d6e606214208aeda75c2114e6a8f71b82ca1f124c805e50515cc8b02f99049aac643730c9f46eedcf3cefed790cd9c61fb87b9c0fac764f4dc544d
+  metadata.gz: 3e44e5a9d7d1e672e88c99e2df9ea21d851fb6b30323a6aa1b9573d5cef5e71c5c6feeefdfac85ab1288f3c6946e7df04d92c5076686518c0da71a59a4a6478f
+  data.tar.gz: 22f41cd759942b12a6aedf19d6b4a9c6dbfa2565609c42aa432930fd0d9d56d9572c5d57458b0e9c1e9513e7d8c84348955c904749f77dc0ab06496f46cccf14

data/README.md

@@ -65,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.2
+1.1.0

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.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2022-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -124,8 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Netflow plugin for Fluentd