collectd.conf, thresholds.conf: Added new config options.

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 37b8dfd7fc6f6e3e0b49388794732420f4f89883..23eaa9de0d0d1a6044a9c3f33faa94a657f1876e 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -236,6 +236,7 @@ LoadPlugin users
 #      MountPoint "/home"
 #      FSType "ext3"
 #      IgnoreSelected false
+#      ReportByDevice false
 #</Plugin>
 
 #<Plugin disk>
@@ -247,6 +248,7 @@ LoadPlugin users
 #<Plugin dns>
 #      Interface "eth0"
 #      IgnoreSource "192.168.0.1"
+#      SelectNumericQueryTypes false
 #</Plugin>
 
 #<Plugin email>
@@ -416,7 +418,7 @@ LoadPlugin users
 #      </Listen>
 #      TimeToLive "128"
 #      Forward false
-#      CacheFlush 1800
+#      MaxPacketSize 1024
 #</Plugin>
 
 #<Plugin nginx>
@@ -567,6 +569,7 @@ LoadPlugin users
 #      CacheTimeout 120
 #      CacheFlush 900
 #      WritesPerSecond 30
+#      RandomTimeout 0
 #
 # The following settings are rather advanced
 # and should usually not be touched:

diff --git a/debian/thresholds.conf b/debian/thresholds.conf
index bff223a67818ac8d8127a7d741333a1d08fa4375..c28bbe2468b89662fdfacaf2a65ba1990890f533 100644 (file)
--- a/debian/thresholds.conf
+++ b/debian/thresholds.conf
@@ -13,6 +13,23 @@
 #              Instance "some_instance"
 #      </Type>
 #
+#      <Type "df">
+#              WarningMax 90
+#              Percentage true
+#      </Type>
+#
+#      <Type "load">
+#              DataSource "midterm"
+#              WarningMax 1
+#              Hysteresis 0.3
+#      </Type>
+#
+#      <Type "cpu">
+#              Instance "user"
+#              WarningMax 85
+#              Hits 6
+#      </Type>
+#
 #      <Plugin "interface">
 #              Instance "eth0"
 #              <Type "if_octets">