fluent-plugin-mongo 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db6ce0ecfb108767fa775ac7b26ec98f714bd128
-  data.tar.gz: 23cb8dc9efb1b0d123f88ad431b3e08e708b4b76
+  metadata.gz: 2bf1813aa5586654b52813282aa11f01c7dba05f
+  data.tar.gz: 240c7befe5e653491b962753b250134ab48d2ee6
 SHA512:
-  metadata.gz: c48b18b636b28e5aa32120b332f9354a7f435e6d8d5b4c97f98b01e2ca778fc8945393bd2584a7f1b41bb34309857630a40c57435109d2b3b259a70e8b9a9ef9
-  data.tar.gz: 7a64cf7eff3494fdff2b8dea874839ca21921cc0a74da2645bcd36ac5eec5bc208de2ca1b09956b532166b6b735c5a2b7ede7506dfab5974f01781d6778120d9
+  metadata.gz: 9ab2a0129a3bd0b2fa56d520d58a67d1bf545981d3b68ed45b577453a9f29d942b65fb3a126b07e004619b239b643653866e7b31a47b0a8b88e7a625b7644721
+  data.tar.gz: 1e2387e3218da98c9afae121da65f1dd70fff92addef623f2c0d23d4d0054061f51c4c8635d8c1668638abdfad10f78932f49544fb02ccb27c34c97b3c66778e

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.8.1 - 2017/03/23
+
+	* Add connection_string parameter for MongDB URI
+	* out_mongo_replset: Add nodes parameter
+
+
 Release 0.8.0 - 2017/02/10
 
 	* Update mongo gem dependency to v2.0 or upper

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/fluent/plugin/out_mongo.rb

@@ -20,8 +20,10 @@ module Fluent
     include SetTimeKeyMixin
     config_set_default :include_time_key, true
 
+    desc "MongoDB connection string"
+    config_param :connection_string, :default => nil
     desc "MongoDB database"
-    config_param :database, :string
+    config_param :database, :string, :default => nil
     desc "MongoDB collection"
     config_param :collection, :string, default: 'untagged'
     desc "MongoDB host"
@@ -59,6 +61,7 @@ module Fluent
       require 'mongo'
       require 'msgpack'
 
+      @nodes = nil
       @client_options = {}
       @collection_options = {capped: false}
     end
@@ -90,6 +93,10 @@ module Fluent
 
       super
 
+      if @connection_string.nil? && @database.nil?
+        raise Fluent::ConfigError,  "connection_string or database parameter is required"
+      end
+
       unless @ignore_invalid_record
         log.warn "Since v0.8, invalid record detection will be removed because mongo driver v2.x and API spec don't provide it. You may lose invalid records, so you should not send such records to mongo plugin"
       end
@@ -121,6 +128,7 @@ module Fluent
         @client_options[:ssl_verify] = @ssl_verify
         @client_options[:ssl_ca_cert] = @ssl_ca_cert
       end
+      @nodes = ["#{@host}:#{@port}"] if @nodes.nil?
 
       # MongoDB uses BSON's Date for time.
       def @timef.format_nocache(time)
@@ -163,10 +171,14 @@ module Fluent
     private
 
     def client
-      @client_options[:database] = @database
-      @client_options[:user] = @user if @user
-      @client_options[:password] = @password if @password
-      Mongo::Client.new(["#{@host}:#{@port}"], @client_options)
+      if @connection_string
+        Mongo::Client.new(@connection_string)
+      else
+        @client_options[:database] = @database
+        @client_options[:user] = @user if @user
+        @client_options[:password] = @password if @password
+        Mongo::Client.new(@nodes, @client_options)
+      end
     end
 
     def collect_records(chunk)

data/lib/fluent/plugin/out_mongo_replset.rb

@@ -11,6 +11,8 @@ module Fluent
     config_set_default :include_tag_key, false
     config_set_default :include_time_key, true
 
+    desc "Nodes of replica set"
+    config_param :nodes, :array, value_type: :string, :default => nil
     desc "Replica set name"
     config_param :replica_set, :string
     desc "Read from specified role"

