X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=04d45ebf9f05389c4de2152ed3552c91aa9984e2;hb=7180965057b548db6fa4a939f7479b3a34ec7485;hp=e78f9dce3e00aab7408654416ca47b1e25c90e53;hpb=beb06e98c5aea9272c5972eee372b42c6abdd2b0;p=collectd.git

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index e78f9dce..04d45ebf 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -57,6 +57,7 @@ FQDNLookup   true
 #@BUILD_PLUGIN_BATTERY_TRUE@LoadPlugin battery
 #@BUILD_PLUGIN_BIND_TRUE@LoadPlugin bind
 #@BUILD_PLUGIN_CONNTRACK_TRUE@LoadPlugin conntrack
+#@BUILD_PLUGIN_CONTEXTSWITCH_TRUE@LoadPlugin contextswitch
 @BUILD_PLUGIN_CPU_TRUE@@BUILD_PLUGIN_CPU_TRUE@LoadPlugin cpu
 #@BUILD_PLUGIN_CPUFREQ_TRUE@LoadPlugin cpufreq
 @LOAD_PLUGIN_CSV@LoadPlugin csv
@@ -68,6 +69,7 @@ FQDNLookup   true
 #@BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns
 #@BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email
 #@BUILD_PLUGIN_ENTROPY_TRUE@LoadPlugin entropy
+#@BUILD_PLUGIN_ERLANG_TRUE@LoadPlugin erlang
 #@BUILD_PLUGIN_EXEC_TRUE@LoadPlugin exec
 #@BUILD_PLUGIN_FILECOUNT_TRUE@LoadPlugin filecount
 #@BUILD_PLUGIN_FSCACHE_TRUE@LoadPlugin fscache
@@ -175,7 +177,26 @@ FQDNLookup   true
 #  </View>
 #</Plugin>
 
-#<Plugin couchdb>
+#<Plugin csv>
+#	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/csv"
+#	StoreRates false
+#</Plugin>
+
+#<Plugin curl>
+#  <Page "stock_quotes">
+#    URL "http://finance.google.com/finance?q=NYSE%3AAMD"
+#    User "foo"
+#    Password "bar"
+#    <Match>
+#      Regex "<span +class=\"pr\"[^>]*> *([0-9]*\\.[0-9]+) *</span>"
+#      DSType "GaugeAverage"
+#      Type "stock_value"
+#      Instance "AMD"
+#    </Match>
+#  </Page>
+#</Plugin>
+
+#<Plugin curl_json>
 ## See: http://wiki.apache.org/couchdb/Runtime_Statistics
 #  <URL "http://localhost:5984/_stats">
 #    Instance "httpd"
@@ -206,25 +227,6 @@ FQDNLookup   true
 #  </URL>
 #</Plugin>
 
-#<Plugin csv>
-#	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/csv"
-#	StoreRates false
-#</Plugin>
-
-#<Plugin curl>
-#  <Page "stock_quotes">
-#    URL "http://finance.google.com/finance?q=NYSE%3AAMD"
-#    User "foo"
-#    Password "bar"
-#    <Match>
-#      Regex "<span +class=\"pr\"[^>]*> *([0-9]*\\.[0-9]+) *</span>"
-#      DSType "GaugeAverage"
-#      Type "stock_value"
-#      Instance "AMD"
-#    </Match>
-#  </Page>
-#</Plugin>
-
 #<Plugin dbi>
 #	<Query "num_of_customers">
 #		Statement "SELECT 'customers' AS c_key, COUNT(*) AS c_value FROM customers_tbl"
@@ -263,6 +265,7 @@ FQDNLookup   true
 #<Plugin dns>
 #	Interface "eth0"
 #	IgnoreSource "192.168.0.1"
+#	SelectNumericQueryTypes true
 #</Plugin>
 
 #<Plugin email>
@@ -272,6 +275,13 @@ FQDNLookup   true
 #	MaxConns 5
 #</Plugin>
 
+#<Plugin erlang>
+#	BindTo "local.host.name"
+#	BindPort "12345"
+#	Cookie "secret"
+#	NodeName "collectd@local.host.name"
+#</Plugin>
+
 #<Plugin exec>
 #	Exec "user:group" "/path/to/exec"
 #	NotificationExec "user:group" "/path/to/exec"
@@ -313,12 +323,6 @@ FQDNLookup   true
 #  TranslateDevicename false
 #</Plugin>
 
-#<Plugin http>
-#	URL "http://example.com/collectd-import"
-#	User "www-user"
-#	Password "secret"
-#</Plugin>
-
 #<Plugin interface>
 #	Interface "eth0"
 #	IgnoreSelected false