Merge branch 'collectd-5.4'

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 2454045..95734c2 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -627,6 +627,7 @@
 #      <Data "data_name">
 #              RegisterBase 1234
 #              RegisterType float
+#              ModbusRegisterType holding
 #              Type gauge
 #              Instance "..."
 #      </Data>
@@ -734,7 +735,7 @@
 #              Interface "eth0"
 #              ResolveInterval 14400
 @LOAD_PLUGIN_NETWORK@  </Server>
-#      TimeToLive "128"
+#      TimeToLive 128
 #
 #      # server setup:
 #      Listen "ff18::efc0:4a42" "25826"
@@ -1324,13 +1325,17 @@
 #              Host "localhost"
 #              Port 5555
 #              Protocol UDP
+#              Batch false
+#              BatchMaxSize 8192
 #              StoreRates true
 #              AlwaysAppendDS false
 #              TTLFactor 2.0
+#              Notifications true
+#              CheckThresholds false
 #              EventServicePrefix ""
 #      </Node>
 #      Tag "foobar"
-#       Attribute "foo" "bar"
+#      Attribute "foo" "bar"
 #</Plugin>
 
 #<Plugin write_tsdb>