logstash-output-mongodb 0.1.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d306a3938aec4893c9d1c1d3f9a334d25253f12
-  data.tar.gz: e50de36c0b3d4b261ae040637e2c0180485155e1
+  metadata.gz: fb9ed79815c1d301d6cc48cb73c4596968a6fe40
+  data.tar.gz: 585099e5e7e29e254f84d6545173ebbbd06d71b6
 SHA512:
-  metadata.gz: 84c2a74127be1f7d7874b4b97290ccca4f6026dfde1eb9c64f88022270b3244c7cffed20002058a7082d1a8d2cea59085591b2648e5e07aa90dd24162c4a555a
-  data.tar.gz: c8c27c81649d4c637c6a6bd189d727cd496c5e47a73a4d956f5f02a2561afbe5ff4d7b854043685540155b5cd8f14dab4db446fa525fa2541e027736b965db73
+  metadata.gz: 3a44cf5562ece64bf632ce109e6e637537da9cf9b439c1e705879a2afadd6b2c672126f2cc5564cea812edcd679500a5bea47001837515e01b1a3f3eaff7fdca
+  data.tar.gz: 9730532c09f17fecb9c1b13edf495e12c7adc6fc3035039ea2faaa6f3112f58d2e557dd3a731a38b3d8b09200ee5a554d6fcf171ff3a47835436d6bf1ee97515

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# 1.0.0
+  - Fixes the plugin to be in the 2.0 series
+  - Add integration and unit test to the project
+  - Adapt the codebase to be 2.0 compatible
+  - Make the internal logger in mongo to report to LS logger
+
+# 0.2.0
+  - Add basic registration test to the project

data/NOTICE.TXT

@@ -0,0 +1,5 @@
+Elasticsearch
+Copyright 2012-2015 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).

data/README.md

@@ -1,19 +1,19 @@
 # Logstash Plugin
 
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
+This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 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.
 
 ## Documentation
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elastic.co/guide/en/logstash/current/).
 
 - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
 
 ## Need Help?
 
-Need help? Try #logstash on freenode IRC or the logstash-users@googlegroups.com mailing list.
+Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
 
 ## Developing
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/outputs/mongodb.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
-
+require "mongo"
 
 class LogStash::Outputs::Mongodb < LogStash::Outputs::Base
 
@@ -10,10 +10,10 @@ class LogStash::Outputs::Mongodb < LogStash::Outputs::Base
   # a MongoDB URI to connect to
   # See http://docs.mongodb.org/manual/reference/connection-string/
   config :uri, :validate => :string, :required => true
-  
+
   # The database to use
   config :database, :validate => :string, :required => true
-   
+
   # The collection to use. This value can use `%{foo}` values to dynamically
   # select a collection based on data in the event.
   config :collection, :validate => :string, :required => true
@@ -33,18 +33,9 @@ class LogStash::Outputs::Mongodb < LogStash::Outputs::Base
 
   public
   def register
-    require "mongo"
-    uriParsed=Mongo::URIParser.new(@uri)
-    conn = uriParsed.connection({})
-    if uriParsed.auths.length > 0
-      uriParsed.auths.each do |auth|
-        if !auth['db_name'].nil?
-          conn.add_auth(auth['db_name'], auth['username'], auth['password'], nil)
-        end 
-      end
-      conn.apply_saved_authentication()
-    end
-    @db = conn.db(@database)
+    Mongo::Logger.logger = @logger
+    conn = Mongo::Client.new(@uri)
+    @db = conn.use(@database)
   end # def register
 
   public
@@ -62,11 +53,11 @@ class LogStash::Outputs::Mongodb < LogStash::Outputs::Base
       if @generateId
         document['_id'] = BSON::ObjectId.new(nil, event["@timestamp"])
       end
-      @db.collection(event.sprintf(@collection)).insert(document)
+      @db[event.sprintf(@collection)].insert_one(document)
     rescue => e
       @logger.warn("Failed to send event to MongoDB", :event => event, :exception => e,
                    :backtrace => e.backtrace)
