Merge branch 'sh/hddtemp'

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 0bd19abb02c66bc2db298536cdae5c179146e79f..e125bb63173ee7585e71902feee3dacfa79cc071 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -5,6 +5,7 @@
 #
 
 #Hostname    "localhost"
+FQDNLookup   true
 #BaseDir     "@prefix@/var/lib/@PACKAGE_NAME@"
 #PIDFile     "@prefix@/var/run/@PACKAGE_NAME@.pid"
 #PluginDir   "@prefix@/lib/@PACKAGE_NAME@"
@@ -30,15 +31,18 @@
 @BUILD_PLUGIN_IPTABLES_TRUE@LoadPlugin iptables
 @BUILD_PLUGIN_IPVS_TRUE@LoadPlugin ipvs
 @BUILD_PLUGIN_IRQ_TRUE@LoadPlugin irq
+@BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt
 @BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load
 @BUILD_PLUGIN_LOGFILE_TRUE@LoadPlugin logfile
 @BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon
+@BUILD_PLUGIN_MEMCACHED_TRUE@LoadPlugin memcached
 @BUILD_PLUGIN_MEMORY_TRUE@LoadPlugin memory
 @BUILD_PLUGIN_MULTIMETER_TRUE@LoadPlugin multimeter
 @BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql
 @BUILD_PLUGIN_NETLINK_TRUE@LoadPlugin netlink
 @BUILD_PLUGIN_NETWORK_TRUE@LoadPlugin network
 @BUILD_PLUGIN_NFS_TRUE@LoadPlugin nfs
+@BUILD_PLUGIN_NGINX_TRUE@LoadPlugin nginx
 @BUILD_PLUGIN_NTPD_TRUE@LoadPlugin ntpd
 @BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut
 @BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
@@ -51,9 +55,10 @@
 @BUILD_PLUGIN_SWAP_TRUE@LoadPlugin swap
 @BUILD_PLUGIN_SYSLOG_TRUE@LoadPlugin syslog
 @BUILD_PLUGIN_TAPE_TRUE@LoadPlugin tape
-@BUILD_PLUGIN_TCPCONNS_TRUE@Plugin tcpconns
+@BUILD_PLUGIN_TCPCONNS_TRUE@LoadPlugin tcpconns
 @BUILD_PLUGIN_UNIXSOCK_TRUE@LoadPlugin unixsock
 @BUILD_PLUGIN_USERS_TRUE@LoadPlugin users
+@BUILD_PLUGIN_UUID_TRUE@LoadPlugin uuid
 @BUILD_PLUGIN_VSERVER_TRUE@LoadPlugin vserver
 @BUILD_PLUGIN_WIRELESS_TRUE@LoadPlugin wireless
 @BUILD_PLUGIN_XMMS_TRUE@LoadPlugin xmms
@@ -72,6 +77,7 @@
 
 #<Plugin csv>
 #      DataDir "@prefix@/var/lib/@PACKAGE_NAME@/csv"
+#      StoreRates false
 #</Plugin>
 
 #<Plugin df>
@@ -96,12 +102,14 @@
 
 #<Plugin exec>
 #      Exec "user:group" "/path/to/exec"
+#      NotificationExec "/path/to/exec"
 #</Plugin>
 
-#<Plugin hddtemp>
+@BUILD_PLUGIN_HDDTEMP_TRUE@<Plugin hddtemp>
 #      Host "127.0.0.1"
-#      Port 7634
-#</Plugin>
+#      Port "7634"
+@BUILD_PLUGIN_HDDTEMP_TRUE@    TranslateDevicename false
+@BUILD_PLUGIN_HDDTEMP_TRUE@</Plugin>
 
 #<Plugin interface>
 #      Interface "eth0"
@@ -119,14 +127,30 @@
 #      IgnoreSelected true
 #</Plugin>
 
+#<Plugin libvirt>
+#      Connection "xen:///"
+#      RefreshInterval 60
+#      Domain "name"
+#      BlockDevice "name:device"
+#      InterfaceDevice "name:device"
+#      IgnoreSelected false
+#      HostnameFormat name
+#</Plugin>
+
 #<Plugin logfile>
 #      LogLevel info
 #      File STDOUT
+#      Timestamp true
 #</Plugin>
 
 #<Plugin mbmon>
 #      Host "127.0.0.1"
-#      Port 411
+#      Port "411"
+#</Plugin>
+
+#<Plugin memcached>
+#      Host "127.0.0.1"
+#      Port "11211"
 #</Plugin>
 
 #<Plugin mysql>
@@ -142,6 +166,7 @@
 #      QDisc "eth0" "pfifo_fast-1:0"
 #      Class "ppp0" "htb-1:10"
 #      Filter "ppp0" "u32-1:0"
+#      IgnoreSelected false
 #</Plugin>
 
 #<Plugin network>
@@ -154,9 +179,17 @@
 #      CacheFlush 1800
 #</Plugin>
 
+#<Plugin nginx>
+#      URL "http://localhost/status?auto"
+#      User "www-user"
+#      Password "secret"
+#      CACert "/etc/ssl/ca.crt"
+#</Plugin>
+
 #<Plugin ntpd>
 #      Host "localhost"
 #      Port 123
+#      ReverseLookups false
 #</Plugin>
 
 #<Plugin nut>
@@ -166,11 +199,13 @@
 #<Plugin perl>
 #      IncludeDir "/my/include/path"
 #      BaseName "Collectd::Plugin"
+#      EnableDebugger ""
 #      LoadPlugin foo
 #</Plugin>
 
 #<Plugin ping>
 #      Host "host.foo.bar"
+#      TTL 255
 #</Plugin>
 
 #<Plugin processes>
@@ -247,3 +282,8 @@
 #      SocketGroup "collectd"
 #      SocketPerms "0660"
 #</Plugin>
+
+#<Plugin uuid>
+#      UUIDFile "/etc/uuid"
+#</Plugin>
+