logstash-input-beats 2.2.3 → 2.2.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +6 -0
  3. data/lib/logstash/inputs/beats.rb +2 -2
  4. data/logstash-input-beats.gemspec +1 -1
  5. data/spec/integration_spec.rb +17 -2
  6. metadata +72 -73
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e2beab9dae658061e64acce122da225d2b3087f7
4
- data.tar.gz: 972c48eeaee1f01714e3f0ff9ad816583506866a
3
+ metadata.gz: fff429c1372d2d1a71ae92cadf753d421b009d46
4
+ data.tar.gz: 2f84e5dc8bc9ff6c79a0d7cb0485b2a2ee5fb07e
5
5
  SHA512:
6
- metadata.gz: 8340d76cfb2ddbdb046cfa3f3419fc2b7952ed2a0fcdbadd90955f82b29841dd35fd892eaeda4c1150fd4c45a50b1317d0ebb83d4197ff71f3fb2d2780ba3aac
7
- data.tar.gz: 54fc3e7f115619daf129cb6ea5b11742ce5498f4f9b4c04fd5c509514ae1f13de7b5fecd4f33093d20b770237bcf188ead9ba1963b0ad72ae25113cbd53c9585
6
+ metadata.gz: 5018ac549a816be327dab8590b918db01c6a3453c3aead991c8cbe63af9cbb47cf7a8d5445dbe8d425647db9c753ffb14f55877b3c031566c300d2448a3370d7
7
+ data.tar.gz: ce32435856bc68e86dd6df0355c4fab9d10dd7237ee11f99782fb9b905b90a4e3a6aa6a7b9b1c0b940f2d8754ece577f303b523d98752fe0c08bf3e58c0d7e87
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ # 2.2.5
2
+ - Fix failing tests introduce by the `ssl_key_passphrase` changes.
3
+ - Added an integration test for the `ssl_key_passphrase`
4
+ - Add an optional parameter for `auto_flush`
5
+ # 2.2.4
6
+ - Fix bug where using `ssl_key_passphrase` wouldn't work
1
7
  # 2.2.2
2
8
  - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
3
9
  # 2.2.1
data/lib/logstash/inputs/beats.rb CHANGED
@@ -36,7 +36,7 @@ class LogStash::Codecs::Base
36
36
  end
37
37
  end
38
38
  if !method_defined?(:auto_flush)
39
- def auto_flush
39
+ def auto_flush(*)
40
40
  end
41
41
  end
42
42
  end
@@ -115,7 +115,7 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
115
115
  :ssl => @ssl,
116
116
  :ssl_certificate => @ssl_certificate,
117
117
  :ssl_key => @ssl_key,
118
- :ssl_key_passphrase => @ssl_key_passphrase,
118
+ :ssl_key_passphrase => @ssl_key_passphrase ? @ssl_key_passphrase.value : nil,
119
119
  :ssl_certificate_authorities => @ssl_certificate_authorities,
120
120
  :ssl_verify_mode => @ssl_verify_mode)
121
121
 
data/logstash-input-beats.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "logstash-input-beats"
3
- s.version = '2.2.3'
3
+ s.version = '2.2.5'
4
4
  s.licenses = ["Apache License (2.0)"]
5
5
  s.summary = "Receive events using the lumberjack protocol."
6
6
  s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
data/spec/integration_spec.rb CHANGED
@@ -13,6 +13,9 @@ Thread.abort_on_exception = true
13
13
  describe "A client" do
14
14
  include FileHelpers
15
15
 
16
+ let(:keysize) { 1024 }
17
+ let(:exponent) { 65537 }
18
+
16
19
  let(:certificate) { Flores::PKI.generate }
17
20
  let(:certificate_file_crt) do
18
21
  p = Stud::Temporary.file
@@ -233,6 +236,20 @@ describe "A client" do
233
236
  context "v1 frame" do
234
237
  include_examples "transmit payloads"
235
238
  end
239
+
240
+ context "when the key has a passphrase" do
241
+ let(:passphrase) { "bonjour la famille" }
242
+ let(:cipher) { OpenSSL::Cipher.new("des3") }
243
+ let(:encrypted_key) { certificate.last.to_pem(cipher, passphrase) }
244
+
245
+ let_tmp_file(:certificate_file_key) { encrypted_key }
246
+
247
+ let(:config_ssl) do
248
+ super.merge({ :ssl_key_passphrase => passphrase })
249
+ end
250
+
251
+ include_examples "transmit payloads"
252
+ end
236
253
  end
237
254
  end
238
255
  end
@@ -278,8 +295,6 @@ describe "A client" do
278
295
  end
279
296
 
280
297
  context "with certificate authorities" do
281
- let(:keysize) { 1024 }
282
- let(:exponent) { 65537 }
283
298
  let(:root_ca) { Flores::PKI.generate("CN=root.logstash") }
284
299
  let(:root_ca_certificate) { root_ca.first }
285
300
  let(:root_ca_key) { root_ca.last }
