diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 41717d4cd..4cdb3df92 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -5906,52 +5906,6 @@
 #     # close_connection_after_gather = false
 
 
-# # Read metrics from one or many MongoDB servers
-# [[inputs.mongodb]]
-#   ## An array of URLs of the form:
-#   ##   "mongodb://" [user ":" pass "@"] host [ ":" port]
-#   ## For example:
-#   ##   mongodb://user:auth_key@10.10.3.30:27017,
-#   ##   mongodb://10.10.3.33:18832,
-#   ##
-#   ## If connecting to a cluster, users must include the "?connect=direct" in
-#   ## the URL to ensure that the connection goes directly to the specified node
-#   ## and not have all connections passed to the master node.
-#   servers = ["mongodb://127.0.0.1:27017/?connect=direct"]
-#
-#   ## When true, collect cluster status.
-#   ## Note that the query that counts jumbo chunks triggers a COLLSCAN, which
-#   ## may have an impact on performance.
-#   # gather_cluster_status = true
-#
-#   ## When true, collect per database stats
-#   # gather_perdb_stats = false
-#
-#   ## When true, collect per collection stats
-#   # gather_col_stats = false
-#
-#   ## When true, collect usage statistics for each collection
-#   ## (insert, update, queries, remove, getmore, commands etc...).
-#   # gather_top_stat = false
-#
-#   ## List of db where collections stats are collected
-#   ## If empty, all db are concerned
-#   # col_stats_dbs = ["local"]
-#
-#   ## Optional TLS Config
-#   # tls_ca = "/etc/telegraf/ca.pem"
-#   # tls_cert = "/etc/telegraf/cert.pem"
-#   # tls_key = "/etc/telegraf/key.pem"
-#   ## Use TLS but skip chain & host verification
-#   # insecure_skip_verify = false
-#
-#   ## Specifies plugin behavior regarding disconnected servers
-#   ## Available choices :
-#   ##   - error: telegraf will return an error on startup if one the servers is unreachable
-#   ##   - skip: telegraf will skip unreachable servers on both startup and gather
-#   # disconnected_servers_behavior = "error"
-
-
 # # Read metrics and status information about processes managed by Monit
 # [[inputs.monit]]
 #   ## Monit HTTPD address
@@ -9141,6 +9095,52 @@
 #     # unique_timestamp = "auto"
 
 
+# # Read metrics from one or many MongoDB servers
+# [[inputs.mongodb]]
+#   ## An array of URLs of the form:
+#   ##   "mongodb://" [user ":" pass "@"] host [ ":" port]
+#   ## For example:
+#   ##   mongodb://user:auth_key@10.10.3.30:27017,
+#   ##   mongodb://10.10.3.33:18832,
+#   ##
+#   ## If connecting to a cluster, users must include the "?connect=direct" in
+#   ## the URL to ensure that the connection goes directly to the specified node
+#   ## and not have all connections passed to the master node.
+#   servers = ["mongodb://127.0.0.1:27017/?connect=direct"]
+#
+#   ## When true, collect cluster status.
+#   ## Note that the query that counts jumbo chunks triggers a COLLSCAN, which
+#   ## may have an impact on performance.
+#   # gather_cluster_status = true
+#
+#   ## When true, collect per database stats
+#   # gather_perdb_stats = false
+#
+#   ## When true, collect per collection stats
+#   # gather_col_stats = false
+#
+#   ## When true, collect usage statistics for each collection
+#   ## (insert, update, queries, remove, getmore, commands etc...).
+#   # gather_top_stat = false
+#
+#   ## List of db where collections stats are collected
+#   ## If empty, all db are concerned
+#   # col_stats_dbs = ["local"]
+#
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
+#   # insecure_skip_verify = false
+#
+#   ## Specifies plugin behavior regarding disconnected servers
+#   ## Available choices :
+#   ##   - error: telegraf will return an error on startup if one the servers is unreachable
+#   ##   - skip: telegraf will skip unreachable servers on both startup and gather
+#   # disconnected_servers_behavior = "error"
+
+
 # # Read metrics from MQTT topic(s)
 # [[inputs.mqtt_consumer]]
 #   ## Broker URLs for the MQTT server or cluster.  To connect to multiple
