curl_xml: Changed documentation to match proposed changes.

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

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index c30256f..05e205f 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -1931,6 +1931,11 @@ host name setting.
 Use I<Instance> as the plugin instance when submitting values. Defaults to an
 empty string (no plugin instance).
 
+=item B<PluginName> I<PluginName>
+
+Use I<PluginName> as the plugin name when submitting values.
+Defaults to 'curl_xml'.
+
 =item B<Namespace> I<Prefix> I<URL>
 
 If an XPath expression references namespaces, they must be specified
@@ -2000,9 +2005,19 @@ Specifies a XPath expression to use for determining the I<type instance>. The
 XPath expression must return exactly one element. The element's value is then
 used as I<type instance>, possibly prefixed with I<InstancePrefix> (see above).
 
-This value is required. As a special exception, if the "base XPath expression"
-(the argument to the B<XPath> block) returns exactly one argument, then this
-option may be omitted.
+=item B<PluginInstanceFrom> I<PluginInstanceFrom>
+
+Specifies a XPath expression to use for determining the I<plugin instance>. The
+XPath expression must return exactly one element. The element's value is then
+used as I<plugin instance>.
+
+=back
+
+If the "base XPath expression" (the argument to the B<XPath> block) returns
+exactly one argument, then I<InstanceFrom> and I<PluginInstanceFrom> may be omitted.
+Otherwise, at least one of I<InstanceFrom> or I<PluginInstanceFrom> is required.
+
+=over 4
 
 =item B<ValuesFrom> I<ValuesFrom> [I<ValuesFrom> ...]
 
@@ -2226,7 +2241,7 @@ the daemon. Other than that, that name is not used.
 =item B<Plugin> I<Plugin>
 
 Use I<Plugin> as the plugin name when submitting query results from
-this B<Database>. Defaults to 'dbi'.
+this B<Database>. Defaults to C<dbi>.
 
 =item B<Interval> I<Interval>
 
@@ -5797,7 +5812,7 @@ values submitted to the daemon. Other than that, that name is not used.
 =item B<Plugin> I<Plugin>
 
 Use I<Plugin> as the plugin name when submitting query results from
-this B<Database>. Defaults to 'oracle'.
+this B<Database>. Defaults to C<oracle>.
 
 =item B<ConnectID> I<ID>
 
@@ -6477,7 +6492,7 @@ transaction fails or if the database server crashes.
 =item B<Plugin> I<Plugin>
 
 Use I<Plugin> as the plugin name when submitting query results from
-this B<Database>. Defaults to 'postgresql'.
+this B<Database>. Defaults to C<postgresql>.
 
 =item B<Instance> I<name>
 
@@ -6743,6 +6758,7 @@ collected for these selected processes are:
  - number of processes
  - number of threads
  - number of open files (under Linux)
+ - number of memory mapped files (under Linux)
  - io data (where available)
  - context switches (under Linux)
  - minor and major pagefaults.
@@ -6763,6 +6779,12 @@ slashes.
 
 Collect context switch of the process.
 
+=item B<CollectMemoryMaps> I<Boolean>
+
+Collect the number of memory mapped files of the process.
+The limit for this number is configured via F</proc/sys/vm/max_map_count> in
+the Linux kernel.
+
 =back
 
 =head2 Plugin C<protocols>