Merge branch 'collectd-4.6' into collectd-4.7

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 92df4a7..382d6d3 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -69,6 +69,7 @@ FQDNLookup   true
 #@BUILD_PLUGIN_ENTROPY_TRUE@LoadPlugin entropy
 #@BUILD_PLUGIN_EXEC_TRUE@LoadPlugin exec
 #@BUILD_PLUGIN_FILECOUNT_TRUE@LoadPlugin filecount
+#@BUILD_PLUGIN_FSCACHE_TRUE@LoadPlugin fscache
 #@BUILD_PLUGIN_GMOND_TRUE@LoadPlugin gmond
 #@BUILD_PLUGIN_HDDTEMP_TRUE@LoadPlugin hddtemp
 @BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_PLUGIN_INTERFACE_TRUE@LoadPlugin interface
@@ -80,6 +81,7 @@ FQDNLookup   true
 #@BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt
 @BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load
 #@BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon
+#@BUILD_PLUGIN_MEMCACHEC_TRUE@LoadPlugin memcachec
 #@BUILD_PLUGIN_MEMCACHED_TRUE@LoadPlugin memcached
 @BUILD_PLUGIN_MEMORY_TRUE@@BUILD_PLUGIN_MEMORY_TRUE@LoadPlugin memory
 #@BUILD_PLUGIN_MULTIMETER_TRUE@LoadPlugin multimeter
@@ -107,10 +109,12 @@ FQDNLookup   true
 #@BUILD_PLUGIN_SERIAL_TRUE@LoadPlugin serial
 #@BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp
 #@BUILD_PLUGIN_SWAP_TRUE@LoadPlugin swap
+#@BUILD_PLUGIN_TABLE_TRUE@LoadPlugin table
 #@BUILD_PLUGIN_TAIL_TRUE@LoadPlugin tail
 #@BUILD_PLUGIN_TAPE_TRUE@LoadPlugin tape
 #@BUILD_PLUGIN_TCPCONNS_TRUE@LoadPlugin tcpconns
 #@BUILD_PLUGIN_TEAMSPEAK2_TRUE@LoadPlugin teamspeak2
+#@BUILD_PLUGIN_TED_TRUE@LoadPlugin ted
 #@BUILD_PLUGIN_THERMAL_TRUE@LoadPlugin thermal
 #@BUILD_PLUGIN_UNIXSOCK_TRUE@LoadPlugin unixsock
 #@BUILD_PLUGIN_UPTIME_TRUE@LoadPlugin uptime
@@ -277,6 +281,15 @@ FQDNLookup   true
 #      IgnoreSelected false
 #</Plugin>
 
+#<Plugin ipmi>
+#      Sensor "some_sensor"
+#      Sensor "another_one"
+#      IgnoreSelected false
+#      NotifySensorAdd false
+#      NotifySensorRemove true
+#      NotifySensorNotPresent false
+#</Plugin>
+
 #<Plugin iptables>
 #      Chain table chain
 #</Plugin>
@@ -313,6 +326,19 @@ FQDNLookup   true
 #      Port "411"
 #</Plugin>
 
+#<Plugin memcachec>
+#      <Page "plugin_instance">
+#              Server "localhost"
+#              Key "page_key"
+#              <Match>
+#                      Regex "(\\d+) bytes sent"
+#                      DSType CounterAdd
+#                      Type "ipt_octets"
+#                      Instance "type_instance"
+#              </Match>
+#      </Page>
+#</Plugin>
+
 #<Plugin memcached>
 #      Host "127.0.0.1"
 #      Port "11211"
@@ -558,6 +584,25 @@ FQDNLookup   true
 #   </Host>
 #</Plugin>
 
+#<Plugin "table">
+#      <Table "/proc/slabinfo">
+#              Instance "slabinfo"
+#              Separator " "
+#              <Result>
+#                      Type gauge
+#                      InstancePrefix "active_objs"
+#                      InstancesFrom 0
+#                      ValuesFrom 1
+#              </Result>
+#              <Result>
+#                      Type gauge
+#                      InstancePrefix "objperslab"
+#                      InstancesFrom 0
+#                      ValuesFrom 4
+#              </Result>
+#      </Table>
+#</Plugin>
+
 #<Plugin "tail">
 #  <File "/var/log/exim4/mainlog">
 #    Instance "exim"
@@ -588,6 +633,11 @@ FQDNLookup   true
 #      Server "8767"
 #</Plugin>
 
+#<Plugin ted>
+#      Device "/dev/ttyUSB0"
+#      Retries 0
+#</Plugin>
+
 #<Plugin thermal>
 #      ForceUseProcfs false
 #      Device "THRM"