X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcollectd.conf.in;h=c982e55499e52d0b0699819b59a2663093ea7427;hb=aecd05a0a0ec4d745506a67a937de6d1d6b33db5;hp=7b685aacbf9448415ea65883118dfaa97ad5edd4;hpb=4eca75de34e9c3d7f2391b9c7a5951a27a713804;p=collectd.git
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 7b685aac..c982e554 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -466,6 +466,7 @@
#
#
# Host "my_host"
+# #Plugin "stats"
# Instance "some_instance"
# User "collectd"
# Password "thaiNg0I"
@@ -480,6 +481,7 @@
# Type "magic_level"
# #InstancePrefix "prefix-"
# InstanceFrom "td[1]"
+# #PluginInstanceFrom "td[1]"
# ValuesFrom "td[2]/span[@class=\"level\"]"
#
#
@@ -599,6 +601,7 @@
# Size "+10k"
# Recursive true
# IncludeHidden false
+# RegularOnly true
# #FilesSizeType "bytes"
# #FilesCountType "files"
# #TypeInstance "instance"
@@ -674,12 +677,33 @@
#
#
-# Sensor "some_sensor"
-# Sensor "another_one"
-# IgnoreSelected false
-# NotifySensorAdd false
-# NotifySensorRemove true
-# NotifySensorNotPresent false
+#
+# Sensor "some_sensor"
+# Sensor "another_one"
+# IgnoreSelected false
+# NotifySensorAdd false
+# NotifySensorRemove true
+# NotifySensorNotPresent false
+# NotifyIPMIConnectionState false
+# SELEnabled false
+# SELClearEvent false
+#
+#
+# Host "server.example.com"
+# Address "1.2.3.4"
+# Username "user"
+# Password "secret"
+# #AuthType "md5"
+# Sensor "some_sensor"
+# Sensor "another_one"
+# IgnoreSelected false
+# NotifySensorAdd false
+# NotifySensorRemove true
+# NotifySensorNotPresent false
+# NotifyIPMIConnectionState false
+# SELEnabled false
+# SELClearEvent false
+#
#
#
@@ -1173,6 +1197,7 @@
#
# CollectFileDescriptor true
# CollectContextSwitch true
+# CollectMemoryMaps true
# Process "name"
# ProcessMatch "name" "regex"
#
@@ -1555,6 +1580,7 @@
# CollectManagement false # Varnish 4 only
# CollectSMF false # Varnish 4 only
# CollectVBE false # Varnish 4 only
+# CollectMSE false # Varnish-Plus 4 only
#
#
@@ -1611,6 +1637,7 @@
# Header "X-Custom-Header: custom_value"
# SSLVersion "TLSv1"
# Format "Command"
+# Prefix "collectd" # metric prefix, only available for KAIROSDB format
# Attribute "key" "value" # only available for KAIROSDB format
# TTL 0 # data ttl, only available for KAIROSDB format
# Metrics true