logstash-input-redis 3.2.2 → 3.6.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3166f0d0790fde3501ba2bbe462c826548d3f4f3796354cb528ec7dec9b250db
4
- data.tar.gz: 64a5bd0542681731513c830c611b051bf445d729c5b9259a31801f70fb07d825
3
+ metadata.gz: b4d501b78f7ec2abde6e571ccdf2886fd9aac601b10aaf079d2fa0d541de0b9b
4
+ data.tar.gz: 37938fcb8edd96ca724d228caf2f84bca4c030d903a49a584de59296bbba9be7
5
5
  SHA512:
6
- metadata.gz: c6d0529bd28db81ea0a134a504dd79b1ad499cbefae933a20946abafa7e80c95ff478941c6739d855325629ff0d2ab028e7fd30227a8994a23d1b1e6153f5388
7
- data.tar.gz: da5342d81946331dec0fef00fdc132c62255f837467dbd2b582e503ff701e8f9813a05b167c580b53fc56bd8f4f361e19283f601cdc02269b79189f20feaeaeb
6
+ metadata.gz: 01f5b168dce3082a72efc309b6561d70ed0a4dd51339753afc0757aa02991110ca71d2151fcd30feb3b467585e37e09724de7e4ae6b11b2212da5955df09e0f6
7
+ data.tar.gz: 2d2050789b33466f7baf063f1d227f9e3295d802ba515791b19662168abb37fcc8d96ea90c0f967215037e30f4a4cae9fc498c96ace81b11c377b59f2943207c
@@ -1,3 +1,21 @@
1
+ ## 3.6.0
2
+ - Remove ruby pipeline dependency. Starting from Logstash 8, Ruby execution engine is not available. All pipelines should use Java pipeline [#84](https://github.com/logstash-plugins/logstash-input-redis/pull/84)
3
+
4
+ ## 3.5.1
5
+ - [DOC] Reordered config option to alpha order [#79](https://github.com/logstash-plugins/logstash-input-redis/issues/79)
6
+
7
+ ## 3.5.0
8
+ - Updated redis client dependency to ~> 4
9
+
10
+ ## 3.4.1
11
+ - Changed `redis_type` to `data_type` in .rb file [#70](https://github.com/logstash-plugins/logstash-input-redis/issues/70) and asciidoc file [#71](https://github.com/logstash-plugins/logstash-input-redis/issues/71)
12
+
13
+ ## 3.4.0
14
+ - Added support for renamed redis commands [#29](https://github.com/logstash-plugins/logstash-input-redis/issues/29)
15
+
16
+ ## 3.3.0
17
+ - Add channel to the event #46
18
+
1
19
  ## 3.2.2
2
20
  - Docs: Set the default_codec doc attribute.
3
21
 
data/LICENSE CHANGED
@@ -1,13 +1,202 @@
1
- Copyright (c) 2012-2018 Elasticsearch <http://www.elastic.co>
2
1
 
3
- Licensed under the Apache License, Version 2.0 (the "License");
4
- you may not use this file except in compliance with the License.
5
- You may obtain a copy of the License at
2
+ Apache License
3
+ Version 2.0, January 2004
4
+ http://www.apache.org/licenses/
6
5
 
7
- http://www.apache.org/licenses/LICENSE-2.0
6
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
8
7
 
9
- Unless required by applicable law or agreed to in writing, software
10
- distributed under the License is distributed on an "AS IS" BASIS,
11
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- See the License for the specific language governing permissions and
13
- limitations under the License.
8
+ 1. Definitions.
9
+
10
+ "License" shall mean the terms and conditions for use, reproduction,
11
+ and distribution as defined by Sections 1 through 9 of this document.
12
+
13
+ "Licensor" shall mean the copyright owner or entity authorized by
14
+ the copyright owner that is granting the License.
15
+
16
+ "Legal Entity" shall mean the union of the acting entity and all
17
+ other entities that control, are controlled by, or are under common
18
+ control with that entity. For the purposes of this definition,
19
+ "control" means (i) the power, direct or indirect, to cause the
20
+ direction or management of such entity, whether by contract or
21
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
+ outstanding shares, or (iii) beneficial ownership of such entity.
23
+
24
+ "You" (or "Your") shall mean an individual or Legal Entity
25
+ exercising permissions granted by this License.
26
+
27
+ "Source" form shall mean the preferred form for making modifications,
28
+ including but not limited to software source code, documentation
29
+ source, and configuration files.
30
+
31
+ "Object" form shall mean any form resulting from mechanical
32
+ transformation or translation of a Source form, including but
33
+ not limited to compiled object code, generated documentation,
34
+ and conversions to other media types.
35
+
36
+ "Work" shall mean the work of authorship, whether in Source or
37
+ Object form, made available under the License, as indicated by a
38
+ copyright notice that is included in or attached to the work
39
+ (an example is provided in the Appendix below).
40
+
41
+ "Derivative Works" shall mean any work, whether in Source or Object
42
+ form, that is based on (or derived from) the Work and for which the
43
+ editorial revisions, annotations, elaborations, or other modifications
44
+ represent, as a whole, an original work of authorship. For the purposes
45
+ of this License, Derivative Works shall not include works that remain
46
+ separable from, or merely link (or bind by name) to the interfaces of,
47
+ the Work and Derivative Works thereof.
48
+
49
+ "Contribution" shall mean any work of authorship, including
50
+ the original version of the Work and any modifications or additions
51
+ to that Work or Derivative Works thereof, that is intentionally
52
+ submitted to Licensor for inclusion in the Work by the copyright owner
53
+ or by an individual or Legal Entity authorized to submit on behalf of
54
+ the copyright owner. For the purposes of this definition, "submitted"
55
+ means any form of electronic, verbal, or written communication sent
56
+ to the Licensor or its representatives, including but not limited to
57
+ communication on electronic mailing lists, source code control systems,
58
+ and issue tracking systems that are managed by, or on behalf of, the
59
+ Licensor for the purpose of discussing and improving the Work, but
60
+ excluding communication that is conspicuously marked or otherwise
61
+ designated in writing by the copyright owner as "Not a Contribution."
62
+
63
+ "Contributor" shall mean Licensor and any individual or Legal Entity
64
+ on behalf of whom a Contribution has been received by Licensor and
65
+ subsequently incorporated within the Work.
66
+
67
+ 2. Grant of Copyright License. Subject to the terms and conditions of
68
+ this License, each Contributor hereby grants to You a perpetual,
69
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
+ copyright license to reproduce, prepare Derivative Works of,
71
+ publicly display, publicly perform, sublicense, and distribute the
72
+ Work and such Derivative Works in Source or Object form.
73
+
74
+ 3. Grant of Patent License. Subject to the terms and conditions of
75
+ this License, each Contributor hereby grants to You a perpetual,
76
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
+ (except as stated in this section) patent license to make, have made,
78
+ use, offer to sell, sell, import, and otherwise transfer the Work,
79
+ where such license applies only to those patent claims licensable
80
+ by such Contributor that are necessarily infringed by their
81
+ Contribution(s) alone or by combination of their Contribution(s)
82
+ with the Work to which such Contribution(s) was submitted. If You
83
+ institute patent litigation against any entity (including a
84
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
85
+ or a Contribution incorporated within the Work constitutes direct
86
+ or contributory patent infringement, then any patent licenses
87
+ granted to You under this License for that Work shall terminate
88
+ as of the date such litigation is filed.
89
+
90
+ 4. Redistribution. You may reproduce and distribute copies of the
91
+ Work or Derivative Works thereof in any medium, with or without
92
+ modifications, and in Source or Object form, provided that You
93
+ meet the following conditions:
94
+
95
+ (a) You must give any other recipients of the Work or
96
+ Derivative Works a copy of this License; and
97
+
98
+ (b) You must cause any modified files to carry prominent notices
99
+ stating that You changed the files; and
100
+
101
+ (c) You must retain, in the Source form of any Derivative Works
102
+ that You distribute, all copyright, patent, trademark, and
103
+ attribution notices from the Source form of the Work,
104
+ excluding those notices that do not pertain to any part of
105
+ the Derivative Works; and
106
+
107
+ (d) If the Work includes a "NOTICE" text file as part of its
108
+ distribution, then any Derivative Works that You distribute must
109
+ include a readable copy of the attribution notices contained
110
+ within such NOTICE file, excluding those notices that do not
111
+ pertain to any part of the Derivative Works, in at least one
112
+ of the following places: within a NOTICE text file distributed
113
+ as part of the Derivative Works; within the Source form or
114
+ documentation, if provided along with the Derivative Works; or,
115
+ within a display generated by the Derivative Works, if and
116
+ wherever such third-party notices normally appear. The contents
117
+ of the NOTICE file are for informational purposes only and
118
+ do not modify the License. You may add Your own attribution
119
+ notices within Derivative Works that You distribute, alongside
120
+ or as an addendum to the NOTICE text from the Work, provided
121
+ that such additional attribution notices cannot be construed
122
+ as modifying the License.
123
+
124
+ You may add Your own copyright statement to Your modifications and
125
+ may provide additional or different license terms and conditions
126
+ for use, reproduction, or distribution of Your modifications, or
127
+ for any such Derivative Works as a whole, provided Your use,
128
+ reproduction, and distribution of the Work otherwise complies with
129
+ the conditions stated in this License.
130
+
131
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
132
+ any Contribution intentionally submitted for inclusion in the Work
133
+ by You to the Licensor shall be under the terms and conditions of
134
+ this License, without any additional terms or conditions.
135
+ Notwithstanding the above, nothing herein shall supersede or modify
136
+ the terms of any separate license agreement you may have executed
137
+ with Licensor regarding such Contributions.
138
+
139
+ 6. Trademarks. This License does not grant permission to use the trade
140
+ names, trademarks, service marks, or product names of the Licensor,
141
+ except as required for reasonable and customary use in describing the
142
+ origin of the Work and reproducing the content of the NOTICE file.
143
+
144
+ 7. Disclaimer of Warranty. Unless required by applicable law or
145
+ agreed to in writing, Licensor provides the Work (and each
146
+ Contributor provides its Contributions) on an "AS IS" BASIS,
147
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
+ implied, including, without limitation, any warranties or conditions
149
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
+ PARTICULAR PURPOSE. You are solely responsible for determining the
151
+ appropriateness of using or redistributing the Work and assume any
152
+ risks associated with Your exercise of permissions under this License.
153
+
154
+ 8. Limitation of Liability. In no event and under no legal theory,
155
+ whether in tort (including negligence), contract, or otherwise,
156
+ unless required by applicable law (such as deliberate and grossly
157
+ negligent acts) or agreed to in writing, shall any Contributor be
158
+ liable to You for damages, including any direct, indirect, special,
159
+ incidental, or consequential damages of any character arising as a
160
+ result of this License or out of the use or inability to use the
161
+ Work (including but not limited to damages for loss of goodwill,
162
+ work stoppage, computer failure or malfunction, or any and all
163
+ other commercial damages or losses), even if such Contributor
164
+ has been advised of the possibility of such damages.
165
+
166
+ 9. Accepting Warranty or Additional Liability. While redistributing
167
+ the Work or Derivative Works thereof, You may choose to offer,
168
+ and charge a fee for, acceptance of support, warranty, indemnity,
169
+ or other liability obligations and/or rights consistent with this
170
+ License. However, in accepting such obligations, You may act only
171
+ on Your own behalf and on Your sole responsibility, not on behalf
172
+ of any other Contributor, and only if You agree to indemnify,
173
+ defend, and hold each Contributor harmless for any liability
174
+ incurred by, or claims asserted against, such Contributor by reason
175
+ of your accepting any such warranty or additional liability.
176
+
177
+ END OF TERMS AND CONDITIONS
178
+
179
+ APPENDIX: How to apply the Apache License to your work.
180
+
181
+ To apply the Apache License to your work, attach the following
182
+ boilerplate notice, with the fields enclosed by brackets "[]"
183
+ replaced with your own identifying information. (Don't include
184
+ the brackets!) The text should be enclosed in the appropriate
185
+ comment syntax for the file format. We also recommend that a
186
+ file or class name and description of purpose be included on the
187
+ same "printed page" as the copyright notice for easier
188
+ identification within third-party archives.
189
+
190
+ Copyright 2020 Elastic and contributors
191
+
192
+ Licensed under the Apache License, Version 2.0 (the "License");
193
+ you may not use this file except in compliance with the License.
194
+ You may obtain a copy of the License at
195
+
196
+ http://www.apache.org/licenses/LICENSE-2.0
197
+
198
+ Unless required by applicable law or agreed to in writing, software
199
+ distributed under the License is distributed on an "AS IS" BASIS,
200
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
+ See the License for the specific language governing permissions and
202
+ limitations under the License.
data/README.md CHANGED
@@ -3,9 +3,6 @@
3
3
  Travis Build
4
4
  [![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-redis.svg)](https://travis-ci.org/logstash-plugins/logstash-input-redis)
5
5
 
6
- Jenkins Build
7
- [![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-redis.svg)](https://travis-ci.org/logstash-plugins/logstash-input-redis)
8
-
9
6
  This is a plugin for [Logstash](https://github.com/elastic/logstash).
10
7
 
11
8
  It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
@@ -43,6 +43,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
43
43
  |=======================================================================
44
44
  |Setting |Input type|Required
45
45
  | <<plugins-{type}s-{plugin}-batch_count>> |<<number,number>>|No
46
+ | <<plugins-{type}s-{plugin}-command_map>> |<<hash,hash>>|No
46
47
  | <<plugins-{type}s-{plugin}-data_type>> |<<string,string>>, one of `["list", "channel", "pattern_channel"]`|Yes
47
48
  | <<plugins-{type}s-{plugin}-db>> |<<number,number>>|No
48
49
  | <<plugins-{type}s-{plugin}-host>> |<<string,string>>|No
@@ -68,6 +69,17 @@ input plugins.
68
69
 
69
70
  The number of events to return from Redis using EVAL.
70
71
 
72
+ [id="plugins-{type}s-{plugin}-command_map"]
73
+ ===== `command_map`
74
+
75
+ * Value type is <<hash,hash>>
76
+ * There is no default value for this setting.
77
+ * key is the default command name, value is the renamed command.
78
+
79
+ Configure renamed redis commands in the form of "oldname" => "newname".
80
+ Redis allows for the renaming or disabling of commands in its protocol, see: https://redis.io/topics/security
81
+
82
+
71
83
  [id="plugins-{type}s-{plugin}-data_type"]
72
84
  ===== `data_type`
73
85
 
@@ -75,9 +87,9 @@ The number of events to return from Redis using EVAL.
75
87
  * Value can be any of: `list`, `channel`, `pattern_channel`
76
88
  * There is no default value for this setting.
77
89
 
78
- Specify either list or channel. If `redis\_type` is `list`, then we will BLPOP the
79
- key. If `redis\_type` is `channel`, then we will SUBSCRIBE to the key.
80
- If `redis\_type` is `pattern_channel`, then we will PSUBSCRIBE to the key.
90
+ Specify either list or channel. If `data_type` is `list`, then we will BLPOP the
91
+ key. If `data_type` is `channel`, then we will SUBSCRIBE to the key.
92
+ If `data_type` is `pattern_channel`, then we will PSUBSCRIBE to the key.
81
93
 
82
94
  [id="plugins-{type}s-{plugin}-db"]
83
95
  ===== `db`
@@ -154,8 +166,6 @@ Enable SSL support.
154
166
 
155
167
  Initial connection timeout in seconds.
156
168
 
157
-
158
-
159
169
  [id="plugins-{type}s-{plugin}-common-options"]
160
170
  include::{include_path}/{type}.asciidoc[]
161
171
 
@@ -3,6 +3,7 @@ require "logstash/namespace"
3
3
  require "logstash/inputs/base"
4
4
  require "logstash/inputs/threadable"
5
5
  require 'redis'
6
+ require "stud/interval"
6
7
 
7
8
  # This input will read events from a Redis instance; it supports both Redis channels and lists.
8
9
  # The list command (BLPOP) used by Logstash is supported in Redis v1.3.1+, and
@@ -48,17 +49,20 @@ module LogStash module Inputs class Redis < LogStash::Inputs::Threadable
48
49
  # The name of a Redis list or channel.
49
50
  config :key, :validate => :string, :required => true
50
51
 
51
- # Specify either list or channel. If `redis\_type` is `list`, then we will BLPOP the
52
- # key. If `redis\_type` is `channel`, then we will SUBSCRIBE to the key.
53
- # If `redis\_type` is `pattern_channel`, then we will PSUBSCRIBE to the key.
52
+ # Specify either list or channel. If `data_type` is `list`, then we will BLPOP the
53
+ # key. If `data_type` is `channel`, then we will SUBSCRIBE to the key.
54
+ # If `data_type` is `pattern_channel`, then we will PSUBSCRIBE to the key.
54
55
  config :data_type, :validate => [ "list", "channel", "pattern_channel" ], :required => true
55
56
 
56
57
  # The number of events to return from Redis using EVAL.
57
58
  config :batch_count, :validate => :number, :default => 125
58
59
 
60
+ # Redefined Redis commands to be passed to the Redis client.
61
+ config :command_map, :validate => :hash, :default => {}
62
+
59
63
  public
60
64
  # public API
61
- # use to store a proc that can provide a redis instance or mock
65
+ # use to store a proc that can provide a Redis instance or mock
62
66
  def add_external_redis_builder(builder) #callable
63
67
  @redis_builder = builder
64
68
  self
@@ -151,6 +155,15 @@ module LogStash module Inputs class Redis < LogStash::Inputs::Threadable
151
155
  # private
152
156
  def connect
153
157
  redis = new_redis_instance
158
+
159
+ # register any renamed Redis commands
160
+ if @command_map.any?
161
+ client_command_map = redis.client.command_map
162
+ @command_map.each do |name, renamed|
163
+ client_command_map[name.to_sym] = renamed.to_sym
164
+ end
165
+ end
166
+
154
167
  load_batch_script(redis) if batched? && is_list_type?
155
168
  redis
156
169
  end # def connect
@@ -158,20 +171,21 @@ module LogStash module Inputs class Redis < LogStash::Inputs::Threadable
158
171
  # private
159
172
  def load_batch_script(redis)
160
173
  #A Redis Lua EVAL script to fetch a count of keys
161
- redis_script = <<EOF
162
- local batchsize = tonumber(ARGV[1])
163
- local result = redis.call('lrange', KEYS[1], 0, batchsize)
164
- redis.call('ltrim', KEYS[1], batchsize + 1, -1)
165
- return result
174
+ redis_script = <<EOF
175
+ local batchsize = tonumber(ARGV[1])
176
+ local result = redis.call(\'#{@command_map.fetch('lrange', 'lrange')}\', KEYS[1], 0, batchsize)
177
+ redis.call(\'#{@command_map.fetch('ltrim', 'ltrim')}\', KEYS[1], batchsize + 1, -1)
178
+ return result
166
179
  EOF
167
180
  @redis_script_sha = redis.script(:load, redis_script)
168
181
  end
169
182
 
170
183
  # private
171
- def queue_event(msg, output_queue)
184
+ def queue_event(msg, output_queue, channel=nil)
172
185
  begin
173
186
  @codec.decode(msg) do |event|
174
187
  decorate(event)
188
+ event.set("[@metadata][redis_channel]", channel) if !channel.nil?
175
189
  output_queue << event
176
190
  end
177
191
  rescue => e # parse or event creation error
@@ -297,7 +311,7 @@ EOF
297
311
  end
298
312
 
299
313
  on.message do |channel, message|
300
- queue_event(message, output_queue)
314
+ queue_event(message, output_queue, channel)
301
315
  end
302
316
 
303
317
  on.unsubscribe do |channel, count|
@@ -320,7 +334,7 @@ EOF
320
334
  end
321
335
 
322
336
  on.pmessage do |pattern, channel, message|
323
- queue_event(message, output_queue)
337
+ queue_event(message, output_queue, channel)
324
338
  end
325
339
 
326
340
  on.punsubscribe do |channel, count|
@@ -1,7 +1,7 @@
1
1
  Gem::Specification.new do |s|
2
2
 
3
3
  s.name = 'logstash-input-redis'
4
- s.version = '3.2.2'
4
+ s.version = '3.6.0'
5
5
  s.licenses = ['Apache License (2.0)']
6
6
  s.summary = "Reads events from a Redis instance"
7
7
  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"
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
23
23
  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
24
24
 
25
25
  s.add_runtime_dependency 'logstash-codec-json'
26
- s.add_runtime_dependency 'redis', '~> 3'
26
+ s.add_runtime_dependency 'redis', '~> 4'
27
27
 
28
28
  s.add_development_dependency 'logstash-devutils'
29
29
  end
@@ -1,4 +1,5 @@
1
1
  require "logstash/devutils/rspec/spec_helper"
2
+ require "logstash/devutils/rspec/shared_examples"
2
3
  require "redis"
3
4
  require "stud/try"
4
5
  require 'logstash/inputs/redis'
@@ -76,6 +77,7 @@ describe LogStash::Inputs::Redis do
76
77
  let(:cfg) { {'key' => 'foo', 'data_type' => data_type, 'batch_count' => batch_count} }
77
78
  let(:quit_calls) { [:quit] }
78
79
  let(:accumulator) { [] }
80
+ let(:command_map) { {} }
79
81
 
80
82
  subject do
81
83
  LogStash::Plugin.lookup("input", "redis")
@@ -88,6 +90,71 @@ describe LogStash::Inputs::Redis do
88
90
  end
89
91
  end
90
92
 
93
+ context 'renamed redis commands' do
94
+ let(:cfg) {
95
+ {'key' => 'foo',
96
+ 'data_type' => data_type,
97
+ 'command_map' =>
98
+ {
99
+ 'blpop' => 'testblpop',
100
+ 'evalsha' => 'testevalsha',
101
+ 'lrange' => 'testlrange',
102
+ 'ltrim' => 'testltrim',
103
+ 'script' => 'testscript',
104
+ 'subscribe' => 'testsubscribe',
105
+ 'psubscribe' => 'testpsubscribe',
106
+ },
107
+ 'batch_count' => 2
108
+ }
109
+ }
110
+
111
+ before do
112
+ subject.register
113
+ allow(redis).to receive(:connected?)
114
+ allow(redis).to receive(:client).and_return(connection)
115
+ allow(connection).to receive(:command_map).and_return(command_map)
116
+ end
117
+
118
+ it 'sets the renamed commands in the command map' do
119
+ allow(redis).to receive(:script)
120
+ allow(redis).to receive(:evalsha).and_return([])
121
+
122
+ tt = Thread.new do
123
+ sleep 0.01
124
+ subject.do_stop
125
+ end
126
+
127
+ subject.run(accumulator)
128
+ tt.join
129
+
130
+ expect(command_map[:blpop]).to eq cfg['command_map']['blpop'].to_sym
131
+ expect(command_map[:evalsha]).to eq cfg['command_map']['evalsha'].to_sym
132
+ expect(command_map[:lrange]).to eq cfg['command_map']['lrange'].to_sym
133
+ expect(command_map[:ltrim]).to eq cfg['command_map']['ltrim'].to_sym
134
+ expect(command_map[:script]).to eq cfg['command_map']['script'].to_sym
135
+ expect(command_map[:subscribe]).to eq cfg['command_map']['subscribe'].to_sym
136
+ expect(command_map[:psubscribe]).to eq cfg['command_map']['psubscribe'].to_sym
137
+ end
138
+
139
+ it 'loads the batch script with the renamed command' do
140
+ capture = nil
141
+ allow(redis).to receive(:script) { |load, lua_script| capture = lua_script }
142
+ allow(redis).to receive(:evalsha).and_return([])
143
+
144
+ tt = Thread.new do
145
+ sleep 0.01
146
+ subject.do_stop
147
+ end
148
+
149
+ subject.run(accumulator)
150
+ tt.join
151
+
152
+ expect(capture).to include "redis.call('#{cfg['command_map']['lrange']}', KEYS[1], 0, batchsize)"
153
+ expect(capture).to include "redis.call('#{cfg['command_map']['ltrim']}', KEYS[1], batchsize + 1, -1)"
154
+ end
155
+ end
156
+
157
+
91
158
  context 'runtime for list data_type' do
92
159
  before do
93
160
  subject.register
@@ -272,6 +339,18 @@ describe LogStash::Inputs::Redis do
272
339
 
273
340
  expect(accumulator.size).to eq(2)
274
341
  end
342
+ it 'events had redis_channel' do
343
+ #simulate the input thread
344
+ rt = run_it_thread(instance)
345
+ #simulate the other system thread
346
+ publish_thread(instance.new_redis_instance, 'c').join
347
+ #simulate the pipeline thread
348
+ close_thread(instance, rt).join
349
+ e1 = accumulator.pop
350
+ e2 = accumulator.pop
351
+ expect(e1.get('[@metadata][redis_channel]')).to eq('foo')
352
+ expect(e2.get('[@metadata][redis_channel]')).to eq('foo')
353
+ end
275
354
  end
276
355
  end
277
356
 
@@ -299,6 +378,18 @@ describe LogStash::Inputs::Redis do
299
378
 
300
379
  expect(accumulator.size).to eq(2)
301
380
  end
381
+ it 'events had redis_channel' do
382
+ #simulate the input thread
383
+ rt = run_it_thread(instance)
384
+ #simulate the other system thread
385
+ publish_thread(instance.new_redis_instance, 'pc').join
386
+ #simulate the pipeline thread
387
+ close_thread(instance, rt).join
388
+ e1 = accumulator.pop
389
+ e2 = accumulator.pop
390
+ expect(e1.get('[@metadata][redis_channel]')).to eq('foo')
391
+ expect(e2.get('[@metadata][redis_channel]')).to eq('foo')
392
+ end
302
393
  end
303
394
  end
304
395
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-input-redis
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.2
4
+ version: 3.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-04-06 00:00:00.000000000 Z
11
+ date: 2020-12-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
49
49
  requirements:
50
50
  - - "~>"
51
51
  - !ruby/object:Gem::Version
52
- version: '3'
52
+ version: '4'
53
53
  name: redis
54
54
  prerelease: false
55
55
  type: :runtime
@@ -57,7 +57,7 @@ dependencies:
57
57
  requirements:
58
58
  - - "~>"
59
59
  - !ruby/object:Gem::Version
60
- version: '3'
60
+ version: '4'
61
61
  - !ruby/object:Gem::Dependency
62
62
  requirement: !ruby/object:Gem::Requirement
63
63
  requirements:
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
112
112
  version: '0'
113
113
  requirements: []
114
114
  rubyforge_project:
115
- rubygems_version: 2.6.11
115
+ rubygems_version: 2.6.13
116
116
  signing_key:
117
117
  specification_version: 4
118
118
  summary: Reads events from a Redis instance