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/2449'
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
aa65838
..
bde168c
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-364,6
+364,9
@@
# ReportByCpu true
# ReportByState true
# ValuesPercentage false
# ReportByCpu true
# ReportByState true
# ValuesPercentage false
+# ReportNumCpu false
+# ReportGuestState false
+# SubtractGuestState true
#</Plugin>
#
#<Plugin csv>
#</Plugin>
#
#<Plugin csv>
@@
-818,6
+821,11
@@
# QoS 2
# Topic "collectd/#"
# CleanSession true
# 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>
# </Subscribe>
#</Plugin>
@@
-1343,10
+1351,12
@@
# ReportBytes true
# ValuesAbsolute true
# ValuesPercentage false
# ReportBytes true
# ValuesAbsolute true
# ValuesPercentage false
+# ReportIO true
#</Plugin>
#<Plugin table>
# <Table "/proc/slabinfo">
#</Plugin>
#<Plugin table>
# <Table "/proc/slabinfo">
+# #Plugin "table"
# Instance "slabinfo"
# Separator " "
# <Result>
# Instance "slabinfo"
# Separator " "
# <Result>
@@
-1398,6
+1408,7
@@
# Bucket 0.5 1.0 # -> bucket-latency-foo-0.5_1
# Bucket 1.0 2.0 # -> bucket-latency-foo-1_2
# Bucket 2.0 0 # -> bucket-latency-foo-2_inf
# Bucket 0.5 1.0 # -> bucket-latency-foo-0.5_1
# Bucket 1.0 2.0 # -> bucket-latency-foo-1_2
# Bucket 2.0 0 # -> bucket-latency-foo-2_inf
+# #BucketType "bucket"
# </DSType>
# Type "latency"
# Instance "foo"
# </DSType>
# Type "latency"
# Instance "foo"
@@
-1477,7
+1488,7
@@
# SystemManagementInterrupt true
# DigitalTemperatureSensor true
# PackageThermalManagement true
# SystemManagementInterrupt true
# DigitalTemperatureSensor true
# PackageThermalManagement true
-# RunningAveragePowerLimit "7"
+# RunningAveragePowerLimit "7"
#</Plugin>
#<Plugin unixsock>
#</Plugin>
#<Plugin unixsock>
@@
-1527,7
+1538,7
@@
# CollectPurge false # Varnish 2 only
# CollectSession false
# CollectSHM true
# CollectPurge false # Varnish 2 only
# CollectSession false
# CollectSHM true
-# CollectSMA false # Varnish 2 only
+# CollectSMA false # Varnish 2
& 4
only
# CollectSMS false
# CollectSM false # Varnish 2 only
# CollectStruct false
# CollectSMS false
# CollectSM false # Varnish 2 only
# CollectStruct false
@@
-1536,6
+1547,11
@@
# CollectVCL false
# CollectVSM false # Varnish 4 only
# CollectWorkers false
# CollectVCL false
# CollectVSM false # Varnish 4 only
# CollectWorkers false
+# CollectLock false # Varnish 4 only
+# CollectMempool false # Varnish 4 only
+# CollectManagement false # Varnish 4 only
+# CollectSMF false # Varnish 4 only
+# CollectVBE false # Varnish 4 only
# </Instance>
#</Plugin>
# </Instance>
#</Plugin>