logstash-output-zeromq 3.0.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c35daa40ec536673c5064caca171a73ab8dfb1a6
-  data.tar.gz: ee6f8bff5c1ce2fadc9240999602e44e2986da62
+  metadata.gz: 0af4e021e815bcd538e429f4e3a1303fc44cdf65
+  data.tar.gz: 76dc8de9af44b8a9a64aa95f8ff6f7377e9ceee5
 SHA512:
-  metadata.gz: 50abf4a5e7cc11d525590b37e4297ecdf5be7ad953edff0380a0cb26f85329dcad2e9f6f3f6215bf5f06729aaa1d0914ff2a4155399e64c4f9ddb480d6db7cc8
-  data.tar.gz: ebbd5e2a9c04d709043948f9fb4a774f1da64f25d02d59d78a9e54af8c792fbb37558e4e338f8a58a752cf9fa761db9c43c01a6869abe8868274a0ed487ab25e
+  metadata.gz: 52843e2bc85884e0c0e1d650d34903b82feca64c7cda8d5cedeb845265586fe673b1b65f9a42337162f9e63fb7078da2b0bc9176c75773353c65c80a26bb182b
+  data.tar.gz: 915ab9e6fb050149edbd6de5fe20d65df469c0b18449a5238350a04b9cf91289b5498b1090bb3642e041c0845813663f01fe6a65f17b57124ab12375eb9807e8

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 3.1.0
+  - Move to concurrency :single for safety. This may cause some slowdown in
+    client mode, but is the easiest upgrade path. Moving to :shared would be nice
+    at some point.
+
+## 3.0.2
+  - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
+
+## 3.0.1
+  - Republish all the gems under jruby.
 ## 3.0.0
   - Update the plugin to the version 2.0 of the plugin api, this change is required for Logstash 5.0 compatibility. See https://github.com/elastic/logstash/issues/5141
 # 2.1.0

data/Gemfile

@@ -1,4 +1,11 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in logstash-mass_effect.gemspec
 gemspec
+
+logstash_path = ENV["LOGSTASH_PATH"] || "../../logstash"
+use_logstash_source = ENV["LOGSTASH_SOURCE"] && ENV["LOGSTASH_SOURCE"].to_s == "1"
+
+if Dir.exist?(logstash_path) && use_logstash_source
+  gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
+  gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
+end

data/docs/index.asciidoc

@@ -0,0 +1,126 @@
+:plugin: zeromq
+:type: output
+
+///////////////////////////////////////////
+START - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+:version: %VERSION%
+:release_date: %RELEASE_DATE%
+:changelog_url: %CHANGELOG_URL%
+:include_path: ../../../../logstash/docs/include
+///////////////////////////////////////////
+END - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+
+[id="plugins-{type}-{plugin}"]
+
+=== Zeromq output plugin
+
+include::{include_path}/plugin_header.asciidoc[]
+
+==== Description
+
+Write events to a 0MQ PUB socket.
+
+You need to have the 0mq 2.1.x library installed to be able to use
+this output plugin.
+
+The default settings will create a publisher connecting to a subscriber
+bound to tcp://127.0.0.1:2120
+
+
+[id="plugins-{type}s-{plugin}-options"]
+==== Zeromq Output Configuration Options
+
+This plugin supports the following configuration options plus the <<plugins-{type}s-{plugin}-common-options>> described later.
+
+[cols="<,<,<",options="header",]
+|=======================================================================
+|Setting |Input type|Required
+| <<plugins-{type}s-{plugin}-address>> |<<array,array>>|No
+| <<plugins-{type}s-{plugin}-mode>> |<<string,string>>, one of `["server", "client"]`|No
+| <<plugins-{type}s-{plugin}-sockopt>> |<<hash,hash>>|No
+| <<plugins-{type}s-{plugin}-topic>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-topology>> |<<string,string>>, one of `["pushpull", "pubsub", "pair"]`|Yes
+|=======================================================================
+
+Also see <<plugins-{type}s-{plugin}-common-options>> for a list of options supported by all
+output plugins.
+
+&nbsp;
+
+[id="plugins-{type}s-{plugin}-address"]
+===== `address` 
+
+  * Value type is <<array,array>>
+  * Default value is `["tcp://127.0.0.1:2120"]`
+
+This will be a performance bottleneck. Someone needs to upgrade this to
+concurrency :shared and make sure there is no breakage
+0mq socket address to connect or bind.
+Please note that `inproc://` will not work with logstashi.
+For each we use a context per thread.
+By default, inputs bind/listen and outputs connect.
+
+[id="plugins-{type}s-{plugin}-mode"]
+===== `mode` 
+
+  * Value can be any of: `server`, `client`
+  * Default value is `"client"`
+
+Server mode binds/listens. Client mode connects.
+
+[id="plugins-{type}s-{plugin}-sockopt"]
+===== `sockopt` 
+
+  * Value type is <<hash,hash>>
+  * There is no default value for this setting.
+
+This exposes zmq_setsockopt for advanced tuning.
+See http://api.zeromq.org/2-1:zmq-setsockopt for details.
+
+This is where you would set values like:
+
+* ZMQ::HWM - high water mark
+* ZMQ::IDENTITY - named queues
+* ZMQ::SWAP_SIZE - space for disk overflow
+
+Example:
+[source,ruby]
+    sockopt => {
+       "ZMQ::HWM" => 50
+       "ZMQ::IDENTITY"  => "my_named_queue"
+    }
+
+[id="plugins-{type}s-{plugin}-topic"]
+===== `topic` 
+
+  * Value type is <<string,string>>
+  * Default value is `""`
+
+This is used for the 'pubsub' topology only.
+On inputs, this allows you to filter messages by topic.
+On outputs, this allows you to tag a message for routing.
+NOTE: ZeroMQ does subscriber-side filtering
+NOTE: Topic is evaluated with `event.sprintf` so macros are valid here.
+
+[id="plugins-{type}s-{plugin}-topology"]
+===== `topology` 
+
+  * This is a required setting.
+  * Value can be any of: `pushpull`, `pubsub`, `pair`
+  * There is no default value for this setting.
+
+The default logstash topologies work as follows:
+
+* pushpull - inputs are pull, outputs are push
+* pubsub - inputs are subscribers, outputs are publishers
+* pair - inputs are clients, outputs are servers
+
+If the predefined topology flows don't work for you,
+you can change the 'mode' setting
+
+
+
+[id="plugins-{type}s-{plugin}-common-options"]
+include::{include_path}/{type}.asciidoc[]

