logstash-output-mongodb 3.1.3 → 3.1.7

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: 85734ab74629a2fcd26a261a03f508276d4e824bf46aed67b59d7e504d813e74
4
- data.tar.gz: fb4d959b86a4ace5c38ee6eff3df38ee75be8e396f5315fd5bd44375b3846027
3
+ metadata.gz: 9b494557be01d2a91030d1cadad7d651cfad84a70be3fd46246bded655a6099b
4
+ data.tar.gz: 1c29b1fa8df0426859c7bb42acda53a4a4675c8e584124b3deba7cb749ea74c7
5
5
  SHA512:
6
- metadata.gz: f5df2805fec1e4676fe8b7f34b55049b68085ba52854f712a4c96d33e8afc44c26adf4fa77eb31e65b51d1b606bb388c3edbae050a1d9dd4bfb94ed665e52cf8
7
- data.tar.gz: 235aec7248eea9a7af9faf3f2fca83767b760d7bc76a0dd3da69b12f33b823f9eb4894d91b2311d1ee0b09517cd1b6b5da6c7ccaeb6c9cf3e486ee60adc89784
6
+ metadata.gz: fd3fc748887729c6e8c6d79b66a55d2096447a1f840b2c4999bb40f1072424339b8022d55d95829d111917bcab20fd80abae7749a87f2d5fcd608b29e59a7aa6
7
+ data.tar.gz: a03b1fc91b4d607ae2223ba695a3bb4500b916769d3b5648b87476c78d5da0517d6b92b2e702a7ccb80d92e89f6685dc4514ff5d872261df3b8f4b1d487cde90
data/CHANGELOG.md CHANGED
@@ -1,3 +1,15 @@
1
+ ## 3.1.7
2
+ - Fix "wrong number of arguments" error when shipping events to MongoDB (fixes #60, #64, #65) [#66](https://github.com/logstash-plugins/logstash-output-mongodb/pull/66)
3
+
4
+ ## 3.1.6
5
+ - Fixes BigDecimal and Timestamp encoding and update driver to v2.6 [#59](https://github.com/logstash-plugins/logstash-output-mongodb/pull/59)
6
+
7
+ ## 3.1.5
8
+ - Fixed @timestamp handling, BSON::ObjectId generation, close method [#57](https://github.com/logstash-plugins/logstash-output-mongodb/pull/57)
9
+
10
+ ## 3.1.4
11
+ - Docs: Set the default_codec doc attribute.
12
+
1
13
  ## 3.1.3
2
14
  - Update gemspec summary
3
15
 
data/CONTRIBUTORS CHANGED
@@ -15,6 +15,7 @@ Contributors:
15
15
  * Richard Pijnenburg (electrical)
16
16
  * bitsofinfo (bitsofinfo)
17
17
  * Guy Boertje (guyboertje)
18
+ * Colin Surprenant (colinsurprenant)
18
19
 
19
20
  Note: If you've sent us patches, bug reports, or otherwise contributed to
20
21
  Logstash, and you aren't on the list above and want to be, please let us know
data/LICENSE CHANGED
@@ -1,13 +1,202 @@
1
- Copyright (c) 2012–2016 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
@@ -1,6 +1,6 @@
1
1
  # Logstash Plugin
2
2
 
3
- [![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-output-mongodb.svg)](https://travis-ci.org/logstash-plugins/logstash-output-mongodb)
3
+ [![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-output-mongodb.svg)](https://travis-ci.com/logstash-plugins/logstash-output-mongodb)
4
4
 
5
5
  This is a plugin for [Logstash](https://github.com/elastic/logstash).
6
6
 
data/docs/index.asciidoc CHANGED
@@ -1,5 +1,6 @@
1
1
  :plugin: mongodb
2
2
  :type: output
3
+ :default_codec: plain
3
4
 
4
5
  ///////////////////////////////////////////
5
6
  START - GENERATED VARIABLES, DO NOT EDIT!
@@ -131,4 +132,6 @@ See http://docs.mongodb.org/manual/reference/connection-string/.
131
132
 
132
133
 
133
134
  [id="plugins-{type}s-{plugin}-common-options"]
134
- include::{include_path}/{type}.asciidoc[]
135
+ include::{include_path}/{type}.asciidoc[]
136
+
137
+ :default_codec!:
@@ -33,8 +33,8 @@ module BSON
33
33
  # 1.221311.to_bson
34
34
  # @return [ String ] The encoded string.
35
35
  # @see http://bsonspec.org/#/specification
36
- def to_bson(encoded = ''.force_encoding(BINARY))
37
- encoded << [ self ].pack(PACK)
36
+ def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
37
+ buffer.put_bytes([ self ].pack(PACK))
38
38
  end
39
39
 
40
40
  module ClassMethods
@@ -44,7 +44,7 @@ module BSON
44
44
  # @return [ BigDecimal ] The decoded BigDecimal.
45
45
  # @see http://bsonspec.org/#/specification
46
46
  def from_bson(bson)
47
- from_bson_double(bson.read(8))
47
+ from_bson_double(bson.get_bytes(8))
48
48
  end
49
49
 
50
50
  private
@@ -30,7 +30,7 @@ module BSON
30
30
  # Event.new("field" => "value").to_bson
31
31
  # @return [ String ] The encoded string.
32
32
  # @see http://bsonspec.org/#/specification
33
- def to_bson(buffer = ByteBuffer.new)
33
+ def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
34
34
  position = buffer.length
35
35
  buffer.put_int32(0)
36
36
  to_hash.each do |field, value|
@@ -25,8 +25,8 @@ module BSON
25
25
  # A time is type 0x09 in the BSON spec.
26
26
  BSON_TYPE = 9.chr.force_encoding(BINARY).freeze
27
27
 
28
- def to_bson(encoded = ''.force_encoding(BINARY))
29
- time.to_bson(encoded)
28
+ def to_bson(buffer = ByteBuffer.new, validating_keys = Config.validating_keys?)
29
+ time.to_bson(buffer)
30
30
  end
31
31
 
32
32
  module ClassMethods
@@ -46,19 +46,22 @@ class LogStash::Outputs::Mongodb < LogStash::Outputs::Base
46
46
  # Mutex used to synchronize access to 'documents'
47
47
  @@mutex = Mutex.new
48
48
 
49
- public
50
49
  def register
50
+ if @bulk_size > 1000
51
+ raise LogStash::ConfigurationError, "Bulk size must be lower than '1000', currently '#{@bulk_size}'"
52
+ end
53
+
51
54
  Mongo::Logger.logger = @logger
52
55
  conn = Mongo::Client.new(@uri)
53
56
  @db = conn.use(@database)
54
57
 
55
- if @bulk_size > 1000
56
- raise LogStash::ConfigurationError, "Bulk size must be lower than '1000', currently '#{@bulk_size}'"
57
- end
58
+ @closed = Concurrent::AtomicBoolean.new(false)
58
59
  @documents = {}
59
- Thread.new do
60
- loop do
61
- sleep @bulk_interval
60
+
61
+ @bulk_thread = Thread.new(@bulk_interval) do |bulk_interval|
62
+ while @closed.false? do
63
+ sleep(bulk_interval)
64
+
62
65
  @@mutex.synchronize do
63
66
  @documents.each do |collection, values|
64
67
  if values.length > 0
@@ -69,23 +72,31 @@ class LogStash::Outputs::Mongodb < LogStash::Outputs::Base
69
72
  end
70
73
  end
71
74
  end
72
- end # def register
75
+ end
73
76
 
74
77
  def receive(event)
75
78
  begin
76
79
  # Our timestamp object now has a to_bson method, using it here
77
80
  # {}.merge(other) so we don't taint the event hash innards
78
81
  document = {}.merge(event.to_hash)
82
+
79
83
  if !@isodate
80
- # not using timestamp.to_bson
81
- document["@timestamp"] = event.timestamp.to_json
84
+ timestamp = event.timestamp
85
+ if timestamp
86
+ # not using timestamp.to_bson
87
+ document["@timestamp"] = timestamp.to_json
88
+ else
89
+ @logger.warn("Cannot set MongoDB document `@timestamp` field because it does not exist in the event", :event => event)
90
+ end
82
91
  end
92
+
83
93
  if @generateId
84
- document["_id"] = BSON::ObjectId.new(nil, event.timestamp)
94
+ document["_id"] = BSON::ObjectId.new
85
95
  end
96
+
86
97
  if @bulk
98
+ collection = event.sprintf(@collection)
87
99
  @@mutex.synchronize do
88
- collection = event.sprintf(@collection)
89
100
  if(!@documents[collection])
90
101
  @documents[collection] = []
91
102
  end
@@ -99,20 +110,25 @@ class LogStash::Outputs::Mongodb < LogStash::Outputs::Base
99
110
  else
100
111
  @db[event.sprintf(@collection)].insert_one(document)
101
112
  end
102
-
103
113
  rescue => e
104
- @logger.warn("Failed to send event to MongoDB", :event => event, :exception => e,
105
- :backtrace => e.backtrace)
106
114
  if e.message =~ /^E11000/
107
- # On a duplicate key error, skip the insert.
108
- # We could check if the duplicate key err is the _id key
109
- # and generate a new primary key.
110
- # If the duplicate key error is on another field, we have no way
111
- # to fix the issue.
115
+ # On a duplicate key error, skip the insert.
116
+ # We could check if the duplicate key err is the _id key
117
+ # and generate a new primary key.
118
+ # If the duplicate key error is on another field, we have no way
119
+ # to fix the issue.
120
+ @logger.warn("Skipping insert because of a duplicate key error", :event => event, :exception => e)
112
121
  else
113
- sleep @retry_delay
122
+ @logger.warn("Failed to send event to MongoDB, retrying in #{@retry_delay.to_s} seconds", :event => event, :exception => e)
123
+ sleep(@retry_delay)
114
124
  retry
115
125
  end
116
126
  end
117
- end # def receive
118
- end # class LogStash::Outputs::Mongodb
127
+ end
128
+
129
+ def close
130
+ @closed.make_true
131
+ @bulk_thread.wakeup
132
+ @bulk_thread.join
133
+ end
134
+ end
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'logstash-output-mongodb'
3
- s.version = '3.1.3'
3
+ s.version = '3.1.7'
4
4
  s.licenses = ['Apache License (2.0)']
5
5
  s.summary = "Writes events to MongoDB"
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/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
21
21
  # Gem dependencies
22
22
  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
23
23
  s.add_runtime_dependency 'logstash-codec-plain'
24
- s.add_runtime_dependency 'mongo', '~> 2.0.6'
24
+ s.add_runtime_dependency 'mongo', '~> 2.6'
25
25
 
26
26
  s.add_development_dependency 'logstash-devutils'
27
27
  end
@@ -1,7 +1,6 @@
1
1
  # encoding: utf-8
2
2
  require 'bigdecimal'
3
3
  require_relative "../spec_helper"
4
- require 'stringio'
5
4
 
6
5
  describe ::BigDecimal do
7
6
  let(:a_number) { "4321.1234" }
@@ -13,8 +12,8 @@ describe ::BigDecimal do
13
12
  expect(subject).to respond_to(:to_bson)
14
13
  end
15
14
 
16
- it "to_bson returns a binary encoded number" do
17
- expect(subject.to_bson).to eq(4321.1234.to_bson)
15
+ it "to_bson returns a binary encoded number which can be encoded back from bson" do
16
+ expect(BigDecimal::from_bson(subject.to_bson)).to eq(BigDecimal::from_bson(4321.1234.to_bson))
18
17
  end
19
18
 
20
19
  it "bson_type returns a binary encoded 1" do
@@ -23,7 +22,7 @@ describe ::BigDecimal do
23
22
 
24
23
  describe "class methods" do
25
24
  it "builds a new BigDecimal from BSON" do
26
- decoded = described_class.from_bson(StringIO.new(4321.1234.to_bson))
25
+ decoded = described_class.from_bson(4321.1234.to_bson)
27
26
  expect(decoded).to eql(BigDecimal.new(a_number))
28
27
  end
29
28
  end
@@ -1,6 +1,5 @@
1
1
  # encoding: utf-8
2
2
  require_relative "../spec_helper"
3
- require 'stringio'
4
3
 
5
4
  describe ::LogStash::Timestamp do
6
5
  let(:time_array) { [1918,11,11,11,0,0, "+00:00"] }
@@ -13,8 +12,8 @@ describe ::LogStash::Timestamp do
13
12
  expect(subject).to respond_to(:to_bson)
14
13
  end
15
14
 
16
- it "to_bson returns a binary encoded timestamp" do
17
- expect(timestamp.to_bson).to eq(bson_time)
15
+ it "to_bson returns a binary encoded timestamp which may be encoded back from bson" do
16
+ expect(Time::from_bson(timestamp.to_bson)).to eq(Time::from_bson(bson_time))
18
17
  end
19
18
 
20
19
  it "bson_type returns a binary encoded 9" do
@@ -24,7 +23,7 @@ describe ::LogStash::Timestamp do
24
23
  describe "class methods" do
25
24
  it "builds a new Timestamp from BSON" do
26
25
  expected = ::LogStash::Timestamp.new(a_time)
27
- decoded = ::LogStash::Timestamp.from_bson(StringIO.new(bson_time))
26
+ decoded = ::LogStash::Timestamp.from_bson(bson_time)
28
27
  expect(decoded <=> expected).to eq(0)
29
28
  end
30
29
  end
@@ -8,23 +8,21 @@ describe LogStash::Outputs::Mongodb do
8
8
  let(:database) { 'logstash' }
9
9
  let(:collection) { 'logs' }
10
10
 
11
- let(:config) do
12
- { "uri" => uri, "database" => database, "collection" => collection }
13
- end
11
+ let(:config) {{
12
+ "uri" => uri,
13
+ "database" => database,
14
+ "collection" => collection
15
+ }}
14
16
 
15
- it "should register" do
17
+ it "should register and close" do
16
18
  plugin = LogStash::Plugin.lookup("output", "mongodb").new(config)
17
19
  expect {plugin.register}.to_not raise_error
20
+ plugin.close
18
21
  end
19
22
 
20
- describe "#send" do
21
-
23
+ describe "receive" do
22
24
  subject! { LogStash::Outputs::Mongodb.new(config) }
23
25
 
24
- let(:properties) { { "message" => "This is a message!",
25
- "uuid" => SecureRandom.uuid,
26
- "number" => BigDecimal.new("4321.1234"),
27
- "utf8" => "żółć"} }
28
26
  let(:event) { LogStash::Event.new(properties) }
29
27
  let(:connection) { double("connection") }
30
28
  let(:client) { double("client") }
@@ -38,10 +36,51 @@ describe LogStash::Outputs::Mongodb do
38
36
  subject.register
39
37
  end
40
38
 
41
- it "should send the event to the database" do
42
- expect(collection).to receive(:insert_one)
43
- subject.receive(event)
39
+ after(:each) do
40
+ subject.close
41
+ end
42
+
43
+ describe "#send" do
44
+ let(:properties) {{
45
+ "message" => "This is a message!",
46
+ "uuid" => SecureRandom.uuid,
47
+ "number" => BigDecimal.new("4321.1234"),
48
+ "utf8" => "żółć"
49
+ }}
50
+
51
+ it "should send the event to the database" do
52
+ expect(collection).to receive(:insert_one)
53
+ subject.receive(event)
54
+ end
44
55
  end
45
- end
46
56
 
57
+ describe "no event @timestamp" do
58
+ let(:properties) { { "message" => "foo" } }
59
+
60
+ it "should not contain a @timestamp field in the mongo document" do
61
+ expect(event).to receive(:timestamp).and_return(nil)
62
+ expect(event).to receive(:to_hash).and_return(properties)
63
+ expect(collection).to receive(:insert_one).with(properties)
64
+ subject.receive(event)
65
+ end
66
+ end
67
+
68
+ describe "generateId" do
69
+ let(:properties) { { "message" => "foo" } }
70
+ let(:config) {{
71
+ "uri" => uri,
72
+ "database" => database,
73
+ "collection" => collection,
74
+ "generateId" => true
75
+ }}
76
+
77
+ it "should contain a BSON::ObjectId as _id" do
78
+ expect(BSON::ObjectId).to receive(:new).and_return("BSON::ObjectId")
79
+ expect(event).to receive(:timestamp).and_return(nil)
80
+ expect(event).to receive(:to_hash).and_return(properties)
81
+ expect(collection).to receive(:insert_one).with(properties.merge("_id" => "BSON::ObjectId"))
82
+ subject.receive(event)
83
+ end
84
+ end
85
+ end
47
86
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-output-mongodb
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.3
4
+ version: 3.1.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-11-07 00:00:00.000000000 Z
11
+ date: 2022-01-31 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: 2.0.6
52
+ version: '2.6'
53
53
  name: mongo
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: 2.0.6
60
+ version: '2.6'
61
61
  - !ruby/object:Gem::Dependency
62
62
  requirement: !ruby/object:Gem::Requirement
63
63
  requirements:
@@ -118,8 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
118
118
  - !ruby/object:Gem::Version
119
119
  version: '0'
120
120
  requirements: []
121
- rubyforge_project:
122
- rubygems_version: 2.6.11
121
+ rubygems_version: 3.1.6
123
122
  signing_key:
124
123
  specification_version: 4
125
124
  summary: Writes events to MongoDB