X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=e78f9dce3e00aab7408654416ca47b1e25c90e53;hb=be99a844a40d7037a910d37a894988b807631a6e;hp=2b495fa936e1f2602b13620614b771f4dfab3a55;hpb=6ea00a8e17fccbac0cc5dee711ee2e4cb73bdaaa;p=collectd.git

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 2b495fa9..e78f9dce 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -57,11 +57,11 @@ FQDNLookup   true
 #@BUILD_PLUGIN_BATTERY_TRUE@LoadPlugin battery
 #@BUILD_PLUGIN_BIND_TRUE@LoadPlugin bind
 #@BUILD_PLUGIN_CONNTRACK_TRUE@LoadPlugin conntrack
-#@BUILD_PLUGIN_COUCHDB_TRUE@LoadPlugin couchdb
 @BUILD_PLUGIN_CPU_TRUE@@BUILD_PLUGIN_CPU_TRUE@LoadPlugin cpu
 #@BUILD_PLUGIN_CPUFREQ_TRUE@LoadPlugin cpufreq
 @LOAD_PLUGIN_CSV@LoadPlugin csv
 #@BUILD_PLUGIN_CURL_TRUE@LoadPlugin curl
+#@BUILD_PLUGIN_CURL_JSON_TRUE@LoadPlugin curl_json
 #@BUILD_PLUGIN_DBI_TRUE@LoadPlugin dbi
 #@BUILD_PLUGIN_DF_TRUE@LoadPlugin df
 #@BUILD_PLUGIN_DISK_TRUE@LoadPlugin disk
@@ -126,7 +126,9 @@ FQDNLookup   true
 #@BUILD_PLUGIN_VMEM_TRUE@LoadPlugin vmem
 #@BUILD_PLUGIN_VSERVER_TRUE@LoadPlugin vserver
 #@BUILD_PLUGIN_WIRELESS_TRUE@LoadPlugin wireless
+#@BUILD_PLUGIN_WRITE_HTTP_TRUE@LoadPlugin write_http
 #@BUILD_PLUGIN_XMMS_TRUE@LoadPlugin xmms
+#@BUILD_PLUGIN_ZFS_ARC_TRUE@LoadPlugin zfs_arc
 
 ##############################################################################
 # Plugin configuration                                                       #
@@ -250,6 +252,7 @@ FQDNLookup   true
 #	MountPoint "/home"
 #	FSType "ext3"
 #	IgnoreSelected false
+#	ReportByDevice false
 #</Plugin>
 
 #<Plugin disk>
@@ -303,13 +306,19 @@ FQDNLookup   true
 #  Port "7634"
 #
 #  #----------------------------------------------------------------#
-#  # `TranslateDevicename' enabled backwards compatibility behavior #
+#  # `TranslateDevicename' enables backwards compatibility behavior #
 #  # and is enabled by default. Setting this option to `false' is   #
 #  # highly recommended.                                            #
 #  #----------------------------------------------------------------#
 #  TranslateDevicename false
 #</Plugin>
 
+#<Plugin http>
+#	URL "http://example.com/collectd-import"
+#	User "www-user"
+#	Password "secret"
+#</Plugin>
+
 #<Plugin interface>
 #	Interface "eth0"
 #	IgnoreSelected false
@@ -337,7 +346,7 @@ FQDNLookup   true
 
 #<Plugin "java">
 #	JVMArg "-verbose:jni"
-#	JVMArg "-Djava.class.path=/opt/collectd/lib/collectd/bindings/java"
+#	JVMArg "-Djava.class.path=@prefix@/share/collectd/java"
 #
 #	LoadPlugin "org.collectd.java.Foobar"
 #	<Plugin "org.collectd.java.Foobar">
@@ -688,7 +697,7 @@ FQDNLookup   true
 
 #<Plugin tokyotyrant>
 #	Host "localhost"
-#	Port 1978
+#	Port "1978"
 #</Plugin>
 
 #<Plugin unixsock>
@@ -705,6 +714,13 @@ FQDNLookup   true
 #	Verbose false
 #</Plugin>
 
+#<Plugin write_http>
+#	<URL "http://example.com/collectd-post">
+#		User "collectd"
+#		Password "weCh3ik0"
+#	</URL>
+#</Plugin>
+
 ##############################################################################
 # Filter configuration                                                       #
 #----------------------------------------------------------------------------#
@@ -728,6 +744,6 @@ FQDNLookup   true
 # configured at all: All values will be sent to all available write plugins. #
 #----------------------------------------------------------------------------#
 
-#<Chain "Main">
+#<Chain "PostCache">
 #  Target "write"
 #</Chain>