X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=9b6f8bf54d82beae12ae577d8add2d824bf77d4b;hb=41c58bbf1dd3fd89d80cb72a07cf659b52fba993;hp=29035abf72d43b4bcf69dbff608f3346ef4059b3;hpb=13c401437fad4b777d06fba5b45652065e54aaf5;p=collectd.git

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 29035abf..9b6f8bf5 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -4,21 +4,15 @@
 # http://collectd.org/
 #
 
-# Select one of the following modes:
-@BUILD_WITH_RRDTOOL_TRUE@Mode Local
-#Mode Server
-@BUILD_WITH_RRDTOOL_FALSE@Mode Client
-#Mode Log
-
 # Set the IP-address(es) and UDP-port(s) to send packets to. `Listen' can be
 # used as a synonym for `Server' to make the config file more readable when in
 # server mode. The port option is optional.
 #Server ff18::efc0:4a42 25826
 #Server 239.192.74.66 25826
 
-#DataDir   /opt/collectd/var/lib/collectd
-#PIDFile   /opt/collectd/var/run/collectd.pid
-#PluginDir /opt/collectd/lib/collectd
+#BaseDir   "/opt/collectd/var/lib/collectd"
+#PIDFile   "/opt/collectd/var/run/collectd.pid"
+#PluginDir "/opt/collectd/lib/collectd"
 
 @BUILD_MODULE_APACHE_TRUE@LoadPlugin apache
 @BUILD_MODULE_APCUPS_TRUE@LoadPlugin apcups
@@ -26,17 +20,24 @@
 @BUILD_MODULE_BATTERY_TRUE@LoadPlugin battery
 @BUILD_MODULE_CPU_TRUE@LoadPlugin cpu
 @BUILD_MODULE_CPUFREQ_TRUE@LoadPlugin cpufreq
+@BUILD_MODULE_CSV_TRUE@LoadPlugin csv
 @BUILD_MODULE_DF_TRUE@LoadPlugin df
 @BUILD_MODULE_DISK_TRUE@LoadPlugin disk
+@BUILD_MODULE_DNS_TRUE@LoadPlugin dns
+@BUILD_MODULE_EMAIL_TRUE@LoadPlugin email
 @BUILD_MODULE_HDDTEMP_TRUE@LoadPlugin hddtemp
+@BUILD_MODULE_IRQ_TRUE@LoadPlugin irq
 @BUILD_MODULE_LOAD_TRUE@LoadPlugin load
+@BUILD_MODULE_MBMON_TRUE@LoadPlugin mbmon
 @BUILD_MODULE_MEMORY_TRUE@LoadPlugin memory
 @BUILD_MODULE_MULTIMETER_TRUE@LoadPlugin multimeter
 @BUILD_MODULE_MYSQL_TRUE@LoadPlugin mysql
+@BUILD_MODULE_NETWORK_TRUE@LoadPlugin network
 @BUILD_MODULE_NFS_TRUE@LoadPlugin nfs
 @BUILD_MODULE_NTPD_TRUE@LoadPlugin ntpd
 @BUILD_MODULE_PING_TRUE@LoadPlugin ping
 @BUILD_MODULE_PROCESSES_TRUE@LoadPlugin processes
+@BUILD_WITH_RRDTOOL_TRUE@LoadPlugin rrdtool
 @BUILD_MODULE_SENSORS_TRUE@LoadPlugin sensors
 @BUILD_MODULE_SERIAL_TRUE@LoadPlugin serial
 @BUILD_MODULE_SWAP_TRUE@LoadPlugin swap
@@ -47,43 +48,85 @@
 @BUILD_MODULE_WIRELESS_TRUE@LoadPlugin wireless
 
 #<Plugin apache>
-#	URL http://localhost/status?auto
-#	User www-user
-#	Password secret
-#	CACert /etc/ssl/ca.crt
+#	URL "http://localhost/status?auto"
+#	User "www-user"
+#	Password "secret"
+#	CACert "/etc/ssl/ca.crt"
 #</Plugin>
 
 #<Plugin apcups>
-#	Host localhost
-#	Port 3551
+#	Host "localhost"
+#	Port "3551"
+#</Plugin>
+
+#<Plugin dns>
+#	Interface "eth0"
+#	IgnoreSource "192.168.0.1"
 #</Plugin>
 
 #<Plugin hddtemp>
-#	Host 127.0.0.1
+#	Host "127.0.0.1"
 #	Port 7634
 #</Plugin>
 
+#<Plugin irq>
+#	Irq 7
+#	Irq 8
+#	Irq 9
+#	IgnoreSelected true
+#</Plugin>
+
+#<Plugin mbmon>
+#	Host "127.0.0.1"
+#	Port 411
+#</Plugin>
+
+#<Plugin network>
+#	Server "ff18::efc0:4a42" "25826"
+#	Server "239.192.74.66" "25826"
+#	Listen "ff18::efc0:4a42" "25826"
+#	Listen "239.192.74.66" "25826"
+#	TimeToLive "128"
+#</Plugin>
+
 #<Plugin ntpd>
-#	Host localhost
+#	Host "localhost"
 #	Port 123
 #</Plugin>
 
 #<Plugin mysql>
-#	Host database.serv.er
-#	User db_user
-#	Password secret
-#	Database db_name
+#	Host "database.serv.er"
+#	User "db_user"
+#	Password "secret"
+#	Database "db_name"
 #</Plugin>
 
 #<Plugin ping>
-#	Host host.foo.bar
+#	Host "host.foo.bar"
 #</Plugin>
 
 #<Plugin processes>
-#	Process name
+#	Process "name"
+#</Plugin>
+
+#<Plugin rrdtool>
+#	CacheTimeout 120
+#	CacheFlush   900
+#	DataDir      "/opt/collectd/var/lib/collectd"
+#</Plugin>
+
+## There are two different naming schemes for the sensors plugin, to preserver
+## backwards compatibility. The `extended naming' is prefered, but not the
+## default for this reason. See `collectd.conf(5)' for more information.
+#<Plugin sensors>
+#	Sensor "it8712-isa-0290/temperature-temp1"
+#	Sensor "it8712-isa-0290/fanspeed-fan3"
+#	Sensor "it8712-isa-0290/voltage-in8"
+#
+#	IgnoreSelected false
 #</Plugin>
 
 #<Plugin traffic>
-#	Interface eth0
+#	Interface "eth0"
 #	IgnoreSelected false
 #</Plugin>