metadata CHANGED
@@ -1,203 +1,203 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-input-beats
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.3
4
+ version: 2.2.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-03-24 00:00:00.000000000 Z
11
+ date: 2016-03-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: logstash-core-plugin-api
15
- version_requirements: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - ~>
18
- - !ruby/object:Gem::Version
19
- version: '1.0'
20
14
  requirement: !ruby/object:Gem::Requirement
21
15
  requirements:
22
- - - ~>
16
+ - - "~>"
23
17
  - !ruby/object:Gem::Version
24
18
  version: '1.0'
19
+ name: logstash-core-plugin-api
25
20
  prerelease: false
26
21
  type: :runtime
27
- - !ruby/object:Gem::Dependency
28
- name: logstash-codec-plain
29
22
  version_requirements: !ruby/object:Gem::Requirement
30
23
  requirements:
31
- - - '>='
24
+ - - "~>"
32
25
  - !ruby/object:Gem::Version
33
- version: '0'
26
+ version: '1.0'
27
+ - !ruby/object:Gem::Dependency
34
28
  requirement: !ruby/object:Gem::Requirement
35
29
  requirements:
36
- - - '>='
30
+ - - ">="
37
31
  - !ruby/object:Gem::Version
38
32
  version: '0'
33
+ name: logstash-codec-plain
39
34
  prerelease: false
40
35
  type: :runtime
41
- - !ruby/object:Gem::Dependency
42
- name: concurrent-ruby
43
36
  version_requirements: !ruby/object:Gem::Requirement
44
37
  requirements:
45
- - - '>='
46
- - !ruby/object:Gem::Version
47
- version: 0.9.2
48
- - - <=
38
+ - - ">="
49
39
  - !ruby/object:Gem::Version
50
- version: 1.0.0
40
+ version: '0'
41
+ - !ruby/object:Gem::Dependency
51
42
  requirement: !ruby/object:Gem::Requirement
52
43
  requirements:
53
- - - '>='
44
+ - - ">="
54
45
  - !ruby/object:Gem::Version
55
46
  version: 0.9.2
56
- - - <=
47
+ - - "<="
57
48
  - !ruby/object:Gem::Version
58
49
  version: 1.0.0
50
+ name: concurrent-ruby
59
51
  prerelease: false
60
52
  type: :runtime
61
- - !ruby/object:Gem::Dependency
62
- name: thread_safe
63
53
  version_requirements: !ruby/object:Gem::Requirement
64
54
  requirements:
65
- - - ~>
55
+ - - ">="
66
56
  - !ruby/object:Gem::Version
67
- version: 0.3.5
57
+ version: 0.9.2
58
+ - - "<="
59
+ - !ruby/object:Gem::Version
60
+ version: 1.0.0
61
+ - !ruby/object:Gem::Dependency
68
62
  requirement: !ruby/object:Gem::Requirement
69
63
  requirements:
70
- - - ~>
64
+ - - "~>"
71
65
  - !ruby/object:Gem::Version
72
66
  version: 0.3.5
67
+ name: thread_safe
73
68
  prerelease: false
74
69
  type: :runtime
75
- - !ruby/object:Gem::Dependency
76
- name: logstash-codec-multiline
77
70
  version_requirements: !ruby/object:Gem::Requirement
78
71
  requirements:
79
- - - ~>
72
+ - - "~>"
80
73
  - !ruby/object:Gem::Version
81
- version: 2.0.5
74
+ version: 0.3.5
75
+ - !ruby/object:Gem::Dependency
82
76
  requirement: !ruby/object:Gem::Requirement
83
77
  requirements:
84
- - - ~>
78
+ - - "~>"
85
79
  - !ruby/object:Gem::Version
86
80
  version: 2.0.5
81
+ name: logstash-codec-multiline
87
82
  prerelease: false
88
83
  type: :runtime
89
- - !ruby/object:Gem::Dependency
90
- name: flores
91
84
  version_requirements: !ruby/object:Gem::Requirement
92
85
  requirements:
93
- - - ~>
86
+ - - "~>"
94
87
  - !ruby/object:Gem::Version
95
- version: 0.0.6
88
+ version: 2.0.5
89
+ - !ruby/object:Gem::Dependency
96
90
  requirement: !ruby/object:Gem::Requirement
97
91
  requirements:
98
- - - ~>
92
+ - - "~>"
99
93
  - !ruby/object:Gem::Version
100
94
  version: 0.0.6
95
+ name: flores
101
96
  prerelease: false
102
97
  type: :development
103
- - !ruby/object:Gem::Dependency
104
- name: rspec
105
98
  version_requirements: !ruby/object:Gem::Requirement
106
99
  requirements:
107
- - - '>='
100
+ - - "~>"
108
101
  - !ruby/object:Gem::Version
109
- version: '0'
102
+ version: 0.0.6
103
+ - !ruby/object:Gem::Dependency
110
104
  requirement: !ruby/object:Gem::Requirement
111
105
  requirements:
112
- - - '>='
106
+ - - ">="
113
107
  - !ruby/object:Gem::Version
114
108
  version: '0'
109
+ name: rspec
115
110
  prerelease: false
116
111
  type: :development
117
- - !ruby/object:Gem::Dependency
118
- name: stud
119
112
  version_requirements: !ruby/object:Gem::Requirement
