Merge remote-tracking branch 'github/pr/2435'

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

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 379e083..af6ed93 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -5655,15 +5655,12 @@ The OpenVPN plugin reads a status file maintained by OpenVPN and gathers
 traffic statistics about connected clients.
 
 To set up OpenVPN to write to the status file periodically, use the
 traffic statistics about connected clients.
 
 To set up OpenVPN to write to the status file periodically, use the

-B<--status> option of OpenVPN. Since OpenVPN can write two different formats,
-you need to set the required format, too. This is done by setting
-B<--status-version> to B<2>.
+B<--status> option of OpenVPN.

 
 So, in a nutshell you need:
 
   openvpn $OTHER_OPTIONS \
 
 So, in a nutshell you need:
 
   openvpn $OTHER_OPTIONS \

-    --status "/var/run/openvpn-status" 10 \
-    --status-version 2
+    --status "/var/run/openvpn-status" 10

 
 Available options:
 
 
 Available options:
 


@@ -7562,6 +7559,7 @@ filesystem or CSV (comma separated values) files.
 
   <Plugin table>
     <Table "/proc/slabinfo">
 
   <Plugin table>
     <Table "/proc/slabinfo">

+      #Plugin "slab"

       Instance "slabinfo"
       Separator " "
       <Result>
       Instance "slabinfo"
       Separator " "
       <Result>


@@ -7588,10 +7586,14 @@ The following options are available inside a B<Table> block:
 
 =over 4
 
 
 =over 4
 

+=item B<Plugin> I<Plugin>
+
+If specified, I<Plugin> is used as the plugin name when submitting values.
+Defaults to B<table>.
+

 =item B<Instance> I<instance>
 
 =item B<Instance> I<instance>
 

-If specified, I<instance> is used as the plugin instance. So, in the above
-example, the plugin name C<table-slabinfo> would be used. If omitted, the
+If specified, I<instance> is used as the plugin instance. If omitted, the

 filename of the table is used instead, with all special characters replaced
 with an underscore (C<_>).
 
 filename of the table is used instead, with all special characters replaced
 with an underscore (C<_>).