From: Pavel Rochnyak <pavel2000@ngs.ru>
Date: Wed, 27 Jun 2018 05:16:49 +0000 (+0700)
Subject: Merge pull request #2831 from elieyal/patch-3
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=e3d3699f39ab5f228e1be4ad32fe01b3a307a8ed;hp=-c

Merge pull request #2831 from elieyal/patch-3

network plugin: Add BindAddress option
---

e3d3699f39ab5f228e1be4ad32fe01b3a307a8ed
diff --combined src/collectd.conf.pod
index 75b956fe,e2cd3a3e..ccc69491
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -5438,6 -5438,12 +5438,12 @@@ behavior is to let the kernel choose th
  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
@@@ -7281,26 -7287,26 +7287,26 @@@ Defaults to B<false>
  
  =head2 Plugin C<redis>
  
 -The I<Redis plugin> connects to one or more Redis servers and gathers
 -information about each server's state. For each server there is a I<Node> block
 -which configures the connection parameters for this node.
 +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.
  
    <Plugin redis>
      <Node "example">
          Host "localhost"
          Port "6379"
          Timeout 2000
 +        ReportCommandStats false
 +        ReportCpuUsage true
          <Query "LLEN myqueue">
            #Database 0
            Type "queue_length"
            Instance "myqueue"
 -        <Query>
 +        </Query>
      </Node>
    </Plugin>
  
 -The information shown in the synopsis above is the I<default configuration>
 -which is used by the plugin if no configuration is present.
 -
  =over 4
  
  =item B<Node> I<Nodename>
@@@ -7308,9 -7314,7 +7314,9 @@@
  The B<Node> block identifies a new Redis node, that is a new Redis instance
  running in an specified host and port. The name for node is a canonical
  identifier which is used as I<plugin instance>. It is limited to
 -64E<nbsp>characters in length.
 +128E<nbsp>characters in length.
 +
 +When no B<Node> is configured explicitly, plugin connects to "localhost:6379".
  
  =item B<Host> I<Hostname>
  
@@@ -7330,47 -7334,30 +7336,47 @@@ Use I<Password> to authenticate when co
  =item B<Timeout> I<Milliseconds>
  
  The B<Timeout> option set the socket timeout for node response. Since the Redis
 -read function is blocking, you should keep this value as low as possible. Keep
 -in mind that the sum of all B<Timeout> values for all B<Nodes> should be lower
 -than B<Interval> defined globally.
 +read function is blocking, you should keep this value as low as possible.
 +It is expected what B<Timeout> values should be lower than B<Interval> defined
 +globally.
  
 -=item B<Query> I<Querystring>
 +Defaults to 2000 (2 seconds).
  
 -The B<Query> block identifies a query to execute against the redis server.
 -There may be an arbitrary number of queries to execute.
 +=item B<ReportCommandStats> B<false>|B<true>
  
 -=item B<Database> I<Index>
 +Enables or disables reporting of statistics based on the command type, including
 +rate of command calls and average CPU time consumed by command processing.
 +Defaults to B<false>.
  
 -This index selects the Redis logical database to use for query. Defaults
 -to C<0>.
 +=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.
 +There may be an arbitrary number of queries to execute. Each query should
 +return single string or integer.
  
  =item B<Type> I<Collectd type>
  
 -Within a query definition, a valid collectd type to use as when submitting
 +Within a query definition, a valid I<collectd type> to use as when submitting
  the result of the query. When not supplied, will default to B<gauge>.
  
 +Currently only types with one datasource are supported.
 +See L<types.db(5)> for more details on types and their configuration.
 +
  =item B<Instance> I<Type instance>
  
  Within a query definition, an optional type instance to use when submitting
  the result of the query. When not supplied will default to the escaped
 -command, up to 64 chars.
 +command, up to 128 chars.
 +
 +=item B<Database> I<Index>
 +
 +This index selects the Redis logical database to use for query. Defaults
 +to C<0>.
  
  =back