logstash-input-relp 2.0.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2165b70c4aefab925ee795a4134775014fdca0f3
-  data.tar.gz: f46062a596ef6b9f6b0faa4b65f002a08c1b1e9d
+  metadata.gz: 540969952b5be2771c0b89951e69f0a3187aab48
+  data.tar.gz: 6c9b98332f8484d64f8ea59310cba5c1a13ed1e3
 SHA512:
-  metadata.gz: 0deabe2f911c5f1ee5e38902c3aed0acd3b56eb1088279db593905635c04dd31ca17e0f42f4c176feb459f3a97db50df26d9cf7d0406427859f37b8cb11b3abf
-  data.tar.gz: 76dc430c65d32f28ce2b4d7cf61b6d4b0ae88cb188b52f24b42ffc3a422d11a6f6e05588372316d6b90e09ef5d08d42f1e99465a0d34e6f2fbf0d6ff963fda98
+  metadata.gz: 1d3eb59a6efbf1c083c452649a59f0dc8a8c5bbc48024fdd9bed09d52823e0e9dd16319a7a765d22e9ac9a69ef7549a5abf9878404d07a125ed7d538e89a5622
+  data.tar.gz: 7e3852abd0cb4757a2456885456f2cf03ed2c74acde72c520fce5fdebdbfa4acc4acd4063b9db6cf19633188c9173ed93e9a8a9a2858f4bd93393c5d6f03fc99

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 3.0.0
+  - Breaking: depend on logstash-core-plugin-api between 1.60 and 2.99
+
 # 2.0.5
   - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
 # 2.0.4

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012–2016 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/README.md

@@ -1,7 +1,6 @@
 # Logstash Plugin
 
-[![Build
-Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-relp-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-relp-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-relp.svg)](https://travis-ci.org/logstash-plugins/logstash-input-relp)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
@@ -56,7 +55,12 @@ gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
 ```
 - Install plugin
 ```sh
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
 bin/plugin install --no-verify
+
 ```
 - Run Logstash with your plugin
 ```sh
@@ -74,7 +78,12 @@ gem build logstash-filter-awesome.gemspec
 ```
 - Install the plugin from the Logstash home
 ```sh
-bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
+bin/plugin install --no-verify
+
 ```
 - Start Logstash and proceed to test the plugin
 

data/lib/logstash/inputs/relp.rb

@@ -104,8 +104,10 @@ class LogStash::Inputs::Relp < LogStash::Inputs::Base
       frame = relpserver.syslog_read(socket)
       @codec.decode(frame["message"]) do |event|
         decorate(event)
-        event["host"] = client_address
-        event["sslsubject"] ||= socket.peer_cert.subject if @ssl_enable && @ssl_verify
+        event.set("host", client_address)
+        if @ssl_enable && @ssl_verify && event.get("ssl_context").nil?
+          event.set("sslsubject", socket.peer_cert.subject)
+        end
         output_queue << event
       end
 

data/lib/logstash/util/relp.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "socket"
+require "cabin"
 
 class Relp#This isn't much use on its own, but gives RelpServer and RelpClient things
 
@@ -101,7 +102,7 @@ end
 class RelpServer < Relp
 
   def initialize(host,port,required_commands=[],ssl_context=nil)
-    @logger = Cabin::Channel.get(LogStash)
+    @logger = ::Cabin::Channel.get(LogStash)
 
     @server=true
 

data/logstash-input-relp.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-relp'
-  s.version         = '2.0.5'
+  s.version         = '3.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read RELP events over a TCP socket."
-  s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
+  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"
   s.authors         = ["Elastic"]
   s.email           = 'info@elastic.co'
   s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
@@ -20,9 +20,10 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
 
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'cabin'
 end
 

data/spec/inputs/relp_spec.rb

@@ -68,9 +68,9 @@ describe LogStash::Inputs::Relp do
     end
 
     it "should do multiple connections" do
-      nclients.times do |client_id|
-        expect(events).to have(nevents).with("Hello from client#{client_id}")
-      end
+      expect(events.size).to eq(nevents * nclients)
+      grouped = events.group_by { |e| /(client\d)/.match(e.get("message")) }
+      expect(grouped.size).to eq(nclients)
     end
   end
 

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ class RelpHelpers
   end
 
   def self.filter(events, message)
-     events.select{|event| event["message"] == message }
+     events.select{|event| event.set("message", message) }
   end
 end
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-relp
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.99'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.60'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -52,7 +58,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: cabin
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+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
 email: info@elastic.co
 executables: []
 extensions: []