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

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

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 82fa4ce98c38076805ce80e52cd9d056e7850f5f..d7d1501656afd20f4ed87d34153c6d0ac4683c2b 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -3352,26 +3352,31 @@ the B<collectd> branch.
 Path to the PEM-encoded CA certificate file. Setting this option enables TLS
 communication with the MQTT broker, and as such, B<Port> should be the TLS-enabled
 port of the MQTT broker.
+A valid TLS configuration requires B<CACert>, B<CertificateFile> and B<CertificateKeyFile>.
 
 =item B<CertificateFile> I<file>
 
 Path to the PEM-encoded certificate file to use as client certificate when
-connecting to the MQTT broker. Requires B<CertificateFile>
+connecting to the MQTT broker.
+A valid TLS configuration requires B<CACert>, B<CertificateFile> and B<CertificateKeyFile>.
 
 =item B<CertificateKeyFile> I<file>
 
-Path to the unencrypted PEM-encoded key file corresponding to B<CertificateFile>. 
+Path to the unencrypted PEM-encoded key file corresponding to B<CertificateFile>.
+A valid TLS configuration requires B<CACert>, B<CertificateFile> and B<CertificateKeyFile>.
 
 =item B<TLSProtocol> I<protocol>
 
-If configured, this specifies the string protocol version (e.g. tlsv1, tlsv1.2) to
-use for the TLS connection to the broker. If not set a default version is used which
-depends on the version of OpenSSL the Mosquitto library was linked against.
+If configured, this specifies the string protocol version (e.g. C<tlsv1>,
+C<tlsv1.2>) to use for the TLS connection to the broker. If not set a default
+version is used which depends on the version of OpenSSL the Mosquitto library
+was linked against.
 
 =item B<CipherSuite> I<ciphersuite>
 
-A string describing the ciphers available for use. See the "openssl ciphers" utility
-for more information. If unset, the default ciphers will be used.
+A string describing the ciphers available for use. See L<ciphers(1)> and the
+C<openssl ciphers> utility for more information. If unset, the default ciphers
+will be used.
 
 
 =back
@@ -4431,6 +4436,21 @@ Default: C<Collectd notify: %s@%s>
 
 =back
 
+=head2 Plugin C<notify_nagios>
+
+The I<notify_nagios> plugin writes notifications to Nagios' I<command file> as
+a I<passive service check result>.
+
+Available configuration options:
+
+=over 4
+
+=item B<CommandFile> I<Path>
+
+Sets the I<command file> to write to. Defaults to F</usr/local/nagios/var/rw/nagios.cmd>.
+
+=back
+
 =head2 Plugin C<ntpd>
 
 =over 4