projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.7'
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
4512a87
..
7b685aa
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>
@@
-492,6
+495,7
@@
# </Result>
# </Query>
# <Database "customers_db">
# </Result>
# </Query>
# <Database "customers_db">
+# #Plugin "mycompany"
# Driver "mysql"
# DriverOption "host" "localhost"
# DriverOption "username" "collectd"
# Driver "mysql"
# DriverOption "host" "localhost"
# DriverOption "username" "collectd"
@@
-588,12
+592,16
@@
#<Plugin filecount>
# <Directory "/path/to/dir">
#<Plugin filecount>
# <Directory "/path/to/dir">
+# #Plugin "foo"
# Instance "foodir"
# Name "*.conf"
# MTime "-5m"
# Size "+10k"
# Recursive true
# IncludeHidden false
# Instance "foodir"
# Name "*.conf"
# MTime "-5m"
# Size "+10k"
# Recursive true
# IncludeHidden false
+# #FilesSizeType "bytes"
+# #FilesCountType "files"
+# #TypeInstance "instance"
# </Directory>
#</Plugin>
# </Directory>
#</Plugin>
@@
-1038,6
+1046,7
@@
# </Result>
# </Query>
# <Database "product_information">
# </Result>
# </Query>
# <Database "product_information">
+# #Plugin "warehouse"
# ConnectID "db01"
# Username "oracle"
# Password "secret"
# ConnectID "db01"
# Username "oracle"
# Password "secret"
@@
-1124,6
+1133,7
@@
# StoreRates true
# </Writer>
# <Database foo>
# StoreRates true
# </Writer>
# <Database foo>
+# #Plugin "kingdom"
# Host "hostname"
# Port "5432"
# User "username"
# Host "hostname"
# Port "5432"
# User "username"
@@
-1401,6
+1411,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"
@@
-1530,7
+1541,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
@@
-1539,6
+1550,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>