fluent-plugin-netflow 1.0.0.rc2 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +7 -0
  3. data/VERSION +1 -1
  4. data/fluent-plugin-netflow.gemspec +0 -1
  5. data/lib/fluent/plugin/in_netflow.rb +1 -1
  6. data/lib/fluent/plugin/netflow_records.rb +3 -2
  7. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 78e9dab567c3ee1eff5d5b30e7eede743e4a4296
4
- data.tar.gz: 53a5b634e3ed77404d31ccf24ed8910b27406f79
3
+ metadata.gz: 4ca2c1b3d9f1051aa6e84f619044a260fa1466ae
4
+ data.tar.gz: 3c303b8a08653c676779ad47e41db13a783782de
5
5
  SHA512:
6
- metadata.gz: 487882f6056cdd022238fa39623d92ff0d5c5460220e02d0639d58e756add067cce05516b944c29016e964c8b1946280458c76fd11d18668856098a9bae18a07
7
- data.tar.gz: 92df36281eea0ac2380effed945ef0e84d48ffffd6d0a2caf5ac401ca20baaa6d3bd9e87aa42e158448b433b042fd412705ffd382754832230dd0294c6b161ed
6
+ metadata.gz: 7acc2809004018a46bca473682534c39bf783aff6f471a5c60110e72a069c2f70def771bde9e9d2d65df623ea287ff86e4bc4f7b86bda148bc748c10fab50037
7
+ data.tar.gz: e9111d190f3dd9b60d04fe6c3ac17588c60650f210971972d20884dd5755d2c47f7bc195e2872bb0ebd1f1147b667e251f0947f23170592e16a6fd4a4fb650a5
data/README.md CHANGED
@@ -7,6 +7,13 @@
7
7
 
8
8
  [Fluentd](http://fluentd.org/) input plugin that acts as Netflow v5/v9 collector.
9
9
 
10
+ ## Requirements
11
+
12
+ | fluent-plugin-netflow | fluentd | ruby |
13
+ |------------------------|---------|------|
14
+ | >= 1.0.0 | >= v0.14.0 | >= 2.1 |
15
+ | < 1.0.0 | >= v0.12.0 | >= 1.9 |
16
+
10
17
 
11
18
  ## Installation
12
19
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.0.0.rc2
1
+ 1.0.1
data/fluent-plugin-netflow.gemspec CHANGED
@@ -9,7 +9,6 @@ Gem::Specification.new do |gem|
9
9
  gem.version = File.read("VERSION").strip
10
10
  gem.authors = ["Masahiro Nakagawa"]
11
11
  gem.email = "repeatedly@gmail.com"
12
- gem.has_rdoc = false
13
12
  #gem.platform = Gem::Platform::RUBY
14
13
  gem.license = 'Apache License (2.0)'
15
14
  gem.files = `git ls-files`.split("\n")
data/lib/fluent/plugin/in_netflow.rb CHANGED
@@ -68,7 +68,7 @@ module Fluent::Plugin
68
68
  end
69
69
 
70
70
  record['host'] = host
71
- router.emit(@tag, time, record)
71
+ router.emit(@tag, Integer(time), record)
72
72
  }
73
73
  rescue => e
74
74
  log.warn "unexpected error on parsing", data: data.dump, error_class: e.class, error: e.message
data/lib/fluent/plugin/netflow_records.rb CHANGED
@@ -133,8 +133,9 @@ module Fluent
133
133
  uint16 :field_type
134
134
  uint16 :field_length
135
135
  end
136
- end
137
- skip length: lambda { templates.length.odd? ? 2 : 0 }
136
+ # 10 is byte length of fields. flowset_id, floset_length, template_id, option_scope_length, option_length
137
+ skip length: lambda { flowset_length - 10 - templates[0][:scope_length] - templates[0][:option_length] }
138
+ end
138
139
  end
139
140
 
140
141
  class Netflow9PDU < BinData::Record
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-netflow
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.rc2
4
+ version: 1.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Masahiro Nakagawa
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-05-16 00:00:00.000000000 Z
11
+ date: 2018-12-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fluentd
@@ -120,12 +120,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
120
120
  version: '0'
121
121
  required_rubygems_version: !ruby/object:Gem::Requirement
122
122
  requirements:
123
- - - ">"
123
+ - - ">="
124
124
  - !ruby/object:Gem::Version
125
- version: 1.3.1
125
+ version: '0'
126
126
  requirements: []
127
127
  rubyforge_project:
128
- rubygems_version: 2.6.11
128
+ rubygems_version: 2.6.14.1
129
129
  signing_key:
130
130
  specification_version: 4
131
131
  summary: Netflow plugin for Fluentd