fixed rebase conflicts

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 8c1b10d..62b2456 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -142,6 +142,7 @@
 #@BUILD_PLUGIN_LVM_TRUE@LoadPlugin lvm
 #@BUILD_PLUGIN_MADWIFI_TRUE@LoadPlugin madwifi
 #@BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon
+#@BUILD_PLUGIN_MCELOG_TRUE@LoadPlugin mcelog
 #@BUILD_PLUGIN_MD_TRUE@LoadPlugin md
 #@BUILD_PLUGIN_MEMCACHEC_TRUE@LoadPlugin memcachec
 #@BUILD_PLUGIN_MEMCACHED_TRUE@LoadPlugin memcached
@@ -690,6 +691,11 @@
 #      Port "411"
 #</Plugin>
 
+#<Plugin mcelog>
+#      McelogClientSocket "/var/run/mcelog-client"
+#      McelogLogfile "/var/log/mcelog"
+#</Plugin>
+
 #<Plugin md>
 #      Device "/dev/md0"
 #      IgnoreSelected false