120
113
  requirements:
121
- - - '>='
114
+ - - ">="
122
115
  - !ruby/object:Gem::Version
123
116
  version: '0'
117
+ - !ruby/object:Gem::Dependency
124
118
  requirement: !ruby/object:Gem::Requirement
125
119
  requirements:
126
- - - '>='
120
+ - - ">="
127
121
  - !ruby/object:Gem::Version
128
122
  version: '0'
123
+ name: stud
129
124
  prerelease: false
130
125
  type: :development
131
- - !ruby/object:Gem::Dependency
132
- name: pry
133
126
  version_requirements: !ruby/object:Gem::Requirement
134
127
  requirements:
135
- - - '>='
128
+ - - ">="
136
129
  - !ruby/object:Gem::Version
137
130
  version: '0'
131
+ - !ruby/object:Gem::Dependency
138
132
  requirement: !ruby/object:Gem::Requirement
139
133
  requirements:
140
- - - '>='
134
+ - - ">="
141
135
  - !ruby/object:Gem::Version
142
136
  version: '0'
137
+ name: pry
143
138
  prerelease: false
144
139
  type: :development
145
- - !ruby/object:Gem::Dependency
146
- name: rspec-wait
147
140
  version_requirements: !ruby/object:Gem::Requirement
148
141
  requirements:
149
- - - '>='
142
+ - - ">="
150
143
  - !ruby/object:Gem::Version
151
144
  version: '0'
145
+ - !ruby/object:Gem::Dependency
152
146
  requirement: !ruby/object:Gem::Requirement
153
147
  requirements:
154
- - - '>='
148
+ - - ">="
155
149
  - !ruby/object:Gem::Version
156
150
  version: '0'
151
+ name: rspec-wait
157
152
  prerelease: false
158
153
  type: :development
159
- - !ruby/object:Gem::Dependency
160
- name: logstash-devutils
161
154
  version_requirements: !ruby/object:Gem::Requirement
162
155
  requirements:
163
- - - ~>
156
+ - - ">="
164
157
  - !ruby/object:Gem::Version
165
- version: 0.0.18
158
+ version: '0'
159
+ - !ruby/object:Gem::Dependency
166
160
  requirement: !ruby/object:Gem::Requirement
167
161
  requirements:
168
- - - ~>
162
+ - - "~>"
169
163
  - !ruby/object:Gem::Version
170
164
  version: 0.0.18
165
+ name: logstash-devutils
171
166
  prerelease: false
172
167
  type: :development
173
- - !ruby/object:Gem::Dependency
174
- name: logstash-codec-json
175
168
  version_requirements: !ruby/object:Gem::Requirement
176
169
  requirements:
177
- - - '>='
170
+ - - "~>"
178
171
  - !ruby/object:Gem::Version
179
- version: '0'
172
+ version: 0.0.18
173
+ - !ruby/object:Gem::Dependency
180
174
  requirement: !ruby/object:Gem::Requirement
181
175
  requirements:
182
- - - '>='
176
+ - - ">="
183
177
  - !ruby/object:Gem::Version
184
178
  version: '0'
179
+ name: logstash-codec-json
185
180
  prerelease: false
186
181
  type: :development
187
- - !ruby/object:Gem::Dependency
188
- name: childprocess
189
182
  version_requirements: !ruby/object:Gem::Requirement
190
183
  requirements:
191
- - - '>='
184
+ - - ">="
192
185
  - !ruby/object:Gem::Version
193
186
  version: '0'
187
+ - !ruby/object:Gem::Dependency
194
188
  requirement: !ruby/object:Gem::Requirement
195
189
  requirements:
196
- - - '>='
190
+ - - ">="
197
191
  - !ruby/object:Gem::Version
198
192
  version: '0'
193
+ name: childprocess
199
194
  prerelease: false
200
195
  type: :development
196
+ version_requirements: !ruby/object:Gem::Requirement
197
+ requirements:
198
+ - - ">="
199
+ - !ruby/object:Gem::Version
200
+ version: '0'
201
201
  description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
202
202
  email: info@elastic.co
203
203
  executables: []
@@ -257,17 +257,17 @@ require_paths:
257
257
  - lib
258
258
  required_ruby_version: !ruby/object:Gem::Requirement
259
259
  requirements:
260
- - - '>='
260
+ - - ">="
261
261
  - !ruby/object:Gem::Version
262
262
  version: '0'
263
263
  required_rubygems_version: !ruby/object:Gem::Requirement
264
264
  requirements:
265
- - - '>='
265
+ - - ">="
266
266
  - !ruby/object:Gem::Version
267
267
  version: '0'
268
268
  requirements: []
269
269
  rubyforge_project:
270
- rubygems_version: 2.4.6
270
+ rubygems_version: 2.4.8
271
271
  signing_key:
272
272
  specification_version: 4
273
273
  summary: Receive events using the lumberjack protocol.
@@ -294,4 +294,3 @@ test_files:
294
294
  - spec/support/integration_shared_context.rb
295
295
  - spec/support/logstash_test.rb
296
296
  - spec/support/shared_examples.rb
297
- has_rdoc: