logstash-input-redis 3.1.6 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50dcdb575769f3b35c8af8473a1dcd171bf0c6adadc88dd5388bb119014606de
-  data.tar.gz: 1d6f6ebf083fa39e403250fe2f6c5b1c9bf6227f0d2c4578b9d30dc81e85bc01
+  metadata.gz: c5ca1b4f974fd36628fc9b373286d19520cd6ee12455318b8b4c5d8daff2b5dd
+  data.tar.gz: 92af4b527141a270f7fbe52be1b4678663a4f3bef516cdbd14e6d5e23a8b14d3
 SHA512:
-  metadata.gz: '0967a513c763163b1c5c98b9335af4bf55e05a34722eaaf1902f12238fdc004014666bb4c2c2b27c630fa2120865da16a1cffb0778ef47c7816685813b9e728b'
-  data.tar.gz: 634e11e382c0104ad0d4a7d1fcf85095a850dedc61207a8038320ed25461611f33fdb24c6c986215657fa835a1460a84657c90ade5fe8f8e042659f85e81dc40
+  metadata.gz: f0c8c0b22ca9dff8ef290bc390e520eb7185163ab9c1aaf988c825a4b197c0dda666b3fa768087d7e82df83998da7dc43a935ff9da7dce1c038f61f7ecbc1671
+  data.tar.gz: 120a42989ff5cb251f9c79eb2d7864391b561830c73f95a8374a2a7173855d895ef1866d8ff8765fd627a7622f15997dd9706b0db1a5a2ce1eaf8db84f86c22d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.2.0
+  - Add support for SSL #61
+  - Add support for Redis unix sockets #64
+
 ## 3.1.6
   - Update gemspec summary
 

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/docs/index.asciidoc

@@ -45,9 +45,11 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 | <<plugins-{type}s-{plugin}-data_type>> |<<string,string>>, one of `["list", "channel", "pattern_channel"]`|Yes
 | <<plugins-{type}s-{plugin}-db>> |<<number,number>>|No
 | <<plugins-{type}s-{plugin}-host>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-path>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-key>> |<<string,string>>|Yes
 | <<plugins-{type}s-{plugin}-password>> |<<password,password>>|No
 | <<plugins-{type}s-{plugin}-port>> |<<number,number>>|No
+| <<plugins-{type}s-{plugin}-ssl>> |<<boolean,boolean>>|No
 | <<plugins-{type}s-{plugin}-threads>> |<<number,number>>|No
 | <<plugins-{type}s-{plugin}-timeout>> |<<number,number>>|No
 |=======================================================================
@@ -58,7 +60,7 @@ input plugins.
 &nbsp;
 
 [id="plugins-{type}s-{plugin}-batch_count"]
-===== `batch_count` 
+===== `batch_count`
 
   * Value type is <<number,number>>
   * Default value is `125`
@@ -66,7 +68,7 @@ input plugins.
 The number of events to return from Redis using EVAL.
 
 [id="plugins-{type}s-{plugin}-data_type"]
-===== `data_type` 
+===== `data_type`
 
   * This is a required setting.
   * Value can be any of: `list`, `channel`, `pattern_channel`
@@ -77,7 +79,7 @@ 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.
 
 [id="plugins-{type}s-{plugin}-db"]
-===== `db` 
+===== `db`
 
   * Value type is <<number,number>>
   * Default value is `0`
@@ -85,15 +87,24 @@ If `redis\_type` is `pattern_channel`, then we will PSUBSCRIBE to the key.
 The Redis database number.
 
 [id="plugins-{type}s-{plugin}-host"]
-===== `host` 
+===== `host`
 
   * Value type is <<string,string>>
   * Default value is `"127.0.0.1"`
 
 The hostname of your Redis server.
 
+id="plugins-{type}s-{plugin}-path"]
+===== `path`
+
+  * Value type is <<string,string>>
+  * There is no default value for this setting.
+  * Path will override Host configuration if both specified.
+
+The unix socket path of your Redis server.
+
 [id="plugins-{type}s-{plugin}-key"]
-===== `key` 
+===== `key`
 
   * This is a required setting.
   * Value type is <<string,string>>
@@ -102,7 +113,7 @@ The hostname of your Redis server.
 The name of a Redis list or channel.
 
 [id="plugins-{type}s-{plugin}-password"]
-===== `password` 
+===== `password`
 
   * Value type is <<password,password>>
   * There is no default value for this setting.
@@ -110,15 +121,24 @@ The name of a Redis list or channel.
 Password to authenticate with. There is no authentication by default.
 
 [id="plugins-{type}s-{plugin}-port"]
-===== `port` 
+===== `port`
 
   * Value type is <<number,number>>
   * Default value is `6379`
 
 The port to connect on.
 
+[id="plugins-{type}s-{plugin}-ssl"]
+===== `ssl` 
+
+  * Value type is <<boolean,boolean>>
+  * Default value is `false`
+
+Enable SSL support.
+
+
 [id="plugins-{type}s-{plugin}-threads"]
-===== `threads` 
+===== `threads`
 
   * Value type is <<number,number>>
   * Default value is `1`
@@ -126,7 +146,7 @@ The port to connect on.
 
 
 [id="plugins-{type}s-{plugin}-timeout"]
-===== `timeout` 
+===== `timeout`
 
   * Value type is <<number,number>>
   * Default value is `5`
@@ -136,4 +156,4 @@ Initial connection timeout in seconds.
 
 
 [id="plugins-{type}s-{plugin}-common-options"]
-include::{include_path}/{type}.asciidoc[]
+include::{include_path}/{type}.asciidoc[]

data/lib/logstash/inputs/redis.rb

@@ -29,6 +29,13 @@ module LogStash module Inputs class Redis < LogStash::Inputs::Threadable
   # The port to connect on.
   config :port, :validate => :number, :default => 6379
 
+  # SSL
+  config :ssl, :validate => :boolean, :default => false
+
+  # The unix socket path to connect on. Will override host and port if defined.
+  # There is no unix socket path by default.
+  config :path, :validate => :string
+
   # The Redis database number.
   config :db, :validate => :number, :default => 0
 
@@ -68,7 +75,7 @@ module LogStash module Inputs class Redis < LogStash::Inputs::Threadable
   end
 
   def register
-    @redis_url = "redis://#{@password}@#{@host}:#{@port}/#{@db}"
+    @redis_url = @path.nil? ? "redis://#{@password}@#{@host}:#{@port}/#{@db}" : "#{@password}@#{@path}/#{@db}"
 
     @redis_builder ||= method(:internal_redis_builder)
 
@@ -114,13 +121,26 @@ module LogStash module Inputs class Redis < LogStash::Inputs::Threadable
 
   # private
   def redis_params
-    {
-      :host => @host,
-      :port => @port,
+    if @path.nil?
+      connectionParams = {
+        :host => @host,
+        :port => @port
+      }
+    else
+      @logger.warn("Parameter 'path' is set, ignoring parameters: 'host' and 'port'")
+      connectionParams = {
+        :path => @path
+      }
+    end
+
+    baseParams = {
       :timeout => @timeout,
       :db => @db,
-      :password => @password.nil? ? nil : @password.value
+      :password => @password.nil? ? nil : @password.value,
+      :ssl => @ssl
     }
+
+    return connectionParams.merge(baseParams)
   end
 
   # private

data/logstash-input-redis.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-redis'
-  s.version         = '3.1.6'
+  s.version         = '3.2.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Reads 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-redis
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.2.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Reads events from a Redis instance