logstash-input-redis_cluster 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f2902f858f4c5ee20b071cc53580787dd1d63053e1e68da98acaf9e65200e8f
-  data.tar.gz: c6cb5acd75c94713ac57335d429baad7ffcfb5d22c3e17ffcae33a0a2c8af57c
+  metadata.gz: 4f1fc9b7fbc202a4300182de56568cbab00801cbd3d28b36c9a27e59a8d8dca1
+  data.tar.gz: 36ca7c16205aa992f0d7b5d7b86327562f0f24325ff29793b1bd2f517d6931e9
 SHA512:
-  metadata.gz: 16d4a40be99c4e36f8fa022f5a249e73237b0e0b89393fcc86a35f111916e95574517ca7d23aa83366e670563750ce84b87e027e992b4003e6cb1881d0793212
-  data.tar.gz: 5b6fdd90536fd8422121a52fa7da3ff4bfe40cb969f3a75ba213b8dc1fbd28410ba89413fb0e5b1382f40f5d36d2c5e0ac855afd1a5fee41c12d78a4902028d7
+  metadata.gz: d72f0d836d520fc2bba51a758430ffe654317721492204b3a53d792c1e32647e1d337c56e2294db512e344ca774aa318de6702fac8c5b9bb4ba2e9740edac090
+  data.tar.gz: 77b2a53d244f07d3157afa4706040f14fa185b731fdc2e92444eb07fa2c2d8213a88ac3ba22a7f886ebce6e4f7cf2ff3d6577f5ec57662c316686019ddc01c51

data/lib/logstash/inputs/redis_cluster.rb

@@ -45,6 +45,7 @@ module LogStash module Inputs class RedisCluster < LogStash::Inputs::Threadable
   # Initial connection timeout in seconds.
   config :timeout, :validate => :number, :default => 5
 
+  config :username, :validate => :string, :default => "default"
   # Password to authenticate with. There is no authentication by default.
   config :password, :validate => :password
 
@@ -69,7 +70,8 @@ module LogStash module Inputs class RedisCluster < LogStash::Inputs::Threadable
     @logger.info("HOST " + host.to_s)
     @host = host.first
     @port = host.last
-    @redis_url = @path.nil? ? "redis://#{@password}@#{@host}:#{@port}/#{@db}" : "#{@password}@#{@path}/#{@db}"
+    password = @password.nil? ? "" : "*******"
+    @redis_url = @path.nil? ? "redis://#{password}@#{@host}:#{@port}/#{@db}" : "#{password}@#{@path}/#{@db}"
 
     # just switch on data_type once
     if @data_type == 'list' || @data_type == 'dummy'
@@ -86,7 +88,6 @@ module LogStash module Inputs class RedisCluster < LogStash::Inputs::Threadable
     @list_method = batched? ? method(:list_batch_listener) : method(:list_single_listener)
 
     @identity = "#{@redis_url} #{@data_type}:#{@key}"
-    puts "Identity: " + @identity
     @logger.info("Registering Redis", :identity => @identity)
   end # def register
 
@@ -104,17 +105,17 @@ module LogStash module Inputs class RedisCluster < LogStash::Inputs::Threadable
   private
 
   def find_redis_node(key)
-    username = 'foo'
-    password = 'bitnami'
     fixed_hostname = @fixed_hostname
     @logger.info("Initializing plugin")
     begin
-      cluster = RedisClient.cluster(nodes: @nodes, fixed_hostname: fixed_hostname).new_client
+      cluster = RedisClient.cluster(
+        nodes: @nodes, 
+        fixed_hostname: fixed_hostname, 
+        username: @username,
+        password: @password
+        ).new_client
       
-      puts "Cluster initialized"
-      msg = "Pinging cluster... <= " + cluster.call('PING')
-      @logger.info(msg)
-      puts msg
+      @logger.info("Cluster initialized, Pinging cluster... <= " + cluster.call('PING'))
 
       slot = cluster.call('CLUSTER', 'KEYSLOT', key).to_i
       return cluster.call('CLUSTER', 'NODES').lines
@@ -167,7 +168,7 @@ module LogStash module Inputs class RedisCluster < LogStash::Inputs::Threadable
       @logger.warn("Parameter 'path' is set, ignoring parameters: 'host' and 'port'")
       params[:path] = @path
     end
-
+    @logger.debug("Redis param", params)
     params
   end
 

data/logstash-input-redis_cluster.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-redis_cluster'
-  s.version         = '1.0.0'
+  s.version         = '1.1.1'
   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"
@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'logstash-codec-json'
   s.add_runtime_dependency 'redis', '>= 4.0.1', '< 5'
+  s.add_runtime_dependency 'redis-cluster-client', '>=0.13.1'
 
   s.add_development_dependency 'logstash-devutils', '>= 0.0.16'
-  s.add_development_dependency 'redis-cluster-client'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-redis_cluster
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -69,29 +69,29 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.16
-  name: logstash-devutils
-  type: :development
+        version: 0.13.1
+  name: redis-cluster-client
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: redis-cluster-client
+        version: 0.0.16
+  name: logstash-devutils
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.16
 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