X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollectd.conf.pod;h=43946bdf6b0890176b2c37dbb3fd7c186ed1af1b;hb=108068f268cad453e5d3b54e288917409db1e467;hp=a1c2b073fcf1bec15f35a823e207bca7073d8d9a;hpb=979041ee0516ee373ef5d1d90f749864c3baef38;p=collectd.git
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index a1c2b073..43946bdf 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -454,7 +454,7 @@ finance page and dispatch the value to collectd.
Regex "]*> *([0-9]*\\.[0-9]+) *"
DSType "GaugeAverage"
- # Note: `stock_value' is not a standard type.
+ # Note: `stock_value' is not a standard type.
Type "stock_value"
Instance "AMD"
@@ -529,7 +529,7 @@ than those of other plugins. It usually looks something like this:
MinVersion 50000
Type "gauge"
- InstancePrefix "out_of_stock"
+ InstancePrefix "out_of_stock"
InstancesFrom "category"
ValuesFrom "value"
@@ -606,6 +606,9 @@ like this:
use a more strict database server, you may have to select from a dummy table or
something.)
+Please note that some databases, for example B, will fail if you
+include a semicolon at the end of the statement.
+
=item B I
=item B I
@@ -653,20 +656,24 @@ There must be exactly one B option inside each B block.
=item B I
-Prepends I followed by a dash I<("-")> to the type instance. See
-B on how the rest of the type instance is built.
+Prepends I to the type instance. If B (see below) is not
+given, the string is simply copied. If B is given, I and
+all strings returned in the appropriate columns are concatenated together,
+separated by dashes I<("-")>.
=item B I [I ...]
-Specifies the columns whose values will be used to create the "TypeInstance"
-for each row. You need to specify at least one column for each query. If you
-specify more than one column, the value of all columns will be join together
-with the hyphen as separation character.
+Specifies the columns whose values will be used to create the "type-instance"
+for each row. If you specify more than one column, the value of all columns
+will be join together with the dashes I<("-")> as separation character.
The plugin itself does not check whether or not all built instances are
-different. It's your responsibility to assure that each is unique.
+different. It's your responsibility to assure that each is unique. This is
+especially true, if you do not specify B: B have to make
+sure that only one row is returned in this case.
-There must be at least one B option inside each B block.
+If neither B nor B is given, the type-instance
+will be empty.
=item B I [I ...]
@@ -955,97 +962,6 @@ Controls whether or not to recurse into subdirectories. Enabled by default.
=back
-=head2 Plugin C
-
-This plugin allows you to filter and rewrite value lists based on
-Perl-compatible regular expressions whose syntax and semantics are as close as
-possible to those of the Perl 5 language. See L for details.
-
-
-
- Host "^mail\d+$"
- Plugin "^tcpconns$"
- TypeInstance "^SYN_"
-
- Action NoWrite
-
-
-
- Plugin "^sensors$"
- PluginInstance "^Some Weird Sensor Chip Name Prefix"
-
- SubstitutePluginInstance "foo"
-
-
-
-The configuration consists of one or more C blocks, each of which
-specifies a regular expression identifying a set of value lists and how to
-handle successful matches. A value list keeps the values of a single data-set
-and is identified by the tuple (host, plugin, plugin instance, type, type
-instance). The plugin and type instances are optional components. If they are
-missing they are treated as empty strings. Within those blocks, the following
-options are recognized:
-
-=over 4
-
-=item B I
-
-=item B I
-
-=item B I
-
-=item B I
-
-=item B I
-
-Specifies the regular expression for each component of the identifier. If any
-of these options is missing it is interpreted as a pattern which matches any
-string. All five components of a value list have to match the appropriate
-regular expression to trigger the specified action.
-
-=item B I|I|I
-
-Specify how to handle successful matches:
-
-=over 4
-
-=item B
-
-Do not send the value list to any output (a.k.a. write) plugins.
-
-=item B
-
-Skip threshold checking for this value list.
-
-=item B
-
-Completely ignore this value list.
-
-=back
-
-Two or more actions may be combined by specifying multiple B options.
-
-=item B I
-
-=item B I
-
-=item B I
-
-=item B I
-
-=item B I
-
-Upon a successful match, the matching substring will be replaced by the
-specified I text. These options require that an appropriate regex
-has been specified before, e.Eg. B requires that the
-B option has been specified before.
-
-B: It is not recommended to modify the type unless you really know what
-you are doing. The type is used to identify the data-set definition of the
-dispatched values.
-
-=back
-
=head2 Plugin C
To get values from B collectd connects to B (127.0.0.1),
@@ -3605,7 +3521,6 @@ L,
L,
L,
L,
-L,
L,
L,
L,