fluent-plugin-sflow 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8baabdbaaf5caeda2f0f5eee9493bf88a816b137
-  data.tar.gz: 6d892b0e7cf8089ff152edfa0df98aefc4224bdc
+  metadata.gz: 0447a8846e6a71d5994fcf1c284e510b01991853
+  data.tar.gz: 8541fea3c74f3ebbe2c00fcb9b7867f702b228d4
 SHA512:
-  metadata.gz: b0f9b0ea023f761018a08e446b463da2a8f382ab827775a74704f19c6346a30b523d8f880e47330c0ac8ea4328d8fb2258983d1c0a1bb3a5a7acda35bed900db
-  data.tar.gz: 715c67e8dc992fc6e450a280e3b0fb0084c554031c1f8a128831031b96bbdd0c97b3b1fedd4239bbbb68e4ef4d8aeac5b7e7f63d9dd5c7ee3c6b709836aee889
+  metadata.gz: af658e53d271282c0e1b8a11525c82ad6744a1cb5e424b2e99444346fa5dca2943b8203242e502dd5cc92a9ac8cb2288006fc0436afb4f88d11f94ee67ae96b9
+  data.tar.gz: c790adea5b9e909c371e9e86cf41a6cc044e42a3fef203d44bc3f99edca004356cb57b06151f5e5729cad3af497df7b5081d01a2738eb8c492b04b91cdbffe72

data/README.md

@@ -1,10 +1,10 @@
 # fluent-plugin-sflow
 
-[![Build Status](https://travis-ci.org/codeout/fluent-plugin-sflow.svg?branch=master)](https://travis-ci.org/codeout/fluent-plugin-sflow)
+[![Build Status](https://travis-ci.org/codeout/fluent-plugin-sflow.svg?branch=fluentd-0.14)](https://travis-ci.org/codeout/fluent-plugin-sflow)
 
-## This branch is valid only for Fluentd 0.12.40 or later
+## This branch is valid only for Fluentd 0.14.x
 
-See [0.14.x branch](https://github.com/codeout/fluent-plugin-sflow/tree/fluentd-0.14) for Fluentd 0.14.x.
+See [0.12.x branch](https://github.com/codeout/fluent-plugin-sflow) for Fluentd 0.12.x.
 
 ## Overview
 
@@ -103,13 +103,13 @@ See [sflowtool document](http://www.inmon.com/technology/sflowTools.php) for mor
 
 ## Requirement
 
-* Fluentd: 0.12.40 or later
-* See [0.14.x branch](https://github.com/codeout/fluent-plugin-sflow/tree/fluentd-0.14) for Fluentd 0.14.x.
+* Fluentd: 0.14.x
+* See [0.12.x](https://github.com/codeout/fluent-plugin-sflow) branch for Fluentd 0.12.x.
 
 ## Install
 
 ``` shell
-$ gem install fluent-plugin-sflow -v '~> 0.2.0'
+$ gem install fluent-plugin-sflow
 ```
 
 You can also use ```fluent-gem``` or ```td-agent-gem``` instead of ```gem``` command.
@@ -248,8 +248,8 @@ UDP port number on which this plugin will accept sFlow.
 Here is a quick benchmark on Macbook Pro Mid 2015:
 
 * sFlow v5 flow samples, 5.88 samples per packet in average
-* Fluentd v0.12.40
-* 14202 sFlow v5 records/s
+* Fluentd v0.14.17
+* 13161 sFlow v5 records/s
 
 
 ## TODO

data/ext/sflowtool/sflowtool.c

@@ -2500,7 +2500,7 @@ static void readExtendedTCPInfo(SFSample *sample)
   case PKTDIR_sent: direction = "sent"; break;
   default: direction = "<bad value>"; break;
   }
-  sf_log(sample, "\"tcpinfo_direction\":\"%s\",", direction);
+  sf_log(sample, "tcpinfo_direction\":\"%s\",", direction);
   sf_log_next32(sample, "tcpinfo_send_mss");
   sf_log_next32(sample, "tcpinfo_receive_mss");
   sf_log_next32(sample, "tcpinfo_unacked_pkts");

data/fluent-plugin-sflow.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-sflow"
-  spec.version       = "0.2.1"
+  spec.version       = "0.3.0"
   spec.authors       = ["Shintaro Kojima"]
   spec.email         = ["goodies@codeout.net"]
 
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/sflowtool/extconf.rb"]
 
-  spec.add_dependency "fluentd", "~> 0.12.40"
+  spec.add_dependency "fluentd", "~>0.14.0"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rake-compiler", "~> 1.0"

data/lib/fluent/plugin/in_sflow.rb

@@ -1,10 +1,12 @@
-require 'cool.io'
+require 'fluent/plugin/input'
 require 'fluent/plugin/parser_sflow'
 
 
-module Fluent
+module Fluent::Plugin
   class SflowInput < Input
-    Plugin.register_input('sflow', self)
+    Fluent::Plugin.register_input('sflow', self)
+
+    helpers :server
 
     config_param :bind, :string, default: '0.0.0.0'
     config_param :port, :integer, default: 6343
@@ -14,31 +16,14 @@ module Fluent
 
     def configure(conf)
       super
-      @parser = Fluent::TextParser::SflowParser.new
+      @parser = Fluent::Plugin::SflowParser.new
     end
 
     def start
       super
-      @loop = Coolio::Loop.new
-      @handler = listen(method(:receive))
-      @loop.attach @handler
-
-      @thread = Thread.new(&method(:run))
-    end
-
-    def shutdown
-      @loop.watchers.each {|w| w.detach }
-      @loop.stop
-      @handler.close
-      @thread.join
-      super
-    end
-
-    def run
-      @loop.run
-    rescue
-      log.error 'unexpected error', error_class: $!.class, error: $!.message
-      log.error_backtrace
+      server_create(:in_sflow_server, @port, proto: :udp, bind: @bind, max_bytes: @max_bytes) do |data, sock|
+        receive(data, sock.remote_host)
+      end
     end
 
 
@@ -61,28 +46,5 @@ module Fluent
       log.warn 'Unexpected error on parsing',
                raw: raw, exporter: exporter, error_class: $!.class, error: $!.message
     end
-
-
-    private
-
-    def listen(callback)
-      log.info "listening sflow socket on #{@bind}:#{@port}"
-      @sock = SocketUtil.create_udp_socket(@bind)
-      @sock.bind @bind, @port
-      UdpHandler.new @sock, callback
-    end
-
-    class UdpHandler < Coolio::IO
-      def initialize(io, callback)
-        super io
-        @io = io
-        @callback = callback
-      end
-
-      def on_readable
-        msg, addr = @io.recvfrom_nonblock(4096)
-        @callback.call msg, addr[3]
-      end
-    end
   end
 end

data/lib/fluent/plugin/parser_sflow.rb

@@ -1,10 +1,11 @@
-require 'fluent/parser'
+require 'fluent/plugin/parser'
+require 'fluent/time'
 require 'json'
 require 'sflowtool'
 
 
 module Fluent
-  class TextParser
+  module Plugin
     class SflowParser < Parser
       Plugin.register_parser('sflow', self)
 
@@ -13,7 +14,7 @@ module Fluent
         data = JSON.load(Sflowtool.parse(raw, remote_host))
 
         # NOTE: sFlow datagram doesn't have timestamp field, but sysUpTime only
-        time = data['header']['unix_seconds_utc']
+        time = Fluent::EventTime.new(data['header']['unix_seconds_utc'])
 
         data['samples'].each do |sample|
           yield time, data['header'].merge(sample)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sflow
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-09 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.40
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.40
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement