projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/pr/1188'
[collectd.git]
/
src
/
collectd.conf.pod
diff --git
a/src/collectd.conf.pod
b/src/collectd.conf.pod
index
978c1c5
..
aaeeaf4
100644
(file)
--- a/
src/collectd.conf.pod
+++ b/
src/collectd.conf.pod
@@
-510,7
+510,7
@@
are disabled by default.
=head2 Plugin C<amqp>
=head2 Plugin C<amqp>
-The I<AMQ
M
P plugin> can be used to communicate with other instances of
+The I<AMQP plugin> can be used to communicate with other instances of
I<collectd> or third party applications using an AMQP message broker. Values
are sent to or received from the broker, which handles routing, queueing and
possibly filtering out messages.
I<collectd> or third party applications using an AMQP message broker. Values
are sent to or received from the broker, which handles routing, queueing and
possibly filtering out messages.
@@
-2288,7
+2288,7
@@
expected from them. This is documented in great detail in L<collectd-exec(5)>.
=head2 Plugin C<fhcount>
The C<fhcount> plugin provides statistics about used, unused and total number of
=head2 Plugin C<fhcount>
The C<fhcount> plugin provides statistics about used, unused and total number of
-file handles.
+file handles
on Linux
.
The I<fhcount plugin> provides the following configuration options:
The I<fhcount plugin> provides the following configuration options:
@@
-7119,6
+7119,10
@@
You can also specify combinations of these 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">).
means to concatenate the guest name and UUID (with a literal colon character
between, thus I<"foo:1234-1234-1234-1234">).
+At the moment of writing (collectd-5.5), hostname string is limited to 62
+characters. In case when combination of fields exceeds 62 characters,
+hostname will be truncated without a warning.
+
=item B<InterfaceFormat> B<name>|B<address>
When the virt plugin logs interface data, it sets the name of the collected
=item B<InterfaceFormat> B<name>|B<address>
When the virt plugin logs interface data, it sets the name of the collected
@@
-7611,7
+7615,7
@@
Synopsis:
Values are submitted to I<Sorted Sets>, using the metric name as the key, and
the timestamp as the score. Retrieving a date range can then be done using the
Values are submitted to I<Sorted Sets>, using the metric name as the key, and
the timestamp as the score. Retrieving a date range can then be done using the
-C<ZRANGEBYSCORE> I<Redis> command. Addition
n
ally, all the identifiers of these
+C<ZRANGEBYSCORE> I<Redis> command. Additionally, all the identifiers of these
I<Sorted Sets> are kept in a I<Set> called C<collectd/values> (or
C<${prefix}/values> if the B<Prefix> option was specified) and can be retrieved
using the C<SMEMBERS> I<Redis> command. You can specify the database to use
I<Sorted Sets> are kept in a I<Set> called C<collectd/values> (or
C<${prefix}/values> if the B<Prefix> option was specified) and can be retrieved
using the C<SMEMBERS> I<Redis> command. You can specify the database to use
@@
-7631,9
+7635,9
@@
options are available:
=item B<Node> I<Nodename>
The B<Node> block identifies a new I<Redis> node, that is a new I<Redis>
=item B<Node> I<Nodename>
The B<Node> block identifies a new I<Redis> node, that is a new I<Redis>
-instance running
in an specified host and port. The name for nod
e is a
+instance running
on a specified host and port. The node nam
e is a
canonical identifier which is used as I<plugin instance>. It is limited to
canonical identifier which is used as I<plugin instance>. It is limited to
-
64
E<nbsp>characters in length.
+
51
E<nbsp>characters in length.
=item B<Host> I<Hostname>
=item B<Host> I<Hostname>