logstash-input-udp 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65ce03f6729a3d13216ee414e60c83e23aaf0ba9975ab9138339ccc0fcb2373e
-  data.tar.gz: 60b7a6b91ad030142164d5ce7b80208457735e93f26c70d8861eedf0f324a02e
+  metadata.gz: 60d650bd7c475a99512a2152b86460f1b8721772b2b2fd280f646027c77af60b
+  data.tar.gz: f99989e62ebfc5854f4c0e98d44b3afc6ca1809d3d61da9d267ffa5c44c69255
 SHA512:
-  metadata.gz: 93a7f99e7e3a03c1370877a3f05599880d629581afcd08f47db6cd2416a30175fe791eab6d976e35d652ff96e13d44c85a18c031258657e059b5fb28f5f92de1
-  data.tar.gz: f78894b90992202b434fe29ba2131336e2c836cbff14025b30d61a4333fdfc9999a5184d53a5d865dba1c436422939d483214cacb7fc4a7986a8daaf9ebe9ca1
+  metadata.gz: 6c66d1e0b1f7a694e0ce447571df4477967a3faff0c6064367343ecf1a52621ab1570e5d34e9fcb6486a99ab953da278a1cf5598eafee62d9ef2e0f20eea8166
+  data.tar.gz: 014d6c60519f8be62db95fbc09469a2afc46a44a9febaad3a03827c240b756a7721d4f7fd9c81cc9d850975e8b10371dea73fa7d41ac81920469401469c1b7ab

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.3.0
+  - Add metrics support for events, operations, connections and errors produced during execution. #34
+  - Fix support for IPv6 #31
+
 ## 3.2.1
   - Code cleanup. See https://github.com/logstash-plugins/logstash-input-udp/pull/33
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012-2018 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/logstash/inputs/udp.rb

@@ -46,7 +46,8 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
 
   def register
     @udp = nil
-  end
+    @metric_errors = metric.namespace(:errors)
+  end # def register
 
   def run(output_queue)
     @output_queue = output_queue
@@ -56,6 +57,7 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
       udp_listener(output_queue)
     rescue => e
       @logger.warn("UDP listener died", :exception => e, :backtrace => e.backtrace)
+      @metric_errors.increment(:listener)
       Stud.stoppable_sleep(5) { stop? }
       retry unless stop?
     end
@@ -82,7 +84,11 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
       @udp.close
     end
 
-    @udp = UDPSocket.new(Socket::AF_INET)
+    if IPAddr.new(@host).ipv6?
+      @udp = UDPSocket.new(Socket::AF_INET6)
+    elsif IPAddr.new(@host).ipv4?
+      @udp = UDPSocket.new(Socket::AF_INET)
+    end
     # set socket receive buffer size if configured
     if @receive_buffer_bytes
       @udp.setsockopt(Socket::SOL_SOCKET, Socket::SO_RCVBUF, @receive_buffer_bytes)
@@ -96,6 +102,8 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
     @logger.info("UDP listener started", :address => "#{@host}:#{@port}", :receive_buffer_bytes => "#{rcvbuf}", :queue_size => "#{@queue_size}")
 
     @input_to_worker = SizedQueue.new(@queue_size)
+    metric.gauge(:queue_size, @queue_size)
+    metric.gauge(:workers, @workers)
 
     @input_workers = @workers.times do |i|
       @logger.debug("Starting UDP worker thread", :worker => i)
@@ -135,6 +143,7 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
       end
     rescue => e
       @logger.error("Exception in inputworker", "exception" => e, "backtrace" => e.backtrace)
+      @metric_errors.increment(:worker)
     end
   end
 
@@ -142,6 +151,7 @@ class LogStash::Inputs::Udp < LogStash::Inputs::Base
     decorate(event)
     event.set(HOST_FIELD, host) if event.get(HOST_FIELD).nil?
     @output_queue.push(event)
+    metric.increment(:events)
   end
 
   def ignore_close_and_log(e)

data/logstash-input-udp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-udp'
-  s.version         = '3.2.1'
+  s.version         = '3.3.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Reads events over UDP"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/inputs/udp_spec.rb

@@ -11,7 +11,8 @@ describe LogStash::Inputs::Udp do
   let!(:helper) { UdpHelpers.new }
   let(:client) { LogStash::Inputs::Test::UDPClient.new(port) }
   let(:port) { rand(1024..65535) }
-  let(:config) { { "port" => port } }
+  let(:host) { "0.0.0.0" }
+  let(:config) { { "port" => port, "host" => host } }
   subject { LogStash::Plugin.lookup("input","udp").new(config) }
 
   after :each do
@@ -25,26 +26,38 @@ describe LogStash::Inputs::Udp do
   end
 
   describe "receive" do
-    let(:nevents) { 10 }
+  	shared_examples "receiving" do
+      before(:each) do
+        subject.register
+      end
 
-    let(:events) do
-      helper.input(subject, nevents) do
-        nevents.times do |i|
-          client.send("msg #{i}")
+      let(:nevents) { 10 }
+
+      let(:events) do
+        helper.input(subject, nevents) do
+          nevents.times do |i|
+            client.send("msg #{i}")
+          end
         end
       end
-    end
 
-    before(:each) do
-      subject.register
+      it "should receive events been generated" do
+        expect(events.size).to be(nevents)
+        messages = events.map { |event| event.get("message")}
+        messages.each do |message|
+          expect(message).to match(/msg \d+/)
+        end
+      end
     end
 
-    it "should receive events been generated" do
-      expect(events.size).to be(nevents)
-      messages = events.map { |event| event.get("message")}
-      messages.each do |message|
-        expect(message).to match(/msg \d+/)
-      end
+    context "ipv4" do
+      let(:client) { LogStash::Inputs::Test::UDPClient.new(port, "127.0.0.1") }
+      include_examples "receiving"
+    end
+    context "ipv6" do
+      let(:host) { "::1" }
+      let(:client) { LogStash::Inputs::Test::UDPClient.new(port, "::1") }
+      include_examples "receiving"
     end
   end
 
@@ -74,4 +87,4 @@ describe LogStash::Inputs::Udp do
   it_behaves_like "an interruptible input plugin" do
     # see https://github.com/elastic/logstash-devutils/blob/9c4a1fbf2b0c4547e428c5a40ed84f60aad17f97/lib/logstash/devutils/rspec/shared_examples.rb
   end
-end
+end

data/spec/support/client.rb

@@ -1,21 +1,25 @@
 # encoding: utf-8
 require "socket"
+require "ipaddr"
 
 module LogStash::Inputs::Test
 
   class UDPClient
     attr_reader :host, :port, :socket
 
-    def initialize(port)
+    def initialize(port, host = "0.0.0.0")
+      @host = host
       @port = port
-      @host = "0.0.0.0"
-      @socket = UDPSocket.new
-      socket.connect(host, port)
+      if IPAddr.new(@host).ipv6?
+        @socket = UDPSocket.new(Socket::AF_INET6)
+      elsif IPAddr.new(@host).ipv4?
+        @socket = UDPSocket.new(Socket::AF_INET)
+      end
+      @socket.connect(host, port)
     end
 
     def send(msg)
       begin
-        socket.connect(host, port) if socket.closed?
         socket.send(msg, 0)
       rescue  => e
         puts("send exception, retrying", e.inspect)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-udp
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement