From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 15 Oct 2009 19:38:38 +0000 (+0200)
Subject: collectd.conf, thresholds.conf: Added new config options.
X-Git-Tag: collectd-4.8.1-1~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7c0936b382eaa204d64d9abd4e812378e285184c;p=pkg-collectd.git

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

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 37b8dfd..23eaa9d 100644
--- 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 bff223a..c28bbe2 100644
--- 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">