fluent-plugin-mongo 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 1e3b2ede55de2d31062c0e08ad62f0c8a21c39e3537d83371c4ed429a4bf8389
-  data.tar.gz: 95200af69b2b5f20ba64e4a059fe1e2ff80f76e1f48d176c967019357e7a8ddd
+SHA1:
+  metadata.gz: ae5027563d8db12e0cc4036dec85ca15dd6d5d19
+  data.tar.gz: 93fde5d241a4b22bc89a3a13bee779e2ed06faea
 SHA512:
-  metadata.gz: 3387abdaf002ecfdc6c7a9f58c7803f0f9477fd93796169a34ffb28e207ff3b42b0916774bd7546eb7ec73f2ad926bbc6b53e69310a288a8077742984747d977
-  data.tar.gz: ad76161293d751553136a6a04367f010dfa642e7b948dc95f0be91a92cd8dce68f12bdea70f2fd3091a6dc1559606de53a6daa3a0feb3cc99484a202bf2d4e75
+  metadata.gz: fa962dc7b06fa64e3ca1ee33c20294327f09f21adfc03e89d43231adfe167608711dbe617becedc1e2ea3e353337126b4cbae8663ca560372a82d3b0a3af3d15
+  data.tar.gz: ba9202858bbfa8259fed50d3d2ecc879d612f18973fd1b5cedc66193e8747c75218a9cfceb225f0164e121f552e9c88727ee7df1c996f16d1dae282d33ff9517

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 1.2.0 - 2018/11/29
+
+	* out_mongo: Support placeholder in database parameter
+
 Release 1.1.2 - 2018/07/19
 
 	* Update mongo gem dependency

data/README.rdoc

@@ -58,6 +58,30 @@ Use _mongo_ type in match.
 
 For _connection_string_ parameter, see https://docs.mongodb.com/manual/reference/connection-string/ article for more detail.
 
+===== built-in placeholders
+
+fluent-plugin-mongo support built-in placeholders.
+_database_ and _collection_ parameters can handle them.
+
+Here is an example to use built-in placeholders:
+
+    <match mongo.**>
+      @type mongo
+
+      database ${tag[0]}
+
+      # collection name to insert
+      collection ${tag[1]}-%Y%m%d
+
+      # Other buffer configurations here
+      <buffer tag, time>
+        @type memory
+        timekey 3600
+      </buffer>
+    </match>
+
+In more detail, please refer to the officilal document for built-in placeholders: https://docs.fluentd.org/v1.0/articles/buffer-section#placeholders
+
 === mongo(tag mapped mode)
 
 Tag mapped to MongoDB collection automatically.

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/lib/fluent/plugin/out_mongo.rb

@@ -173,16 +173,17 @@ module Fluent::Plugin
 
     def write(chunk)
       collection_name = extract_placeholders(@collection, chunk.metadata)
-      operate(format_collection_name(collection_name), collect_records(chunk))
+      database_name = extract_placeholders(@database, chunk.metadata)
+      operate(database_name, format_collection_name(collection_name), collect_records(chunk))
     end
 
     private
 
-    def client
+    def client(database = @database)
       if @connection_string
         Mongo::Client.new(@connection_string)
       else
-        @client_options[:database] = @database
+        @client_options[:database] = database
         @client_options[:user] = @user if @user
         @client_options[:password] = @password if @password
         Mongo::Client.new(@nodes, @client_options)
@@ -227,7 +228,8 @@ module Fluent::Plugin
       end
     end
 
-    def get_collection(name, options)
+    def get_collection(database, name,  options)
+      @client = client(database) if database && @database != database
       return @client[name] if @collections[name]
 
       unless collection_exists?(name)
@@ -242,7 +244,7 @@ module Fluent::Plugin
       @collections.delete(name)
     end
 
-    def operate(collection, records)
+    def operate(database, collection, records)
       begin
         if @replace_dot_in_key_with
           records.map! do |r|
@@ -255,7 +257,7 @@ module Fluent::Plugin
           end
         end
 
-        get_collection(collection, @collection_options).insert_many(records)
+        get_collection(database, collection, @collection_options).insert_many(records)
       rescue Mongo::Error::BulkWriteError => e
         log.warn "#{records.size - e.result["n_inserted"]} documents are not inserted. Maybe these documents are invalid as a BSON."
         forget_collection(collection)

data/test/plugin/test_out_mongo.rb

@@ -36,9 +36,9 @@ class MongoOutputTest < ::Test::Unit::TestCase
     ]
   end
 
-  def setup_mongod
+  def setup_mongod(database = database_name)
     options = {}
-    options[:database] = database_name
+    options[:database] = database
     @client = ::Mongo::Client.new(["localhost:#{port}"], options)
   end
 
@@ -211,6 +211,35 @@ class MongoOutputTest < ::Test::Unit::TestCase
     end
   end
 
+  class WriteWithDatabasePlaceholder < self
+    def setup
+      @tag = 'custom'
+      setup_mongod(@tag)
+    end
+
+    def teardown
+      teardown_mongod
+    end
+
+    def test_write_with_database_placeholder
+      d = create_driver(%[
+        @type mongo
+        database ${tag}
+        collection #{collection_name}
+        include_time_key true
+      ])
+      d.run(default_tag: @tag) do
+        emit_documents(d)
+      end
+
+      actual_documents = get_documents
+      time = event_time("2011-01-02 13:14:15 UTC")
+      expected = [{'a' => 1, d.instance.inject_config.time_key => Time.at(time).localtime},
+                  {'a' => 2, d.instance.inject_config.time_key => Time.at(time).localtime}]
+      assert_equal(expected, actual_documents)
+    end
+  end
+
   def test_write_at_enable_tag
     d = create_driver(default_config + %[
       include_tag_key true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-18 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: MongoDB plugin for Fluentd