-      if e.error_code == 11000
+      if e.message =~ /^E11000/
           # On a duplicate key error, skip the insert.
           # We could check if the duplicate key err is the _id key
           # and generate a new primary key.

data/logstash-output-mongodb.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-mongodb'
-  s.version         = '0.1.4'
+  s.version         = '1.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Store events into MongoDB"
   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"
@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
-
-  s.add_runtime_dependency 'mongo'
+  s.add_runtime_dependency 'logstash-codec-plain'
+  s.add_runtime_dependency 'mongo', '~> 2.0.6'
 
   s.add_development_dependency 'logstash-devutils'
 end

data/spec/integration/mongodb_spec.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+require_relative "../spec_helper"
+
+describe LogStash::Outputs::Mongodb, :integration => true do
+
+  let(:uri)        { 'mongodb://localhost:27017' }
+  let(:database)   { 'logstash' }
+  let(:collection) { 'logs' }
+
+  let(:config) do
+    { "uri" => uri, "database" => database, "collection" => collection }
+  end
+
+  describe "#send" do
+
+    subject { LogStash::Outputs::Mongodb.new(config) }
+
+    let(:properties) { { "message" => "This is a message!"} }
+    let(:event)      { LogStash::Event.new(properties) }
+
+    before(:each) do
+      subject.register
+    end
+
+    it "should send the event to the database" do
+      subject.receive(event)
+      expect(subject).to have_received(event)
+    end
+  end
+end

data/spec/outputs/mongodb_spec.rb

@@ -1 +1,44 @@
-require "logstash/devutils/rspec/spec_helper"
+# encoding: utf-8
+require_relative "../spec_helper"
+require "logstash/plugin"
+
+describe LogStash::Outputs::Mongodb do
+
+  let(:uri)        { 'mongodb://localhost:27017' }
+  let(:database)   { 'logstash' }
+  let(:collection) { 'logs' }
+
+  let(:config) do
+    { "uri" => uri, "database" => database, "collection" => collection }
+  end
+
+  it "should register" do
+    plugin = LogStash::Plugin.lookup("output", "mongodb").new(config)
+    expect {plugin.register}.to_not raise_error
+  end
+
+  describe "#send" do
+
+    subject { LogStash::Outputs::Mongodb.new(config) }
+
+    let(:properties) { { "message" => "This is a message!"} }
+    let(:event)      { LogStash::Event.new(properties) }
+    let(:connection) { double("connection") }
+    let(:client)     { double("client") }
+    let(:collection) { double("collection") }
+
+    before(:each) do
+      allow(Mongo::Client).to receive(:new).and_return(connection)
+      allow(connection).to receive(:use).and_return(client)
+      allow(client).to receive(:[]).and_return(collection)
+      allow(collection).to receive(:insert_one)
+      subject.register
+    end
+
+    it "should send the event to the database" do
+      expect(collection).to receive(:insert_one)
+      subject.receive(event)
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+require "logstash/devutils/rspec/spec_helper"
+require "logstash/outputs/mongodb"
+
+RSpec::Matchers.define :have_received do |event|
+  match do |subject|
+    client     = subject.instance_variable_get("@db")
+    collection = subject.instance_variable_get("@collection")
+    client["#{collection}"].find("@timestamp" => event["@timestamp"].to_json).count > 0
+  end
+end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-mongodb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,34 +28,50 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
   name: mongo
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.6
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.6
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 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
 email: info@elastic.co
 executables: []
@@ -65,14 +79,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
+- NOTICE.TXT
 - README.md
 - Rakefile
 - lib/logstash/outputs/mongodb.rb
 - logstash-output-mongodb.gemspec
+- spec/integration/mongodb_spec.rb
 - spec/outputs/mongodb_spec.rb
+- spec/spec_helper.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -95,9 +113,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.6
 signing_key:
 specification_version: 4
 summary: Store events into MongoDB
 test_files:
+- spec/integration/mongodb_spec.rb
 - spec/outputs/mongodb_spec.rb
+- spec/spec_helper.rb