data/test/plugin/test_out_mongo.rb

@@ -43,12 +43,12 @@ class MongoOutputTest < ::Test::Unit::TestCase
   end
 
   def create_driver(conf=default_config, tag='test')
-    Fluent::Test::BufferedOutputTestDriver.new(Fluent::MongoOutput, tag).configure(conf)
+    Fluent::Test::BufferedOutputTestDriver.new(Fluent::MongoOutput, tag).configure(conf, true)
   end
 
   def test_configure
     d = create_driver(%[
-      type mongo
+      @type mongo
       database fluent_test
       collection test_collection
 
@@ -62,6 +62,30 @@ class MongoOutputTest < ::Test::Unit::TestCase
     assert_equal(port, d.instance.port)
     assert_equal({capped: true, size: 100}, d.instance.collection_options)
     assert_equal({ssl: false, write: {j: false}}, d.instance.client_options)
+    assert_nil d.instance.connection_string
+  end
+
+  def test_configure_with_connection_string
+    d = create_driver(%[
+      @type mongo
+      connection_string mongodb://localhost/fluent_test
+      collection test_collection
+      capped
+      capped_size 100
+    ])
+    assert_equal('mongodb://localhost/fluent_test', d.instance.connection_string)
+    assert_nil d.instance.database
+  end
+
+  def test_configure_without_connection_string_or_database
+    assert_raise Fluent::ConfigError do
+      d = create_driver(%[
+        @type mongo
+        collection test_collection
+        capped
+        capped_size 100
+      ])
+    end
   end
 
   def test_configure_with_ssl

data/test/plugin/test_out_mongo_replset.rb

@@ -16,14 +16,18 @@ class MongoReplsetOutputTest < ::Test::Unit::TestCase
     'fluent_test'
   end
 
+  def nodes
+    ["localhost:#{port}"]
+  end
+
   def port
     27018
   end
 
   def default_config
     %[
-      type mongo
-      port 27018
+      @type mongo_replset
+      nodes localhost:27018
       database #{database_name}
       collection #{collection_name}
       include_time_key true
@@ -32,23 +36,38 @@ class MongoReplsetOutputTest < ::Test::Unit::TestCase
   end
 
   def create_driver(conf=default_config, tag='test')
-    Fluent::Test::BufferedOutputTestDriver.new(Fluent::MongoOutputReplset, tag).configure(conf)
+    Fluent::Test::BufferedOutputTestDriver.new(Fluent::MongoOutputReplset, tag).configure(conf, true)
   end
 
   def test_configure
     d = create_driver(%[
-      type mongo
+      @type mongo_replset
       port 27018
       database fluent_test
       collection test_collection
-
       replica_set rs0
     ])
 
     assert_equal('fluent_test', d.instance.database)
     assert_equal('test_collection', d.instance.collection)
     assert_equal('localhost', d.instance.host)
-    assert_equal(port, d.instance.port)
+    assert_equal(27018, d.instance.port)
+    assert_equal({replica_set: 'rs0', :ssl=>false, :write=>{:j=>false}},
+                 d.instance.client_options)
+  end
+
+  def test_configure_with_nodes
+    d = create_driver(%[
+      @type mongo_replset
+      nodes localhost:27018,localhost:27019
+      database fluent_test
+      collection test_collection
+      replica_set rs0
+    ])
+
+    assert_equal('fluent_test', d.instance.database)
+    assert_equal('test_collection', d.instance.collection)
+    assert_equal(['localhost:27018', 'localhost:27019'], d.instance.nodes)
     assert_equal({replica_set: 'rs0', :ssl=>false, :write=>{:j=>false}},
                  d.instance.client_options)
   end
@@ -78,7 +97,7 @@ class MongoReplsetOutputTest < ::Test::Unit::TestCase
     def setup_mongod
       options = {}
       options[:database] = database_name
-      @client = ::Mongo::Client.new(["localhost:#{port}"], options)
+      @client = ::Mongo::Client.new(nodes, options)
     end
 
     def teardown_mongod

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd