projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.6' into collectd-4.7
[collectd.git]
/
src
/
collectd.conf.pod
diff --git
a/src/collectd.conf.pod
b/src/collectd.conf.pod
index
899daf1
..
97093c8
100644
(file)
--- a/
src/collectd.conf.pod
+++ b/
src/collectd.conf.pod
@@
-2171,7
+2171,7
@@
L<http://www.postgresql.org/docs/manuals/>.
The B<Query> block defines one database query which may later be used by a
database definition. It accepts a single mandatory argument which specifies
the name of the query. The names of all queries have to be unique (see the
The B<Query> block defines one database query which may later be used by a
database definition. It accepts a single mandatory argument which specifies
the name of the query. The names of all queries have to be unique (see the
-B<Min
PGVersion> and B<MaxPG
Version> options below for an exception to this
+B<Min
Version> and B<Max
Version> options below for an exception to this
rule). The following configuration options are available to define the query:
In each B<Query> block, there is one or more B<Result> blocks. B<Result>
rule). The following configuration options are available to define the query:
In each B<Query> block, there is one or more B<Result> blocks. B<Result>
@@
-2290,9
+2290,9
@@
The order of the B<Column> options defines which columns of the query result
should be used. The first option specifies the data found in the first column,
the second option that of the second column, and so on.
should be used. The first option specifies the data found in the first column,
the second option that of the second column, and so on.
-=item B<Min
PG
Version> I<version>
+=item B<MinVersion> I<version>
-=item B<Max
PG
Version> I<version>
+=item B<MaxVersion> I<version>
Specify the minimum or maximum version of PostgreSQL that this query should be
used with. Some statistics might only be available with certain versions of
Specify the minimum or maximum version of PostgreSQL that this query should be
used with. Some statistics might only be available with certain versions of
@@
-2304,6
+2304,13
@@
The I<version> has to be specified as the concatenation of the major, minor
and patch-level versions, each represented as two-decimal-digit numbers. For
example, version 8.2.3 will become 80203.
and patch-level versions, each represented as two-decimal-digit numbers. For
example, version 8.2.3 will become 80203.
+=item B<MinPGVersion> I<version>
+
+=item B<MaxPGVersion> I<version>
+
+These are deprecated synonyms for B<MinVersion> and B<MaxVersion>
+respectively. They will be removed in version 5 of collectd.
+
=back
The following predefined queries are available (the definitions can be found
=back
The following predefined queries are available (the definitions can be found