Merged commit 'collectd-4.10.1-1' into lenny-backports.

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

diff --git a/debian/collectd.conf b/debian/collectd.conf
index b5fc462a6ac48126122eb2b6e19cbda81851e0f0..a05694aaa0ce11ba5df14ed337327afb355d7958 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -40,7 +40,6 @@ LoadPlugin cpu
 #LoadPlugin cpufreq
 #LoadPlugin csv
 #LoadPlugin curl
-#LoadPlugin curl_json
 #LoadPlugin curl_xml
 #LoadPlugin dbi
 LoadPlugin df
@@ -51,7 +50,6 @@ LoadPlugin entropy
 #LoadPlugin exec
 #LoadPlugin filecount
 #LoadPlugin fscache
-#LoadPlugin gmond
 #LoadPlugin hddtemp
 LoadPlugin interface
 #LoadPlugin ipmi
@@ -63,7 +61,6 @@ LoadPlugin irq
 LoadPlugin load
 #LoadPlugin madwifi
 #LoadPlugin mbmon
-#LoadPlugin memcachec
 #LoadPlugin memcached
 LoadPlugin memory
 #LoadPlugin multimeter
@@ -86,7 +83,6 @@ LoadPlugin memory
 LoadPlugin processes
 #LoadPlugin protocols
 #LoadPlugin python
-#LoadPlugin rrdcached
 LoadPlugin rrdtool
 #LoadPlugin sensors
 #LoadPlugin serial
@@ -98,7 +94,6 @@ LoadPlugin swap
 #LoadPlugin teamspeak2
 #LoadPlugin ted
 #LoadPlugin thermal
-#LoadPlugin tokyotyrant
 #LoadPlugin unixsock
 #LoadPlugin uptime
 LoadPlugin users
@@ -182,37 +177,6 @@ LoadPlugin users
 #      </Page>
 #</Plugin>
 
-#<Plugin curl_json>
-## See: http://wiki.apache.org/couchdb/Runtime_Statistics
-#  <URL "http://localhost:5984/_stats">
-#    Instance "httpd"
-#    <Key "httpd/requests/count">
-#      Type "http_requests"
-#    </Key>
-#
-#    <Key "httpd_request_methods/*/count">
-#      Type "http_request_methods"
-#    </Key>
-#
-#    <Key "httpd_status_codes/*/count">
-#      Type "http_response_codes"
-#    </Key>
-#  </URL>
-## Database status metrics:
-#  <URL "http://localhost:5984/_all_dbs">
-#    Instance "dbs"
-#    <Key "*/doc_count">
-#      Type "gauge"
-#    </Key>
-#    <Key "*/doc_del_count">
-#      Type "counter"
-#    </Key>
-#    <Key "*/disk_size">
-#      Type "bytes"
-#    </Key>
-#  </URL>
-#</Plugin>
-
 #<Plugin "curl_xml">
 #      <URL "http://localhost/stats.xml">
 #              Host "my_host"
@@ -305,22 +269,6 @@ LoadPlugin users
 #      </Directory>
 #</Plugin>
 
-#<Plugin gmond>
-#      MCReceiveFrom "239.2.11.71" "8649"
-#
-#      <Metric "swap_total">
-#              Type "swap"
-#              TypeInstance "total"
-#              DataSource "value"
-#      </Metric>
-#
-#      <Metric "swap_free">
-#              Type "swap"
-#              TypeInstance "free"
-#              DataSource "value"
-#      </Metric>
-#</Plugin>
-
 #<Plugin hddtemp>
 #      Host "127.0.0.1"
 #      Port 7634
@@ -389,20 +337,6 @@ LoadPlugin users
 #      Port 411
 #</Plugin>
 
-#<Plugin memcachec>
-#      <Page "plugin_instance">
-#              Server "localhost"
-#              Key "page_key"
-#              <Match>
-#                      Regex "(\\d+) bytes sent"
-#                      ExcludeRegex "<lines to be excluded>"
-#                      DSType CounterAdd
-#                      Type "ipt_octets"
-#                      Instance "type_instance"
-#              </Match>
-#      </Page>
-#</Plugin>
-
 #<Plugin memcached>
 #      Socket "/var/run/memcached.sock"
 # or:
@@ -639,13 +573,6 @@ LoadPlugin users
 #      </Module>
 #</Plugin>
 
-#<Plugin rrdcached>
-#      DaemonAddress "unix:/var/run/rrdcached.sock"
-#      DataDir "/var/lib/rrdcached/db/collectd"
-#      CreateFiles true
-#      CollectStatistics true
-#</Plugin>
-
 <Plugin rrdtool>
        DataDir "/var/lib/collectd/rrd"
 #      CacheTimeout 120
@@ -777,11 +704,6 @@ LoadPlugin users
 #      IgnoreSelected false
 #</Plugin>
 
-#<Plugin tokyotyrant>
-#      Host "localhost"
-#      Port "1978"
-#</Plugin>
-
 #<Plugin unixsock>
 #      SocketFile "/var/run/collectd-unixsock"
 #      SocketGroup "collectd"