src/collectd.conf.in: Fix some inconsistencies.

Mostly left-overs from renaming plugins. Thanks to Mirko Buffoni for
noticing :)

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index e78f9dce3e00aab7408654416ca47b1e25c90e53..8f28f8f3c3c02755f1322b4ccc4857009e24e428 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -175,7 +175,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 +225,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 +263,7 @@ FQDNLookup   true
 #<Plugin dns>
 #      Interface "eth0"
 #      IgnoreSource "192.168.0.1"
+#      SelectNumericQueryTypes true
 #</Plugin>
 
 #<Plugin email>
@@ -313,12 +314,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