Addapt conf files

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 63db8b1a302bcd9ee2bf8a46a25ee5fd444d93d7..9b4ad80b6620a5348d58b3f28d1147715f6680e4 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -1668,32 +1668,29 @@
 #   so by using <Instance "myinstance">
 #   <Instance>
 #      CollectBackend true
-#      CollectBan false           # Varnish 3 and above
+#      CollectBan false
 #      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           # Varnish 2 & 4 only
+#      CollectSMA false
 #      CollectSMS false
-#      CollectSM false            # Varnish 2 only
 #      CollectStruct false
 #      CollectTotals false
-#      CollectUptime false        # Varnish 3 and above
+#      CollectUptime false
 #      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
-#      CollectMSE false           # Varnish-Plus 4 only
+#      CollectLock false
+#      CollectMempool false
+#      CollectManagement false
+#      CollectSMF false
+#      CollectVBE false
+#      CollectMSE false           # Varnish-Plus only
 #   </Instance>
 #</Plugin>
 

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index cda1002c5de721ebde9d3ed6ada459ae1c255e0a..9dba70905663283527e47811a951daab3be8f581 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -9227,7 +9227,6 @@ Synopsis:
      CollectBan         false
      CollectCache       true
      CollectConnections true
-     CollectDirectorDNS false
      CollectESI         false
      CollectFetch       false
      CollectHCB         false
@@ -9237,7 +9236,6 @@ Synopsis:
      CollectSHM         true
      CollectSMA         false
      CollectSMS         false
-     CollectSM          false
      CollectStruct      false
      CollectTotals      false
      CollectUptime      false
@@ -9281,11 +9279,6 @@ 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.