src/collectd.conf.in: Updated configuration directives + doc

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 8cb3fcebeb04bd681a8c05f99692ffbb4091d225..dff2e97039d9a3a3db53e27068ff9fb80ad5abad 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -844,83 +844,88 @@
 #</Plugin>
 
 #<Plugin varnish>
-#  Will monitor :
-#  - cache hits
-#  - cache misses
-#  - cache hits for pass
-#  MonitorCache yes
+#   This tag support an argument if you want to 
+#   monitor the local instance just use </Instance>
+#   If you prefer defining another instance you can do
+#   so by using <Instance "myinstance">
+#   <Instance>
+#      Will monitor :
+#        - cache hits
+#        - cache misses
+#        - cache hits for pass
+#      MonitorCache true
 #
-#  Will monitor :
-#  - client connections accepted
-#  - connection dropped
-#  - client requests received
-#  MonitorConnections yes
+#      Will monitor:
+#        - backend connection : success
+#        - backend connection : not attempted
+#        - backend connection : too many
+#        - backend connection : failures
+#        - backend connection : reuses
+#        - backend connection : was closed
+#        - backend connection : recycles
+#        - backend connection : unused
+#      MonitorBackend true
 #
-#  Will monitor:
-#  - Objects ESI parsed
-#  - ESI parse errors
-#  MonitorESI yes
+#      Will monitor :
+#        - client connections accepted
+#        - connection dropped
+#        - client requests received
+#      MonitorConnections true
 #
-#  Will monitor:
-#  - backend connection : success
-#  - backend connection : not attempted
-#  - backend connection : too many
-#  - backend connection : failures
-#  - backend connection : reuses
-#  - backend connection : was closed
-#  - backend connection : recycles
-#  - backend connection : unused
-#  MonitorBackend yes
+#      Will monitor:
+#        - SHM records
+#        - SHM writes
+#        - SHM flushes due to overflow
+#        - SHM MTX contention
+#        - SHM cycles through buffer
+#      MonitorSHM true
 #
-#  Will monitor:
-#  - fetch head
-#  - fetch with Length
-#  - fetch chunked
-#  - fetch EOF
-#  - fetch had bad headers
-#  - fetch wanted close
-#  - fetch pre HTTP/1.1 closed
-#  - fetch zero length
-#  - fetch failed
-#  MonitorFetch yes
+#      Will monitor:
+#        - Objects ESI parsed
+#        - ESI parse errors
+#      MonitorESI false
 #
-#  Will monitor:
-#  - HCB lookups without lock
-#  - HCB lookups with lock
-#  - HCB inserts
-#  MonitorHCB yes
+#      Will monitor:
+#        - fetch head
+#        - fetch with Length
+#        - fetch chunked
+#        - fetch EOF
+#        - fetch had bad headers
+#        - fetch wanted close
+#        - fetch pre HTTP/1.1 closed
+#        - fetch zero length
+#        - fetch failed
+#      MonitorFetch false
 #
-#  Will monitor:
-#  - SHM records
-#  - SHM writes
-#  - SHM flushes due to overflow
-#  - SHM MTX contention
-#  - SHM cycles through buffer
-#  MonitorSHM yes
+#      Will monitor:
+#       - HCB lookups without lock
+#       - HCB lookups with lock
+#       - HCB inserts
+#      MonitorHCB false
 #
-#  Will monitor:
-#  - SMA allocator requests
-#  - SMA outstanding allocations
-#  - SMA outstanding bytes
-#  - SMA bytes allocated
-#  - SMA bytes free
-#  MonitorSMA yes
+#      Will monitor:
+#        - SMA allocator requests
+#        - SMA outstanding allocations
+#        - SMA outstanding bytes
+#        - SMA bytes allocated
+#        - SMA bytes free
+#      MonitorSMA false
 #
-#  Will monitor:
-#  - SMS allocator requests
-#  - SMS outstanding allocations
-#  - SMS outstanding bytes
-#  - SMS bytes allocated
-#  - SMS bytes freed
-#  MonitorSMS yes
-#
-#  Will monitor:
-#  - allocator requests
-#  - outstanding allocations
-#  - bytes allocated
-#  - bytes free
-#  MonitorSM yes
+#      Will monitor:
+#        - SMS allocator requests
+#        - SMS outstanding allocations
+#        - SMS outstanding bytes
+#        - SMS bytes allocated
+#        - SMS bytes freed
+#      MonitorSMS false
 #
+#      Will monitor:
+#        - allocator requests
+#        - outstanding allocations
+#        - bytes allocated
+#        - bytes free
+#      MonitorSM false
+#   </Instance>
 #</Plugin>
 
 #<Plugin vmem>