diff --git a/etc/telegraf_windows.conf b/etc/telegraf_windows.conf
index dddc981fd..c64ca5713 100644
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -5726,52 +5726,6 @@
 #     # close_connection_after_gather = false
 
 
-# # Read metrics from one or many MongoDB servers
-# [[inputs.mongodb]]
-#   ## An array of URLs of the form:
-#   ##   "mongodb://" [user ":" pass "@"] host [ ":" port]
-#   ## For example:
-#   ##   mongodb://user:auth_key@10.10.3.30:27017,
-#   ##   mongodb://10.10.3.33:18832,
-#   ##
-#   ## If connecting to a cluster, users must include the "?connect=direct" in
-#   ## the URL to ensure that the connection goes directly to the specified node
-#   ## and not have all connections passed to the master node.
-#   servers = ["mongodb://127.0.0.1:27017/?connect=direct"]
-#
-#   ## When true, collect cluster status.
-#   ## Note that the query that counts jumbo chunks triggers a COLLSCAN, which
-#   ## may have an impact on performance.
-#   # gather_cluster_status = true
-#
-#   ## When true, collect per database stats
-#   # gather_perdb_stats = false
-#
-#   ## When true, collect per collection stats
-#   # gather_col_stats = false
-#
-#   ## When true, collect usage statistics for each collection
-#   ## (insert, update, queries, remove, getmore, commands etc...).
-#   # gather_top_stat = false
-#
-#   ## List of db where collections stats are collected
-#   ## If empty, all db are concerned
-#   # col_stats_dbs = ["local"]
-#
-#   ## Optional TLS Config
-#   # tls_ca = "/etc/telegraf/ca.pem"
-#   # tls_cert = "/etc/telegraf/cert.pem"
-#   # tls_key = "/etc/telegraf/key.pem"
-#   ## Use TLS but skip chain & host verification
-#   # insecure_skip_verify = false
-#
-#   ## Specifies plugin behavior regarding disconnected servers
-#   ## Available choices :
-#   ##   - error: telegraf will return an error on startup if one the servers is unreachable
-#   ##   - skip: telegraf will skip unreachable servers on both startup and gather
-#   # disconnected_servers_behavior = "error"
-
-
 # # Read metrics and status information about processes managed by Monit
 # [[inputs.monit]]
 #   ## Monit HTTPD address
@@ -8984,6 +8938,52 @@
 #     # unique_timestamp = "auto"
 
 
+# # Read metrics from one or many MongoDB servers
+# [[inputs.mongodb]]
+#   ## An array of URLs of the form:
+#   ##   "mongodb://" [user ":" pass "@"] host [ ":" port]
+#   ## For example:
+#   ##   mongodb://user:auth_key@10.10.3.30:27017,
+#   ##   mongodb://10.10.3.33:18832,
+#   ##
+#   ## If connecting to a cluster, users must include the "?connect=direct" in
+#   ## the URL to ensure that the connection goes directly to the specified node
+#   ## and not have all connections passed to the master node.
+#   servers = ["mongodb://127.0.0.1:27017/?connect=direct"]
+#
+#   ## When true, collect cluster status.
+#   ## Note that the query that counts jumbo chunks triggers a COLLSCAN, which
+#   ## may have an impact on performance.
+#   # gather_cluster_status = true
+#
+#   ## When true, collect per database stats
+#   # gather_perdb_stats = false
+#
+#   ## When true, collect per collection stats
+#   # gather_col_stats = false
+#
+#   ## When true, collect usage statistics for each collection
+#   ## (insert, update, queries, remove, getmore, commands etc...).
+#   # gather_top_stat = false
+#
+#   ## List of db where collections stats are collected
+#   ## If empty, all db are concerned
+#   # col_stats_dbs = ["local"]
+#
+#   ## Optional TLS Config
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## Use TLS but skip chain & host verification
+#   # insecure_skip_verify = false
+#
+#   ## Specifies plugin behavior regarding disconnected servers
+#   ## Available choices :
+#   ##   - error: telegraf will return an error on startup if one the servers is unreachable
+#   ##   - skip: telegraf will skip unreachable servers on both startup and gather
+#   # disconnected_servers_behavior = "error"
+
+
 # # Read metrics from MQTT topic(s)
 # [[inputs.mqtt_consumer]]
 #   ## Broker URLs for the MQTT server or cluster.  To connect to multiple