Merge remote-tracking branch 'github/pr/1707'

[collectd.git] / src / collectd.conf.in

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 460e93c..7b685aa 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -495,6 +495,7 @@
 #              </Result>
 #      </Query>
 #      <Database "customers_db">
+#              #Plugin "mycompany"
 #              Driver "mysql"
 #              DriverOption "host" "localhost"
 #              DriverOption "username" "collectd"
@@ -1045,6 +1046,7 @@
 #    </Result>
 #  </Query>
 #  <Database "product_information">
+#    #Plugin "warehouse"
 #    ConnectID "db01"
 #    Username "oracle"
 #    Password "secret"
@@ -1131,6 +1133,7 @@
 #              StoreRates true
 #      </Writer>
 #      <Database foo>
+#              #Plugin "kingdom"
 #              Host "hostname"
 #              Port "5432"
 #              User "username"
@@ -1538,7 +1541,7 @@
 #      CollectPurge false         # Varnish 2 only
 #      CollectSession false
 #      CollectSHM true
-#      CollectSMA false           # Varnish 2 only
+#      CollectSMA false           # Varnish 2 & 4 only
 #      CollectSMS false
 #      CollectSM false            # Varnish 2 only
 #      CollectStruct false
@@ -1547,6 +1550,11 @@
 #      CollectVCL false
 #      CollectVSM false           # Varnish 4 only
 #      CollectWorkers false
+#      CollectLock false          # Varnish 4 only
+#      CollectMempool false       # Varnish 4 only
+#      CollectManagement false    # Varnish 4 only
+#      CollectSMF false           # Varnish 4 only
+#      CollectVBE false           # Varnish 4 only
 #   </Instance>
 #</Plugin>