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

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

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index b71bf3d..c30256f 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -1659,7 +1659,7 @@ The following options are valid within B<Page> blocks:
 =item B<Plugin> I<Plugin>
 
 Use I<Plugin> as the plugin name when submitting values.
-Defaults to 'curl'.
+Defaults to C<curl>.
 
 =item B<URL> I<URL>
 
@@ -1824,7 +1824,7 @@ host name setting.
 =item B<Plugin> I<Plugin>
 
 Use I<Plugin> as the plugin name when submitting values.
-Defaults to 'curl_json'.
+Defaults to C<curl_json>.
 
 =item B<Instance> I<Instance>
 
@@ -2041,6 +2041,7 @@ than those of other plugins. It usually looks something like this:
       </Result>
     </Query>
     <Database "product_information">
+      #Plugin "warehouse"
       Driver "mysql"
       Interval 120
       DriverOption "host" "localhost"
@@ -2222,6 +2223,11 @@ the daemon. Other than that, that name is not used.
 
 =over 4
 
+=item B<Plugin> I<Plugin>
+
+Use I<Plugin> as the plugin name when submitting query results from
+this B<Database>. Defaults to 'dbi'.
+
 =item B<Interval> I<Interval>
 
 Sets the interval (in seconds) in which the values will be collected from this
@@ -3715,7 +3721,7 @@ When connected to the memcached server, asks for the page I<Key>.
 =item B<Plugin> I<Plugin>
 
 Use I<Plugin> as the plugin name when submitting values.
-Defaults to 'memcachec'.
+Defaults to C<memcachec>.
 
 =item E<lt>B<Match>E<gt>
 
@@ -5765,6 +5771,7 @@ plugin's documentation above for details.
       </Result>
     </Query>
     <Database "product_information">
+      #Plugin "warehouse"
       ConnectID "db01"
       Username "oracle"
       Password "secret"
@@ -5787,6 +5794,11 @@ values submitted to the daemon. Other than that, that name is not used.
 
 =over 4
 
+=item B<Plugin> I<Plugin>
+
+Use I<Plugin> as the plugin name when submitting query results from
+this B<Database>. Defaults to 'oracle'.
+
 =item B<ConnectID> I<ID>
 
 Defines the "database alias" or "service name" to connect to. Usually, these
@@ -5842,7 +5854,7 @@ The address of the OVS DB server JSON-RPC interface used by the plugin. To
 enable the interface, OVS DB daemon should be running with C<--remote=ptcp:>
 option. See L<ovsdb-server(1)> for more details. The option may be either
 network hostname, IPv4 numbers-and-dots notation or IPv6 hexadecimal string
-format. Defaults to B<'localhost'>.
+format. Defaults to C<localhost>.
 
 =item B<Port> I<service>
 
@@ -5908,7 +5920,7 @@ The address of the OVS DB server JSON-RPC interface used by the plugin. To
 enable the interface, OVS DB daemon should be running with C<--remote=ptcp:>
 option. See L<ovsdb-server(1)> for more details. The option may be either
 network hostname, IPv4 numbers-and-dots notation or IPv6 hexadecimal string
-format. Defaults to B<'localhost'>.
+format. Defaults to C<localhost>.
 
 =item B<Port> I<service>
 
@@ -6140,6 +6152,7 @@ L<http://www.postgresql.org/docs/manuals/>.
     </Writer>
 
     <Database foo>
+      Plugin "kingdom"
       Host "hostname"
       Port "5432"
       User "username"
@@ -6461,6 +6474,11 @@ activating this option. The draw-back is, that data covering the specified
 amount of time will be lost, for example, if a single statement within the
 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'.
+
 =item B<Instance> I<name>
 
 Specify the plugin instance name that should be used instead of the database
@@ -8003,7 +8021,7 @@ I<File> block but there can be multiple if you have multiple CSV files.
 =item B<Plugin> I<Plugin>
 
 Use I<Plugin> as the plugin name when submitting values.
-Defaults to 'tail_csv'.
+Defaults to C<tail_csv>.
 
 =item B<Instance> I<PluginInstance>