Add MONGO_COLLECTION var and fix collections mismatch (#61 and #62)

Co-authored-by: wallrony <wallrony@users.noreply.github.com>
strongdm · Feb 11, 2022 · 37bf227 · 37bf227
1 parent fb74a34
commit 37bf227
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/docs/CONFIGURE_MONGO.md b/docs/CONFIGURE_MONGO.md
@@ -2,3 +2,4 @@
 
 The Log Export Container uses [fluentd mongo output plugin](https://docs.fluentd.org/output/mongo). In order to enable it you need to specify `LOG_EXPORT_CONTAINER_OUTPUT=mongo` and provide the following variables:
 * **MONGO_URI**. Mongo Connection URI
+* **MONGO_COLLECTION**. Mongo Collection to store the Log Export Container logs. Default=sdm_logs.
diff --git a/fluentd/etc/classify-default-json.conf b/fluentd/etc/classify-default-json.conf
@@ -28,7 +28,7 @@
   <rule>
     key     type
     pattern /activity/
-    tag     activity
+    tag     class.activity
   </rule>
   <rule>
     key     type

diff --git a/fluentd/etc/output-mongo.conf b/fluentd/etc/output-mongo.conf
@@ -1,17 +1,9 @@
-<store class.*>
+<store>
   @type mongo
   connection_string "#{ENV['MONGO_URI']}"
-  collection logs
+  collection "#{ENV['MONGO_COLLECTION'] || 'sdm_logs'}"
   remove_tag_prefix class.
   <buffer>
     flush_interval 10s
   </buffer>
 </store>
-<store activity>
-  @type mongo
-  connection_string "#{ENV['MONGO_URI']}"
-  collection activities
-  <buffer>
-    flush_interval 15m
-  </buffer>
-</store>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@

		The Log Export Container uses [fluentd mongo output plugin](https://docs.fluentd.org/output/mongo). In order to enable it you need to specify `LOG_EXPORT_CONTAINER_OUTPUT=mongo` and provide the following variables:
		* MONGO_URI. Mongo Connection URI
		* MONGO_COLLECTION. Mongo Collection to store the Log Export Container logs. Default=sdm_logs.