fluent-plugin-mongo 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1b44afa9a00bcc44e988c6ff186cef45226f59c
-  data.tar.gz: 72818ef49d77f1eb77c58a421a528a53142302fe
+  metadata.gz: 0c469055a5c4138143ee66c6498a061a089ec78f
+  data.tar.gz: f927fb01f37bbca5e922b0e579926f46cae940be
 SHA512:
-  metadata.gz: f41c96c14b596e8bb394f5e94045f84272f104c2d8848f4f761c265c3c33ee69803638af0b7ada30a604574817bbca813f4326edad15f5607c16287cc23efc51
-  data.tar.gz: 6b31e68117d8ea3a5465ac02804c6e8a1d71f42cdb4b855c520eff1b9273a967acf3b12661113b93a265963ad1bfd4121cf7d6573a7894a71129bcddb7736bf4
+  metadata.gz: bab2b000d8b206c05f8ff30a6c9f2da916139a8b3955152bdde0460282828ea17e32975db1b8bc832c0c3dd39808a7d458a1fa390f9d563d8d400aab52ff0e93
+  data.tar.gz: aca3095ff0624546dd77ecb7580af9b3fa6098c0b0c01cafab0e61474402b1f2f6fe59dfed773686644c6680796049078acb73d65ff4abdd65fb8b65cdc13f5d

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.7.8 - 2015/03/23
+
+	* Add url option to support URL configuration for MongoDB connection
+
+
 Release 0.7.7 - 2015/03/19
 
 	* Fix in_mongo_tail shutdown mechanizm for handling stop sequence correctly.

data/README.rdoc

@@ -143,6 +143,17 @@ Use _mongo_tail_ type in source.
       id_store_file /Users/repeatedly/devel/fluent-plugin-mongo/last_id
     </source>
 
+You can also use _url_ to specify the database to connect.
+
+    <source>
+      type mongo_tail
+      url mongodb://user:password@192.168.0.13:10249,192.168.0.14:10249/database
+      collection capped_log
+      ...
+    </source>
+
+This allows the plugin to read data from a replica set.
+
 = NOTE
 
 == Broken data as a BSON

data/VERSION

@@ -1 +1 @@
-0.7.7
+0.7.8

data/lib/fluent/plugin/in_mongo_tail.rb

@@ -5,11 +5,12 @@ module Fluent
     require 'fluent/plugin/mongo_util'
     include MongoUtil
 
-    config_param :database, :string
+    config_param :database, :string, :default => nil
     config_param :collection, :string
     config_param :host, :string, :default => 'localhost'
     config_param :port, :integer, :default => 27017
     config_param :wait_time, :integer, :default => 1
+    config_param :url, :string, :default => nil
 
     config_param :tag, :string, :default => nil
     config_param :tag_key, :string, :default => nil
@@ -41,6 +42,14 @@ module Fluent
         raise ConfigError, "'tag' or 'tag_key' option is required on mongo_tail input"
       end
 
+      if @database && @url
+        raise ConfigError, "Both 'database' and 'url' can not be set"
+      end
+
+      if !@database && !@url
+        raise ConfigError, "One of 'database' or 'url' must be specified"
+      end
+
       @last_id = @id_store_file ? get_last_id : nil
       @connection_options[:ssl] = @ssl
 
@@ -90,10 +99,10 @@ module Fluent
 
     def get_capped_collection
       begin
-        db = authenticate(Mongo::Connection.new(@host, @port, @connection_options).db(@database))
-        raise ConfigError, "'#{@database}.#{@collection}' not found: node = #{@host}:#{@port}" unless db.collection_names.include?(@collection)
+        db = get_database
+        raise ConfigError, "'#{database_name}.#{@collection}' not found: node = #{node_string}" unless db.collection_names.include?(@collection)
         collection = db.collection(@collection)
-        raise ConfigError, "'#{@database}.#{@collection}' is not capped: node = #{@host}:#{@port}" unless collection.capped?
+        raise ConfigError, "'#{database_name}.#{@collection}' is not capped: node = #{node_string}" unless collection.capped?
         collection
       rescue Mongo::ConnectionFailure => e
         log.fatal "Failed to connect to 'mongod'. Please restart 'fluentd' after 'mongod' started: #{e}"
@@ -103,6 +112,34 @@ module Fluent
         exit!
       end
     end
+    
+    def get_database
+      case
+      when @database
+        authenticate(Mongo::Connection.new(@host, @port, @connection_options).db(@database))
+      when @url
+        parser = Mongo::URIParser.new(@url)
+        parser.connection.db(parser.db_name)
+      end
+    end
+    
+    def database_name
+      case
+      when @database
+        @database
+      when @url
+        Mongo::URIParser.new(@url).db_name
+      end
+    end
+    
+    def node_string
+      case
+      when @database
+        "#{@host}:#{@port}"
+      when @url
+        @url
+      end
+    end
 
     def process_document(doc)
       time = if @time_key

data/test/plugin/in_mongo_tail.rb

@@ -29,6 +29,41 @@ class MongoTailInputTest < Test::Unit::TestCase
     assert_equal('time', d.instance.time_key)
     assert_equal('/tmp/fluent_mongo_last_id', d.instance.id_store_file)
   end
+  
+  def test_url_configration
+    config = %[
+    type mongo_tail
+    url mongodb://localhost:27017/test
+    collection log
+    tag_key tag
+    time_key time
+    id_store_file /tmp/fluent_mongo_last_id
+    ]
+    
+    d = create_driver(config)
+    assert_equal("mongodb://localhost:27017/test", d.instance.url)
+    assert_nil(d.instance.database)
+    assert_equal('log', d.instance.collection)
+    assert_equal('tag', d.instance.tag_key)
+    assert_equal('time', d.instance.time_key)
+    assert_equal('/tmp/fluent_mongo_last_id', d.instance.id_store_file)
+  end
+
+  def test_url_and_database_can_not_exist
+    config = %[
+    type mongo_tail
+    url mongodb://localhost:27017/test
+    database test2
+    collection log
+    tag_key tag
+    time_key time
+    id_store_file /tmp/fluent_mongo_last_id
+    ]
+
+    assert_raises Fluent::ConfigError do
+      create_driver(config)
+    end
+  end
 
   def test_emit
     # TODO: write actual code

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd