Updated changelog.

[pkg-collectd.git] / debian / collectd.conf

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 6cf0cdd3cbdea2453ced788073be2a53ee734551..cc07bf62b81dbde5a34d24b7a8853665cf2b5485 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -33,6 +33,7 @@ LoadPlugin syslog
 LoadPlugin battery
 #LoadPlugin bind
 #LoadPlugin conntrack
+#LoadPlugin contextswitch
 LoadPlugin cpu
 #LoadPlugin cpufreq
 #LoadPlugin csv
@@ -80,6 +81,7 @@ LoadPlugin memory
 #LoadPlugin powerdns
 LoadPlugin processes
 #LoadPlugin protocols
+#LoadPlugin python
 LoadPlugin rrdtool
 #LoadPlugin sensors
 #LoadPlugin serial
@@ -164,6 +166,7 @@ LoadPlugin users
 #              VerifyPeer false
 #              VerifyHost false
 #              CACert "/etc/ssl/ca.crt"
+#              MeasureResponseTime false
 #              <Match>
 #                      Regex "<span +class=\"pr\"[^>]*> *([0-9]*\\.[0-9]+) *</span>"
 #                      DSType "GaugeAverage"
@@ -237,6 +240,8 @@ LoadPlugin users
 #      FSType "ext3"
 #      IgnoreSelected false
 #      ReportByDevice false
+#      ReportReserved false
+#      ReportInodes false
 #</Plugin>
 
 #<Plugin disk>
@@ -405,20 +410,28 @@ LoadPlugin users
 #</Plugin>
 
 #<Plugin network>
+#      # client setup:
 #      Server "ff18::efc0:4a42" "25826"
 #      <Server "239.192.74.66" "25826">
 #              SecurityLevel Encrypt
 #              Username "user"
 #              Password "secret"
 #      </Server>
+#      TimeToLive "128"
+#
+#      # server setup:
 #      Listen "ff18::efc0:4a42" "25826"
 #      <Listen "239.192.74.66" "25826">
 #              SecurityLevel Sign
 #              AuthFile "/etc/collectd/passwd"
 #      </Listen>
-#      TimeToLive "128"
-#      Forward false
 #      MaxPacketSize 1024
+#
+#      # proxy setup (client and server as above):
+#      Forward true
+#
+#      # statistics about the network plugin itself
+#      ReportStats false
 #</Plugin>
 
 #<Plugin nginx>
@@ -475,8 +488,8 @@ LoadPlugin users
 #      IncludeDir "/my/include/path"
 #      BaseName "Collectd::Plugin"
 #      EnableDebugger ""
-#      LoadPlugin "foo"
-#      LoadPlugin "bar"
+#      LoadPlugin Monitorus
+#      LoadPlugin OpenVZ
 #
 #      <Plugin foo>
 #              Foo "Bar"
@@ -490,6 +503,9 @@ LoadPlugin users
 #      Interval 1.0
 #      Timeout 0.9
 #      TTL 255
+#      SourceAddress "1.2.3.4"
+#      Device "eth0"
+#      MaxMissed -1
 #</Plugin>
 
 #<Plugin postgresql>
@@ -564,6 +580,17 @@ LoadPlugin users
 #      IgnoreSelected false
 #</Plugin>
 
+#<Plugin python>
+#      ModulePath "/path/to/your/python/modules"
+#      LogTraces true
+#      Interactive true
+#      Import "spam"
+#
+#      <Module spam>
+#              spam "wonderful" "lovely"
+#      </Module>
+#</Plugin>
+
 <Plugin rrdtool>
        DataDir "/var/lib/collectd/rrd"
 #      CacheTimeout 120