Update conf files

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index c76e7a0bacdb40761c8821e687a7968684f1c743..de284387544edf221ee3074167a09cfcfe5061ce 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -1827,7 +1827,7 @@
 #      CollectPurge false         # Varnish 2 only
 #      CollectSession false
 #      CollectSHM true
-#      CollectSMA false           # Varnish 2 & 4 only
+#      CollectSMA false           # Varnish 2 & Varnish 4 and above
 #      CollectSMS false
 #      CollectSM false            # Varnish 2 only
 #      CollectStruct false
@@ -1836,12 +1836,12 @@
 #      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          # Varnish 4 and above
+#      CollectMempool false       # Varnish 4 and above
+#      CollectManagement false    # Varnish 4 and above
+#      CollectSMF false           # Varnish 4 and above
+#      CollectVBE false           # Varnish 4 and above
+#      CollectMSE false           # Varnish-Plus only
 #   </Instance>
 #</Plugin>
 

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 89df66c78d0b69420f22f94fdc85882beeb6ff72..87e90928b6532335c605847e4f3d5979d8e0a3f7 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -10005,7 +10005,8 @@ log messages which is flushed to disk when full. True by default.
 
 malloc or umem (umem_alloc(3MALLOC) based) storage statistics. The umem storage
 component is Solaris specific. Note: SMA, SMF and MSE share counters, enable
-only the one used by the Varnish instance. Only available with Varnish 2.x.
+only the one used by the Varnish instance. Available with Varnish 2.x,
+varnish 4.x and above (Not available in varnish 3.x).
 False by default.
 
 =item B<CollectSMS> B<true>|B<false>
@@ -10015,8 +10016,8 @@ component is used internally only. False by default.
 
 =item B<CollectSM> B<true>|B<false>
 
-file (memory mapped file) storage statistics. Only available with Varnish 2.x.,
-in varnish 4.x. use CollectSMF.
+file (memory mapped file) storage statistics. Only available with Varnish 2.x,
+in varnish 4.x and above use CollectSMF.
 False by default.
 
 =item B<CollectStruct> B<true>|B<false>
@@ -10049,31 +10050,31 @@ Collect statistics about worker threads. False by default.
 
 =item B<CollectVBE> B<true>|B<false>
 
-Backend counters. Only available with Varnish 4.x. False by default.
+Backend counters. Only available with Varnish 4.x and above. False by default.
 
 =item B<CollectSMF> B<true>|B<false>
 
-file (memory mapped file) storage statistics. Only available with Varnish 4.x.
+file (memory mapped file) storage statistics. Only available with Varnish 4.x and above.
 Note: SMA, SMF and MSE share counters, enable only the one used by the Varnish
 instance. Used to be called SM in Varnish 2.x. False by default.
 
 =item B<CollectManagement> B<true>|B<false>
 
-Management process counters. Only available with Varnish 4.x. False by default.
+Management process counters. Only available with Varnish 4.x and above. False by default.
 
 =item B<CollectLock> B<true>|B<false>
 
-Lock counters. Only available with Varnish 4.x. False by default.
+Lock counters. Only available with Varnish 4.x and above. False by default.
 
 =item B<CollectMempool> B<true>|B<false>
 
-Memory pool counters. Only available with Varnish 4.x. False by default.
+Memory pool counters. Only available with Varnish 4.x and above. False by default.
 
 =item B<CollectMSE> B<true>|B<false>
 
 Varnish Massive Storage Engine 2.0 (MSE2) is an improved storage backend for
 Varnish, replacing the traditional malloc and file storages. Only available
-with Varnish-Plus 4.x. Note: SMA, SMF and MSE share counters, enable only the
+with Varnish-Plus 4.x and above. Note: SMA, SMF and MSE share counters, enable only the
 one used by the Varnish instance. False by default.
 
 =back