Merge pull request #2831 from elieyal/patch-3

[collectd.git] / src / collectd.conf.pod

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 34a3ed7..ccc6949 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -5438,6 +5438,12 @@ behavior is to let the kernel choose the appropriate interface. Be warned
 that the manual selection of an interface for unicast traffic is only
 necessary in rare cases.
 
+=item B<BindAddress> I<IP Address>
+
+Set the outgoing IP address for IP packets. This option can be used instead of
+the I<Interface> option to explicitly define the IP address which will be used
+to send Packets to the remote server. 
+
 =item B<ResolveInterval> I<Seconds>
 
 Sets the interval at which to re-resolve the DNS for the I<Host>. This is
@@ -7285,7 +7291,6 @@ The I<Redis plugin> connects to one or more Redis servers, gathers
 information about each server's state and executes user-defined queries.
 For each server there is a I<Node> block which configures the connection
 parameters and set of user-defined queries for this node.
-Server state is requested by sending I<INFO> query.
 
   <Plugin redis>
     <Node "example">
@@ -7293,6 +7298,7 @@ Server state is requested by sending I<INFO> query.
         Port "6379"
         Timeout 2000
         ReportCommandStats false
+        ReportCpuUsage true
         <Query "LLEN myqueue">
           #Database 0
           Type "queue_length"
@@ -7339,9 +7345,14 @@ Defaults to 2000 (2 seconds).
 =item B<ReportCommandStats> B<false>|B<true>
 
 Enables or disables reporting of statistics based on the command type, including
-rate of command calls and average CPU time consumed.
+rate of command calls and average CPU time consumed by command processing.
 Defaults to B<false>.
 
+=item B<ReportCpuUsage> B<true>|B<false>
+
+Enables or disables reporting of CPU consumption statistics.
+Defaults to B<true>.
+
 =item B<Query> I<Querystring>
 
 The B<Query> block identifies a query to execute against the redis server.