curl_xml plugin: Added 'Interval' option

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

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 31a094d..61aeff1 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -2104,6 +2104,11 @@ Use I<Instance> as the plugin instance when submitting values.
 May be overridden by B<PluginInstanceFrom> option inside B<XPath> blocks.
 Defaults to an empty string (no plugin instance).
 
 May be overridden by B<PluginInstanceFrom> option inside B<XPath> blocks.
 Defaults to an empty string (no plugin instance).
 

+=item B<Interval> I<Interval>
+
+Sets the interval (in seconds) in which the values will be collected from this
+URL. By default the global B<Interval> setting will be used.
+

 =item B<Namespace> I<Prefix> I<URL>
 
 If an XPath expression references namespaces, they must be specified
 =item B<Namespace> I<Prefix> I<URL>
 
 If an XPath expression references namespaces, they must be specified


@@ -5438,6 +5443,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.
 
 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
 =item B<ResolveInterval> I<Seconds>
 
 Sets the interval at which to re-resolve the DNS for the I<Host>. This is


@@ -7285,13 +7296,14 @@ 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.
 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">
         Host "localhost"
         Port "6379"
         Timeout 2000
 
   <Plugin redis>
     <Node "example">
         Host "localhost"
         Port "6379"
         Timeout 2000

+        ReportCommandStats false
+        ReportCpuUsage true

         <Query "LLEN myqueue">
           #Database 0
           Type "queue_length"
         <Query "LLEN myqueue">
           #Database 0
           Type "queue_length"


@@ -7307,7 +7319,7 @@ Server state is requested by sending I<INFO> query.
 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
 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".
 
 
 When no B<Node> is configured explicitly, plugin connects to "localhost:6379".
 


@@ -7329,12 +7341,23 @@ Use I<Password> to authenticate when connecting to I<Redis>.
 =item B<Timeout> I<Milliseconds>
 
 The B<Timeout> option set the socket timeout for node response. Since the Redis
 =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.

 
 Defaults to 2000 (2 seconds).
 
 
 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 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.
 =item B<Query> I<Querystring>
 
 The B<Query> block identifies a query to execute against the redis server.


@@ -7353,7 +7376,7 @@ See L<types.db(5)> for more details on types and their configuration.
 
 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
 
 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>
 
 
 =item B<Database> I<Index>