Merge branch 'collectd-5.7'

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 1cc86af..ed2d549 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -532,6 +532,7 @@
 #    ProcessType "secondary"
 #    FilePrefix "rte"
 #  </EAL>
+#  SharedMemObj "dpdk_collectd_stats_0"
 #  EnabledPortMask 0xffff
 #  PortName "interface1"
 #  PortName "interface2"
@@ -942,6 +943,9 @@
 
 #<Plugin nut>
 #      UPS "upsname@hostname:port"
+#      ForceSSL true
+#      VerifyPeer true
+#      CAPath "/path/to/folder"
 #</Plugin>
 
 #<Plugin olsrd>
@@ -1459,6 +1463,7 @@
 #      InterfaceFormat name
 #      PluginInstanceFormat name
 #      Instances 1
+#      ExtraStats "disk pcpu"
 #</Plugin>
 
 #<Plugin vmem>