Merge remote-tracking branch 'github/pr/2391' into collectd-5.6

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 7a3818d..f0ac287 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -575,11 +575,17 @@
 #</Plugin>
 
 #<Plugin grpc>
+#      <Server "example.com" "50051">
+#              EnableSSL true
+#              SSLCACertificateFile "/path/to/root.pem"
+#              SSLCertificateFile "/path/to/server.pem"
+#              SSLCertificateKeyFile "/path/to/server.key"
+#      </Server>
 #      <Listen "0.0.0.0" "50051">
 #              EnableSSL true
-#              SSLRootCerts "/path/to/root.pem"
-#              SSLServerCert "/path/to/server.pem"
-#              SSLServerKey "/path/to/server.key"
+#              SSLCACertificateFile "/path/to/root.pem"
+#              SSLCertificateFile "/path/to/client.pem"
+#              SSLCertificateKeyFile "/path/to/client.key"
 #      </Listen>
 #</Plugin>
 
@@ -1402,6 +1408,7 @@
 #    StoreRates true
 #    AlwaysAppendDS false
 #    EscapeCharacter "_"
+#    SeparateInstances false
 #  </Node>
 #</Plugin>