logstash-output-nsq 1.0.1 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05812a183380b8ebd051b8efe246b59a0692f6d3
-  data.tar.gz: 37a6eddcae6bcf503358566464af52ac6bceb344
+  metadata.gz: c2747e792fca8f4a49faf4f90401931546c2f7b1
+  data.tar.gz: 2963fb65c048ef0927f4e51e12cd4b0823aeb44b
 SHA512:
-  metadata.gz: 1ab5129836c5fe2e00402893da1470c66ac9c12e5d97a6c8511fa5d6eb6314d549058e0c3a7ee5bf30adfcec7f199116980662492d7259f8152da5ca939a2e41
-  data.tar.gz: cc74e52e6abd106b06bc41363b7931ef11f4f534ff20a4c494c6132d9d17421dc3a48ed79d39670981b42427b662a80ccf87c9584caf2e25c4f09dda870aa360
+  metadata.gz: e740436917defaf7011e0db7611e8f5778f63c8b19709d08ed05e4dfb07a97343216d688e31a9d9f370e93f48e00fffd55a3e73bf763f615a61a5257e972d744
+  data.tar.gz: e417c1bda5420c1cae56112c75ad8f6d333736d58fdc54a9b0fb63035b725739eabd1b31cb55518bf00fa4c710a0723e6032acbae76d65ccd6815a5d7da7ac73

data/README.md

@@ -30,6 +30,31 @@ Using NSQLOOKUPD to find nsqd servers for the given topic:
        }
     }
 
+Using a static NSQD with TLS:
+====================
+
+    output {
+       nsq {
+            nsqd => 127.0.0.1:4150"
+            topic => "testtopic"
+            tls_v1 => true
+       }
+    }
+
+Using a static NSQD with TLS Auth:
+====================
+
+    output {
+       nsq {
+            nsqd => 127.0.0.1:4150"
+            topic => "testtopic"
+            tls_v1 => true
+            tls_key => "/path/to/private.key"
+            tls_cert => "/path/to/public.pem"
+       }
+    }
+
+
 Dependencies
 ====================
 

data/lib/logstash/outputs/nsq.rb

@@ -9,18 +9,49 @@ class LogStash::Outputs::Nsq < LogStash::Outputs::Base
   config :nsqd, :validate => :string, :default => nil
   config :nsqlookupd, :validate => :array, :default => nil
   config :topic, :validate => :string, :required => true
+  config :tls_v1, :validate => :boolean, :default => false
+  config :tls_key, :validate => :string
+  config :tls_cert, :validate => :string
 
   public
   def register
     options = {
         :nsqlookupd => @nsqlookupd,
         :topic => @topic,
+        :tls_v1 => @tls_v1
     }
-    if nsqlookupd == []
+    # overwrite nsqlookupd options if client certificate validation is used:
+    # this is very dirty. please fix 
+    if @tls_key and @tls_cert
       options = {
-          :nsqd => @nsqd,
+          :nsqlookupd => @nsqlookupd,
           :topic => @topic,
+          :tls_v1 => @tls_v1,
+          :tls_context => {
+           key: @tls_key,
+           certificate: @tls_cert
+          }
       }
+    end
+    # overwrite options if no nsqlookupd is used:
+    if nsqlookupd == []
+      if @tls_key and @tls_cert
+        options = {
+            :nsqd => @nsqd,
+            :topic => @topic,
+            :tls_v1 => @tls_v1,
+            :tls_context => {
+             key: @tls_key,
+             certificate: @tls_cert
+            }
+        }
+      else
+        options = {
+            :nsqd => @nsqd,
+            :topic => @topic,
+            :tls_v1 => @tls_v1
+        }
+      end
     end # if
     @producer = Nsq::Producer.new(options)
     #@producer.connect

data/logstash-output-nsq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-output-nsq'
-  s.version         = "1.0.1"
+  s.version         = "1.0.5"
   s.licenses = ["Apache License (2.0)"]
   s.summary = "this logstash plugin outputs in a nsq topic"
   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"
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency "logstash-core", ">= 1.4.0", "< 3.0.0"
   s.add_runtime_dependency "logstash-codec-plain"
-  s.add_runtime_dependency "nsq-ruby"
+  s.add_runtime_dependency "nsq-ruby", ">= 2.0.0"
   s.add_development_dependency "logstash-devutils"
 end

metadata

@@ -1,78 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-nsq
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.5
 platform: ruby
 authors:
 - Matthias Schneider
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: logstash-codec-plain
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: nsq-ruby
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nsq-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
+        version: 2.0.0
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-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
+  prerelease: false
+  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/plugin install gemname. This gem is not
+  a stand-alone program
 email: ms@wck.biz
 executables: []
 extensions: []
@@ -95,24 +97,24 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: output
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.5
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5.1
+signing_key: 
 specification_version: 4
 summary: this logstash plugin outputs in a nsq topic
 test_files: