X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=261abdfdead47776d678b4f48479d0e93f07f0d1;hb=71fb7a5299f307a9261ae69819318f1eda1dd3c7;hp=6bddd8cbfb39b0de48bfb5d8bedbcd1ff0475e6a;hpb=1581f3b307554cbf8b5784729754c5d73a1192a5;p=collectd.git
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 6bddd8cb..261abdfd 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -601,6 +601,7 @@
# Size "+10k"
# Recursive true
# IncludeHidden false
+# RegularOnly true
# #FilesSizeType "bytes"
# #FilesCountType "files"
# #TypeInstance "instance"
@@ -676,14 +677,33 @@
#
#
-# Sensor "some_sensor"
-# Sensor "another_one"
-# IgnoreSelected false
-# NotifySensorAdd false
-# NotifySensorRemove true
-# NotifySensorNotPresent false
-# SELEnabled false
-# SELClearEvent 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
+#
#
#
@@ -1297,6 +1317,8 @@
# Community "community_string"
# Collect "std_traffic"
# Interval 120
+# Timeout 10
+# Retries 1
#
#
# Address "192.168.0.42"
@@ -1310,6 +1332,8 @@
# Community "more_communities"
# Collect "powerplus_voltge_input"
# Interval 300
+# Timeout 5
+# Retries 5
#
#
@@ -1560,6 +1584,7 @@
# CollectManagement false # Varnish 4 only
# CollectSMF false # Varnish 4 only
# CollectVBE false # Varnish 4 only
+# CollectMSE false # Varnish-Plus 4 only
#
#
@@ -1616,6 +1641,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