Merge branch 'master' into feat_mcelog_notification_bugfixes

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index fb161af..3983364 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -532,7 +532,6 @@
 #  <EAL>
 #    Coremask "0x1"
 #    MemoryChannels "4"
-#    ProcessType "secondary"
 #    FilePrefix "rte"
 #  </EAL>
 #  <Event "link_status">
@@ -554,7 +553,6 @@
 #  <EAL>
 #    Coremask "0x2"
 #    MemoryChannels "4"
-#    ProcessType "secondary"
 #    FilePrefix "rte"
 #  </EAL>
 #  SharedMemObj "dpdk_collectd_stats_0"
@@ -721,8 +719,11 @@
 #</Plugin>
 
 #<Plugin mcelog>
-#      McelogClientSocket "/var/run/mcelog-client"
-#      McelogLogfile "/var/log/mcelog"
+#  <Memory>
+#    McelogClientSocket "/var/run/mcelog-client"
+#    PersistentNotification false
+#  </Memory>
+#  McelogLogfile "/var/log/mcelog"
 #</Plugin>
 
 #<Plugin md>