Revert "Addapt conf files"

This reverts commit 93a7c423a267198725a2f515e0d9b154b71b825f.

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index b3401561b11c830c9e79f1d90b6bb7d4b822aace..e335f9c6cd254ace9e7b1ffc90656e0e0542cb92 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -1808,29 +1808,32 @@
 #   so by using <Instance "myinstance">
 #   <Instance>
 #      CollectBackend true
-#      CollectBan false
+#      CollectBan false           # Varnish 3 and above
 #      CollectCache true
 #      CollectConnections true
+#      CollectDirectorDNS false   # Varnish 3 only
 #      CollectESI false
 #      CollectFetch false
 #      CollectHCB false
 #      CollectObjects false
+#      CollectPurge false         # Varnish 2 only
 #      CollectSession false
 #      CollectSHM true
-#      CollectSMA false
+#      CollectSMA false           # Varnish 2 & 4 only
 #      CollectSMS false
+#      CollectSM false            # Varnish 2 only
 #      CollectStruct false
 #      CollectTotals false
-#      CollectUptime false
+#      CollectUptime false        # Varnish 3 and above
 #      CollectVCL false
 #      CollectVSM false           # Varnish 4 only
 #      CollectWorkers false
-#      CollectLock false
-#      CollectMempool false
-#      CollectManagement false
-#      CollectSMF false
-#      CollectVBE false
-#      CollectMSE false           # Varnish-Plus only
+#      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
+#      CollectMSE false           # Varnish-Plus 4 only
 #   </Instance>
 #</Plugin>
 

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 7eade44c00fe5feb660a2618857e52b9835df7b5..d61f14db8248a182309bb25ff0858e5ed689101f 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -9812,6 +9812,7 @@ Synopsis:
      CollectBan         false
      CollectCache       true
      CollectConnections true
+     CollectDirectorDNS false
      CollectESI         false
      CollectFetch       false
      CollectHCB         false
@@ -9821,6 +9822,7 @@ Synopsis:
      CollectSHM         true
      CollectSMA         false
      CollectSMS         false
+     CollectSM          false
      CollectStruct      false
      CollectTotals      false
      CollectUptime      false
@@ -9864,6 +9866,11 @@ Cache hits and misses. True by default.
 
 Number of client connections received, accepted and dropped. True by default.
 
+=item B<CollectDirectorDNS> B<true>|B<false>
+
+DNS director lookup cache statistics. Only available with Varnish 3.x. False by
+default.
+
 =item B<CollectESI> B<true>|B<false>
 
 Edge Side Includes (ESI) parse statistics. False by default.