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/2091'
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
7b685aa
..
6bddd8c
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-466,6
+466,7
@@
#<Plugin curl_xml>
# <URL "http://localhost/stats.xml">
# Host "my_host"
#<Plugin curl_xml>
# <URL "http://localhost/stats.xml">
# Host "my_host"
+# #Plugin "stats"
# Instance "some_instance"
# User "collectd"
# Password "thaiNg0I"
# Instance "some_instance"
# User "collectd"
# Password "thaiNg0I"
@@
-480,6
+481,7
@@
# Type "magic_level"
# #InstancePrefix "prefix-"
# InstanceFrom "td[1]"
# Type "magic_level"
# #InstancePrefix "prefix-"
# InstanceFrom "td[1]"
+# #PluginInstanceFrom "td[1]"
# ValuesFrom "td[2]/span[@class=\"level\"]"
# </XPath>
# </URL>
# ValuesFrom "td[2]/span[@class=\"level\"]"
# </XPath>
# </URL>
@@
-680,6
+682,8
@@
# NotifySensorAdd false
# NotifySensorRemove true
# NotifySensorNotPresent false
# NotifySensorAdd false
# NotifySensorRemove true
# NotifySensorNotPresent false
+# SELEnabled false
+# SELClearEvent false
#</Plugin>
#<Plugin iptables>
#</Plugin>
#<Plugin iptables>
@@
-1173,6
+1177,7
@@
#<Plugin processes>
# CollectFileDescriptor true
# CollectContextSwitch true
#<Plugin processes>
# CollectFileDescriptor true
# CollectContextSwitch true
+# CollectMemoryMaps true
# Process "name"
# ProcessMatch "name" "regex"
# <Process "collectd">
# Process "name"
# ProcessMatch "name" "regex"
# <Process "collectd">