logstash-input-redis 3.0.1 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12fed6324ad58b3cad96c412c56a923b8cb80444
-  data.tar.gz: 052be2d75e32fd62c26b3be693f7fde62bb288b5
+  metadata.gz: ad182690a7770eae7aea96b3f317cebce6c2e6c7
+  data.tar.gz: 228711379e887a580c9a999e0bb305fbc30d31ad
 SHA512:
-  metadata.gz: 1b67e8ebbdad826f1f6f400b1b8878b8ec985dce30f12b73b2b5303047f33fb2ae474ce6ac839ddeb8d757dbd00a4ca82259a5a1a9d4b1b9b760394e124a7745
-  data.tar.gz: dfdd6153932720c4311c2fafc4a44f6fd1f00ce470d46c61a43f2825a3451d89415c2b7c0a3d0600d0e9846a32a767b7a89c1d3f256e4a63a3d6ee9faeaa317f
+  metadata.gz: b5d962d59198462557c536881b0b977dad979ba0a666cf1d2d5ee1a499e3812800c0be33bf94eaf35035f6f6fbc8abf253a41068459018cb20e743a09d020c07
+  data.tar.gz: 6cbfbc1cbefd104c7574ef9a15e481f81a34539312f069c57d643f9b70a453a44fc2ae8221c53e9b43c522f05202a1a55536f89dcf8860a4b9bce5c662b7ae18

data/CHANGELOG.md

@@ -1,13 +1,25 @@
+## 3.1.1
+  - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
+
+## 3.1.0
+ - breaking,config: Remove deprecated config `queue`. Please use `key` and `data_type`.
+ - breaking,config: Remove deprecated config `name`.
+
 ## 3.0.1
-  - Republish all the gems under jruby.
+ - 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.0.6
-  - make integration tests more reliable because of occasional travis failures
-# 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
-  - New dependency requirements for logstash-core for the 5.0 release
+ - 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.0.6
+ - make integration tests more reliable because of occasional travis failures
+
+## 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
+ - New dependency requirements for logstash-core for the 5.0 release
+
 ## 2.0.3
  - Changed default batch size to 125. Improve batch handling code. Add travis ci build with redis integration.
 
@@ -19,7 +31,7 @@
 ## 1.0.3
  - Fix typo in module name in test (Causing CI build failures)
 
- ## 1.0.2
+## 1.0.2
  - Fix typo in module name (Causing the module to not be loaded)
 
 ## 1.0.1

data/lib/logstash/inputs/redis.rb

@@ -23,10 +23,6 @@ module LogStash module Inputs class Redis < LogStash::Inputs::Threadable
 
   default :codec, "json"
 
-  # The `name` configuration is used for logging in case there are multiple instances.
-  # This feature has no real function and will be removed in future versions.
-  config :name, :validate => :string, :default => "default", :deprecated => true
-
   # The hostname of your Redis server.
   config :host, :validate => :string, :default => "127.0.0.1"
 
@@ -42,16 +38,13 @@ module LogStash module Inputs class Redis < LogStash::Inputs::Threadable
   # Password to authenticate with. There is no authentication by default.
   config :password, :validate => :password
 
-  # The name of the Redis queue (we'll use BLPOP against this).
-  config :queue, :validate => :string, :deprecated => true
-
   # The name of a Redis list or channel.
-  config :key, :validate => :string, :required => false
+  config :key, :validate => :string, :required => true
 
   # Specify either list or channel.  If `redis\_type` is `list`, then we will BLPOP the
   # key.  If `redis\_type` is `channel`, then we will SUBSCRIBE to the key.
   # If `redis\_type` is `pattern_channel`, then we will PSUBSCRIBE to the key.
-  config :data_type, :validate => [ "list", "channel", "pattern_channel" ], :required => false
+  config :data_type, :validate => [ "list", "channel", "pattern_channel" ], :required => true
 
   # The number of events to return from Redis using EVAL.
   config :batch_count, :validate => :number, :default => 125
@@ -77,24 +70,6 @@ module LogStash module Inputs class Redis < LogStash::Inputs::Threadable
   def register
     @redis_url = "redis://#{@password}@#{@host}:#{@port}/#{@db}"
 
-    # TODO remove after setting key and data_type to true
-    if @queue
-      if @key || @data_type
-        raise RuntimeError.new(
-          "Cannot specify queue parameter and key or data_type"
-        )
-      end
-      @key = @queue
-      @data_type = 'list'
-    end
-
-    if !@key || !@data_type
-      raise RuntimeError.new(
-        "Must define queue, or key and data_type parameters"
-      )
-    end
-    # end TODO
-
     @redis_builder ||= method(:internal_redis_builder)
 
     # just switch on data_type once
@@ -111,8 +86,7 @@ module LogStash module Inputs class Redis < LogStash::Inputs::Threadable
 
     @list_method = batched? ? method(:list_batch_listener) : method(:list_single_listener)
 
-    # TODO(sissel, boertje): set @identity directly when @name config option is removed.
-    @identity = @name != 'default' ? @name : "#{@redis_url} #{@data_type}:#{@key}"
+    @identity = "#{@redis_url} #{@data_type}:#{@key}"
     @logger.info("Registering Redis", :identity => @identity)
   end # def register
 

data/logstash-input-redis.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-redis'
-  s.version         = '3.0.1'
+  s.version         = '3.1.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This input will read events from a Redis instance"
   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"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
 
   s.add_runtime_dependency 'logstash-codec-json'
   s.add_runtime_dependency 'redis'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-redis
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-07-14 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: '2.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.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -103,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.3
 signing_key:
 specification_version: 4
 summary: This input will read events from a Redis instance