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

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index dbc5463..f35f328 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -814,6 +814,11 @@
 #              QoS 2
 #              Topic "collectd/#"
 #              CleanSession true
+#              CACert "/etc/ssl/ca.crt"
+#              CertificateFile "/etc/ssl/client.crt"
+#              CertificateKeyFile "/etc/ssl/client.pem"
+#              TLSProtocol "tlsv1.2"
+#              CipherSuite "ciphers"
 #      </Subscribe>
 #</Plugin>
 
@@ -941,9 +946,9 @@
 @LOAD_PLUGIN_NETWORK@</Plugin>
 
 #<Plugin nfs>
-#      IgnoreV2 true
-#      #IgnoreV3 true
-#      #IgnoreV4 true
+#      ReportV2 false
+#      #ReportV3 false
+#      #ReportV4 false
 #</Plugin>
 
 #<Plugin nginx>
@@ -1343,6 +1348,7 @@
 
 #<Plugin table>
 #      <Table "/proc/slabinfo">
+#              #Plugin "table"
 #              Instance "slabinfo"
 #              Separator " "
 #              <Result>