X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.conf.pod;h=7579664ba1b146112722d6023dc074c35e8f2236;hb=2f2744072ab144b8130b2296327fc3382e5f7f80;hp=acdfa927ee61e126d938217fffab383947467334;hpb=171a92c968cb41c314736b0d26f5a6ba2ae59666;p=collectd.git

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index acdfa927..7579664b 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -735,22 +735,6 @@ runtime statistics module of CouchDB
     </URL>
   </Plugin>
 
-Another CouchDB example:
-The following example will collect the status values from each database:
-
-  <URL "http://localhost:5984/_all_dbs">
-    Instance "dbs"
-    <Key "*/doc_count">
-      Type "gauge"
-    </Key>
-    <Key "*/doc_del_count">
-      Type "counter"
-    </Key>
-    <Key "*/disk_size">
-      Type "bytes"
-    </Key>
-  </URL>
-
 In the B<Plugin> block, there may be one or more B<URL> blocks, each defining
 a URL to be fetched via HTTP (using libcurl) and one or more B<Key> blocks.
 The B<Key> string argument must be in a path format, which is used to collect a
@@ -4146,7 +4130,7 @@ because all values were added to the internal cache at roughly the same time.
 
 =head2 Plugin C<sensors>
 
-The C<sensors plugin> uses B<lm_sensors> to retrieve sensor-values. This means
+The I<Sensors plugin> uses B<lm_sensors> to retrieve sensor-values. This means
 that all the needed modules have to be loaded and lm_sensors has to be
 configured (most likely by editing F</etc/sensors.conf>. Read
 L<sensors.conf(5)> for details.
@@ -4181,6 +4165,39 @@ Since the configuration of the C<snmp plugin> is a little more complicated than
 other plugins, its documentation has been moved to an own manpage,
 L<collectd-snmp(5)>. Please see there for details.
 
+=head2 Plugin C<swap>
+
+The I<Swap plugin> collects information about used and available swap space. On
+Solaris, it is possible to collect information on physical swap devices and the
+view of the virtual memory subsystem on the matter. On I<Solaris>, the
+following options are available:
+
+=over 4
+
+=item B<ReportPhysical> B<combined>|B<separate>|B<false>
+
+Configures how to report physical swap devices. If B<combined> is used (the
+default), the summary over all swap devices is reported only, i.e. the globally
+used and available space over all devices. If B<separate> is configured, the
+used and available space of each device will be reported separately. B<false>
+deactivates collection of physical swap information (only valid if collection
+via L<kstat(3KSTAT)> is available).
+
+This option is only available if the I<Swap plugin> can use the L<swapctl(2)>
+mechanism under I<Solaris>.
+
+=item B<ReportVirtual> B<false>|B<true>
+
+Configures whether or not to report the view of the virtual memory subsystem on
+swap space. This information is used under Solaris if L<swapctl(2)> is not
+available and was the default behavior under I<Solaris> in I<collectdE<nbsp>4>.
+
+This option is only available if the I<Swap plugin> can use L<swapctl(2)> and
+L<kstat(3KSTAT)> to collect swap statistics under I<Solaris>. It defaults to
+B<false>.
+
+=back
+
 =head2 Plugin C<syslog>
 
 =over 4