X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=5cf94ec4a71694b7c1ee78eefb9aa1ac4a707b9c;hb=77f4a7f72ac4db1a7cb6b4da612211f2fdd93bfb;hp=1204d847bad63660fda5495096575a94a766c0d4;hpb=78a1662567c2fce42a50cdce39f85217b9fbe0ea;p=collectd.git

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 1204d847..5cf94ec4 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -190,6 +190,7 @@ FQDNLookup   true
 #    URL "http://finance.google.com/finance?q=NYSE%3AAMD"
 #    User "foo"
 #    Password "bar"
+#    MeasureResponseTime false
 #    <Match>
 #      Regex "<span +class=\"pr\"[^>]*> *([0-9]*\\.[0-9]+) *</span>"
 #      DSType "GaugeAverage"
@@ -348,7 +349,7 @@ FQDNLookup   true
 
 #<Plugin "java">
 #	JVMArg "-verbose:jni"
-#	JVMArg "-Djava.class.path=@prefix@/share/collectd/java"
+#	JVMArg "-Djava.class.path=@prefix@/share/collectd/java/collectd-api.jar"
 #
 #	LoadPlugin "org.collectd.java.Foobar"
 #	<Plugin "org.collectd.java.Foobar">
@@ -479,11 +480,11 @@ FQDNLookup   true
 #</Plugin>
 
 @LOAD_PLUGIN_NETWORK@<Plugin network>
+#	TimeToLive "128"
 @LOAD_PLUGIN_NETWORK@	Server "ff18::efc0:4a42" "25826"
 @LOAD_PLUGIN_NETWORK@	Server "239.192.74.66" "25826"
 #	Listen "ff18::efc0:4a42" "25826"
 #	Listen "239.192.74.66" "25826"
-#	TimeToLive "128"
 #	Forward false
 #	CacheFlush 1800
 #	ReportStats false
@@ -561,9 +562,10 @@ FQDNLookup   true
 
 #<Plugin perl>
 #	IncludeDir "/my/include/path"
-#	BaseName "Collectd::Plugin"
+#	BaseName "Collectd::Plugins"
 #	EnableDebugger ""
-#	LoadPlugin foo
+#	LoadPlugin Monitorus
+#	LoadPlugin OpenVZ
 #
 #	<Plugin foo>
 #		Foo "Bar"
@@ -573,7 +575,12 @@ FQDNLookup   true
 
 #<Plugin ping>
 #	Host "host.foo.bar"
+#	Interval 1.0
+#	Timeout 0.9
 #	TTL 255
+#	SourceAddress "1.2.3.4"
+#	Device "eth0"
+#	MaxMissed -1
 #</Plugin>
 
 #<Plugin postgresql>
@@ -819,6 +826,7 @@ FQDNLookup   true
 
 # Load required matches:
 #@BUILD_PLUGIN_MATCH_EMPTY_COUNTER_TRUE@LoadPlugin match_empty_counter
+#@BUILD_PLUGIN_MATCH_HASHED_TRUE@LoadPlugin match_hashed
 #@BUILD_PLUGIN_MATCH_REGEX_TRUE@LoadPlugin match_regex
 #@BUILD_PLUGIN_MATCH_VALUE_TRUE@LoadPlugin match_value
 #@BUILD_PLUGIN_MATCH_TIMEDIFF_TRUE@LoadPlugin match_timediff
@@ -826,6 +834,7 @@ FQDNLookup   true
 # Load required targets:
 #@BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@LoadPlugin target_notification
 #@BUILD_PLUGIN_TARGET_REPLACE_TRUE@LoadPlugin target_replace
+#@BUILD_PLUGIN_TARGET_SCALE_TRUE@LoadPlugin target_scale
 #@BUILD_PLUGIN_TARGET_SET_TRUE@LoadPlugin target_set
 
 #----------------------------------------------------------------------------#