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/2190'
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
9508338
..
ad9437b
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-1138,7
+1138,18
@@
#</Plugin>
#<Plugin processes>
#</Plugin>
#<Plugin processes>
+# CollectFileDescriptor true
+# CollectContextSwitch true
# Process "name"
# Process "name"
+# ProcessMatch "name" "regex"
+# <Process "collectd">
+# CollectFileDescriptor false
+# CollectContextSwitch false
+# </Process>
+# <ProcessMatch "name" "regex">
+# CollectFileDescriptor false
+# CollectContextSwitch true
+# </Process>
#</Plugin>
#<Plugin protocols>
#</Plugin>
#<Plugin protocols>
@@
-1495,7
+1506,7
@@
# InterfaceFormat name
# PluginInstanceFormat name
# Instances 1
# InterfaceFormat name
# PluginInstanceFormat name
# Instances 1
-# ExtraStats "
disk pcpu
"
+# ExtraStats "
cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin
"
#</Plugin>
#<Plugin vmem>
#</Plugin>
#<Plugin vmem>
@@
-1536,6
+1547,7
@@
# SSLVersion "TLSv1"
# Format "Command"
# Attribute "key" "value" # only available for KAIROSDB format
# SSLVersion "TLSv1"
# Format "Command"
# Attribute "key" "value" # only available for KAIROSDB format
+# TTL 0 # data ttl, only available for KAIROSDB format
# Metrics true
# Notifications false
# StoreRates false
# Metrics true
# Notifications false
# StoreRates false