data/lib/logstash/outputs/zeromq.rb

@@ -11,6 +11,9 @@ require "logstash/namespace"
 # bound to tcp://127.0.0.1:2120
 #
 class LogStash::Outputs::ZeroMQ < LogStash::Outputs::Base
+  # This will be a performance bottleneck. Someone needs to upgrade this to
+  # concurrency :shared and make sure there is no breakage
+  concurrency :single 
 
   config_name "zeromq"
 
@@ -63,13 +66,7 @@ class LogStash::Outputs::ZeroMQ < LogStash::Outputs::Base
   def register
     load_zmq
 
-    if @mode == "server"
-      workers_not_supported("With 'mode => server', only one zeromq socket may bind to a port and may not be shared among threads. Going to single-worker mode for this plugin!")
-    end
-
     connect
-
-    @codec.on_event(&method(:publish))
   end # def register
 
   public
@@ -81,8 +78,8 @@ class LogStash::Outputs::ZeroMQ < LogStash::Outputs::Base
     end
   end # def close
 
-  def receive(event)
-    @codec.encode(event)
+  def multi_receive_encoded(events_and_encoded)
+    events_and_encoded.each {|event, encoded| self.publish(event,encoded)}
   end
 
   private

data/logstash-output-zeromq.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-zeromq'
-  s.version         = '3.0.0'
+  s.version         = '3.1.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Write events to a 0MQ socket."
   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"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
+  s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION", "docs/**/*"]
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60.1", "< 2.99"
   
   s.add_runtime_dependency 'logstash-codec-json'
   s.add_runtime_dependency 'logstash-mixin-zeromq', '>= 2.0.0'

metadata

@@ -1,74 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-zeromq
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Elastic
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+        version: 1.60.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        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.60.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
-  name: logstash-codec-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: logstash-codec-json
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: logstash-mixin-zeromq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
-  type: :runtime
+  name: logstash-mixin-zeromq
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: logstash-devutils
   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
+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: []
@@ -80,6 +84,7 @@ files:
 - LICENSE
 - NOTICE.TXT
 - README.md
+- docs/index.asciidoc
 - lib/logstash/outputs/zeromq.rb
 - logstash-output-zeromq.gemspec
 - spec/integration/zeromq_spec.rb
@@ -92,7 +97,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: output
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,9 +112,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
 summary: Write events to a 0MQ socket.
 test_files: