Merge branch 'collectd-5.3' into collectd-5.4

[collectd.git] / src / collectd.conf.in

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 26be4d3..e483d44 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -182,7 +182,6 @@
 #@BUILD_PLUGIN_WRITE_MONGODB_TRUE@LoadPlugin write_mongodb
 #@BUILD_PLUGIN_WRITE_REDIS_TRUE@LoadPlugin write_redis
 #@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@LoadPlugin write_riemann
-#@BUILD_PLUGIN_WRITE_TSDB_TRUE@LoadPlugin write_tsdb
 #@BUILD_PLUGIN_XMMS_TRUE@LoadPlugin xmms
 #@BUILD_PLUGIN_ZFS_ARC_TRUE@LoadPlugin zfs_arc
 
@@ -652,7 +651,7 @@
 #              AuthFile "/etc/collectd/passwd"
 #              Interface "eth0"
 #      </Listen>
-#      MaxPacketSize 1024
+#      MaxPacketSize 1452
 #
 #      # proxy setup (client and server as above):
 #      Forward true
@@ -1188,14 +1187,6 @@
 #      Tag "foobar"
 #</Plugin>
 
-#<Plugin write_tsdb>
-#      <Node>
-#              Host "localhost"
-#              Port "4242"
-#              Prefix "sys"
-#      </Node>
-#</Plugin>
-
 ##############################################################################
 # Filter configuration                                                       #
 #----------------------------------------------------------------------------#