fluent-plugin-mongo 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0374d7478e773ffdeba70eba9f7ba7df050ee22a
-  data.tar.gz: a6c4e10042582db77666352673e1a7ee7a812f74
+  metadata.gz: 7b2758a03cd5e9730ba128b2b6ab0aed4d6f21bf
+  data.tar.gz: c8e1e867a8a0e4685a1e69163acc83e5d2d36dd4
 SHA512:
-  metadata.gz: 8d0877102caad677c07d60a9df53585c8ce1693f6de16fc96764305fa47caad39bdfbefd6d56d40a183bf76bebcd9e771595347870f1de1e8dcda1e138be02fc
-  data.tar.gz: 29061649d0edf590b18ad8192141e14980517dc07a80fa5544504a1bff02d64a33a9feeb435791797142f79d47fe9f28befa3dd2f06766bf8e70aaa93d228471
+  metadata.gz: 1de5b0982cb2a8988fd0f863e482a1b5b07804896f24c3e4df9857ee013fea9ee30daaa7d2af408a838639aa96ef93892be11482f50aadbc81b2a588b0fde4c1
+  data.tar.gz: 754da99a8c970e838c22eb0d903c0d14f9f9d40ddb77bc93681b857e3ef61f5e333674707a96873c0ba9593ea21de031d2ec96ffb0b56ccbb1cb46b6c2fba4aa

data/README.rdoc

@@ -30,25 +30,34 @@ Store Fluentd event to MongoDB database.
 Use _mongo_ type in match.
 
     <match mongo.**>
-      type mongo
-      database fluent
-      collection test
+      @type mongo
 
-      # Following attibutes are optional
+      # You can choose two approaches, connection_string or each parameter
+      # 1. connection_string for MongoDB URI
+      connection_string mongodb://fluenter:10000/fluent
+
+      # 2. specify each parameter
+      database fluent
       host fluenter
       port 10000
 
-      # Set 'capped' if you want to use capped collection
-      capped
-      capped_size 100m
+      # collection name to insert
+      collection test
 
-      # Set 'user' and 'password' for authentication
+      # Set 'user' and 'password' for authentication.
+      # These options are not used when use connection_string parameter.
       user handa
       password shinobu
 
+      # Set 'capped' if you want to use capped collection
+      capped
+      capped_size 100m
+
       # Other buffer configurations here
     </match>
 
+For _connection_string_ parameter, see https://docs.mongodb.com/manual/reference/connection-string/ article for more detail.
+
 === mongo(tag mapped mode)
 
 Tag mapped to MongoDB collection automatically.
@@ -60,7 +69,7 @@ Use _tag_mapped_ parameter in match of _mongo_ type.
 If tag name is "foo.bar", auto create collection "foo.bar" and insert data.
 
     <match forward.*>
-      type mongo
+      @type mongo
       database fluent
 
       # Set 'tag_mapped' if you want to use tag mapped mode.
@@ -85,12 +94,11 @@ Replica Set version of mongo.
 ===== v0.8 or later
 
     <match mongo.**>
-      type mongo_replset
+      @type mongo_replset
       database fluent
       collection logs
 
-      host localhost
-      port 27017
+      nodes localhost:27017,localhost:27018
 
       # The replica set name
       replica_set myapp
@@ -110,7 +118,7 @@ Replica Set version of mongo.
 Use _mongo_replset_ type in match.
 
     <match mongo.**>
-      type mongo_replset
+      @type mongo_replset
       database fluent
       collection logs
 
@@ -136,7 +144,7 @@ Tail capped collection to input data.
 Use _mongo_tail_ type in source.
 
     <source>
-      type mongo_tail
+      @type mongo_tail
       database fluent
       collection capped_log
 
@@ -155,7 +163,7 @@ Use _mongo_tail_ type in source.
 You can also use _url_ to specify the database to connect.
 
     <source>
-      type mongo_tail
+      @type mongo_tail
       url mongodb://user:password@192.168.0.13:10249,192.168.0.14:10249/database
       collection capped_log
       ...

data/VERSION

@@ -1 +1 @@
-1.0.0.rc2
+1.0.0.rc3

data/lib/fluent/plugin/out_mongo.rb

@@ -93,6 +93,17 @@ module Fluent::Plugin
           conf['buffer_chunk_limit'] = '8m'
         end
       end
+      # 'config_set_default :include_time_key, true' is ignored in compat_parameters_convert so need manual setting
+      if conf.elements('inject').empty?
+        if conf.has_key?('include_time_key')
+          if Fluent::Config.bool_value(conf['include_time_key']) && !conf.has_key?('time_key')
+            conf['time_key'] = 'time'
+          end
+        else
+          conf['time_key'] = 'time'
+        end
+      end
+
       compat_parameters_convert(conf, :inject)
 
       super

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: MongoDB plugin for Fluentd