From 539b4264956e2ca4f42b6d892e6a7e4136ebead0 Mon Sep 17 00:00:00 2001
From: Sebastian Harl <sh@tokkee.org>
Date: Sun, 5 Jun 2011 19:10:12 +0200
Subject: [PATCH] *.conf: Updated to reflect changes in 5.0.0.

---
 debian/collectd.conf   | 40 +++++++++++++++++++++++++++++++++++++++-
 debian/filters.conf    |  2 ++
 debian/thresholds.conf | 10 +++-------
 3 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/debian/collectd.conf b/debian/collectd.conf
index b5fc462..9f1a918 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -29,6 +29,7 @@ LoadPlugin syslog
 	LogLevel info
 </Plugin>
 
+#LoadPlugin amqp
 #LoadPlugin apache
 #LoadPlugin apcups
 #LoadPlugin ascent
@@ -103,11 +104,26 @@ LoadPlugin swap
 #LoadPlugin uptime
 LoadPlugin users
 #LoadPlugin uuid
+#LoadPlugin varnish
 #LoadPlugin vmem
 #LoadPlugin vserver
 #LoadPlugin wireless
 #LoadPlugin write_http
 
+#<Plugin amqp>
+#	<Publish "name">
+#		Host "localhost"
+#		Port "5672"
+#		VHost "/"
+#		User "guest"
+#		Password "guest"
+#		Exchange "amq.fanout"
+#		RoutingKey "collectd"
+#		Persistent false
+#		StoreRates false
+#	</Publish>
+#</Plugin>
+
 #<Plugin apache>
 #	<Instance "foo">
 #		URL "http://localhost/server-status?auto"
@@ -324,7 +340,6 @@ LoadPlugin users
 #<Plugin hddtemp>
 #	Host "127.0.0.1"
 #	Port 7634
-#	TranslateDevicename false
 #</Plugin>
 
 #<Plugin interface>
@@ -371,6 +386,7 @@ LoadPlugin users
 #	InterfaceDevice "name:device"
 #	IgnoreSelected false
 #	HostnameFormat name
+#	InterfaceFormat name
 #</Plugin>
 
 #<Plugin madwifi>
@@ -786,12 +802,34 @@ LoadPlugin users
 #	SocketFile "/var/run/collectd-unixsock"
 #	SocketGroup "collectd"
 #	SocketPerms "0660"
+#	DeleteSocket false
 #</Plugin>
 
 #<Plugin uuid>
 #	UUIDFile "/etc/uuid"
 #</Plugin>
 
+#<Plugin varnish>
+#	<Instance>
+#		CollectCache true
+#		CollectBackend true
+#		CollectConnections true
+#		CollectSHM true
+#		CollectESI false
+#		CollectFetch false
+#		CollectHCB false
+#		CollectSMA false
+#		CollectSMS false
+#		CollectSM false
+#		CollectTotals false
+#		CollectWorkers false
+#	</Instance>
+#
+#	<Instance "myinstance">
+#		CollectCache true
+#	</Instance>
+#</Plugin>
+
 #<Plugin vmem>
 #	Verbose false
 #</Plugin>
diff --git a/debian/filters.conf b/debian/filters.conf
index 1304b6f..5dbf890 100644
--- a/debian/filters.conf
+++ b/debian/filters.conf
@@ -15,6 +15,7 @@
 #LoadPlugin target_replace
 #LoadPlugin target_scale
 #LoadPlugin target_set
+#LoadPlugin target_v5upgrade
 
 #<Chain "PreCache">
 #	<Rule "no_fqdn">
@@ -26,6 +27,7 @@
 #	</Rule>
 #</Chain>
 
+# Default behavior:
 #<Chain "PostCache">
 #	Target "write"
 #</Chain>
diff --git a/debian/thresholds.conf b/debian/thresholds.conf
index c28bbe2..53c62be 100644
--- a/debian/thresholds.conf
+++ b/debian/thresholds.conf
@@ -2,7 +2,8 @@
 #
 # See the section "THRESHOLD CONFIGURATION" in collectd.conf(5) for details.
 
-#<Threshold>
+#LoadPlugin "threshold"
+#<Plugin "threshold">
 #	<Type "counter">
 #		WarningMin 0.00
 #		WarningMax 1000.00
@@ -13,11 +14,6 @@
 #		Instance "some_instance"
 #	</Type>
 #
-#	<Type "df">
-#		WarningMax 90
-#		Percentage true
-#	</Type>
-#
 #	<Type "load">
 #		DataSource "midterm"
 #		WarningMax 1
@@ -51,5 +47,5 @@
 #			</Type>
 #		</Plugin>
 #	</Host>
-#</Threshold>
+#</Plugin>
 
-- 
2.30.2