projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
8eb08a6
..
f0ac287
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-135,6
+135,7
@@
#@BUILD_PLUGIN_JAVA_TRUE@LoadPlugin java
@BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load
#@BUILD_PLUGIN_LPAR_TRUE@LoadPlugin lpar
#@BUILD_PLUGIN_JAVA_TRUE@LoadPlugin java
@BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load
#@BUILD_PLUGIN_LPAR_TRUE@LoadPlugin lpar
+#@BUILD_PLUGIN_LUA_TRUE@LoadPlugin lua
#@BUILD_PLUGIN_LVM_TRUE@LoadPlugin lvm
#@BUILD_PLUGIN_MADWIFI_TRUE@LoadPlugin madwifi
#@BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon
#@BUILD_PLUGIN_LVM_TRUE@LoadPlugin lvm
#@BUILD_PLUGIN_MADWIFI_TRUE@LoadPlugin madwifi
#@BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon
@@
-574,12
+575,17
@@
#</Plugin>
#<Plugin grpc>
#</Plugin>
#<Plugin grpc>
-# WorkerThreads 5
+# <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
# <Listen "0.0.0.0" "50051">
# EnableSSL true
-# SSL
RootCerts
"/path/to/root.pem"
-# SSL
ServerCert "/path/to/server
.pem"
-# SSL
ServerKey "/path/to/server
.key"
+# SSL
CACertificateFile
"/path/to/root.pem"
+# SSL
CertificateFile "/path/to/client
.pem"
+# SSL
CertificateKeyFile "/path/to/client
.key"
# </Listen>
#</Plugin>
# </Listen>
#</Plugin>
@@
-635,6
+641,12
@@
# ReportBySerial false
#</Plugin>
# ReportBySerial false
#</Plugin>
+#<Plugin lua>
+# BasePath "@prefix@/share/@PACKAGE_NAME@/lua"
+# Script "script1.lua"
+# Script "script2.lua"
+#</Plugin>
+
#<Plugin madwifi>
# Interface "wlan0"
# IgnoreSelected false
#<Plugin madwifi>
# Interface "wlan0"
# IgnoreSelected false
@@
-1396,6
+1408,7
@@
# StoreRates true
# AlwaysAppendDS false
# EscapeCharacter "_"
# StoreRates true
# AlwaysAppendDS false
# EscapeCharacter "_"
+# SeparateInstances false
# </Node>
#</Plugin>
# </Node>
#</Plugin>