projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openldap: set the default timeout to the plugin read `Interval`
[collectd.git]
/
src
/
collectd.conf.pod
diff --git
a/src/collectd.conf.pod
b/src/collectd.conf.pod
index
ee009ee
..
48de6f9
100644
(file)
--- a/
src/collectd.conf.pod
+++ b/
src/collectd.conf.pod
@@
-4660,8
+4660,9
@@
client configuration mechanisms. See ldap.conf(5) for the details.
=item B<Timeout> I<Seconds>
=item B<Timeout> I<Seconds>
-Sets the timeout value for ldap operations. Defaults to B<-1> which results in
-an infinite timeout.
+Sets the timeout value for ldap operations, in seconds. By default, the
+configured B<Interval> is used to set the timeout. Use B<-1> to disable
+(infinite timeout).
=item B<Version> I<Version>
=item B<Version> I<Version>
@@
-7139,14
+7140,18
@@
setting B<name>.
B<address> means use the interface's mac address. This is useful since the
interface path might change between reboots of a guest or across migrations.
B<address> means use the interface's mac address. This is useful since the
interface path might change between reboots of a guest or across migrations.
-=item B<PluginInstanceFormat> B<name|uuid>
+=item B<PluginInstanceFormat> B<name|uuid
|none
>
When the virt plugin logs data, it sets the plugin_instance of the collected
When the virt plugin logs data, it sets the plugin_instance of the collected
-data according to this setting. The default is to use the guest name as provided
-by the hypervisor, which is equal to setting B<name>.
+data according to this setting. The default is to not set the plugin_instance.
+B<name> means use the guest's name as provided by the hypervisor.
B<uuid> means use the guest's UUID.
B<uuid> means use the guest's UUID.
+You can also specify combinations of the B<name> and B<uuid> fields.
+For example B<name uuid> means to concatenate the guest name and UUID
+(with a literal colon character between, thus I<"foo:1234-1234-1234-1234">).
+
=back
=head2 Plugin C<vmem>
=back
=head2 Plugin C<vmem>