From 9ba8b96ff1deedb391615604817e3ea75cf24908 Mon Sep 17 00:00:00 2001
From: Sebastian Harl <sh@teamix.net>
Date: Tue, 20 Nov 2012 12:55:08 +0100
Subject: [PATCH] collectd.conf: Updated sample configurations for 5.2.

---
 debian/collectd.conf | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 7477053..7210521 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -29,6 +29,7 @@ LoadPlugin syslog
 	LogLevel info
 </Plugin>
 
+#LoadPlugin aggregation
 #LoadPlugin amqp
 #LoadPlugin apache
 #LoadPlugin apcups
@@ -119,6 +120,26 @@ LoadPlugin users
 #LoadPlugin write_http
 #LoadPlugin write_mongodb
 
+#<Plugin "aggregation">
+#	<Aggregation>
+#		#Host "unspecified"
+#		Plugin "cpu"
+#		#PluginInstance "unspecified"
+#		Type "cpu"
+#		#TypeInstance "unspecified"
+#
+#		GroupBy "Host"
+#		GroupBy "TypeInstance"
+#
+#		CalculateNum false
+#		CalculateSum false
+#		CalculateAverage true
+#		CalculateMinimum false
+#		CalculateMaximum false
+#		CalculateStddev false
+#	</Aggregation>
+#</Plugin>
+
 #<Plugin amqp>
 #	<Publish "name">
 #		Host "localhost"
@@ -443,10 +464,12 @@ LoadPlugin users
 #</Plugin>
 
 #<Plugin memcached>
-#	Socket "/var/run/memcached.sock"
+#	<Instance "local">
+#		Socket "/var/run/memcached.sock"
 # or:
-#	Host "127.0.0.1"
-#	Port "11211"
+#		Host "127.0.0.1"
+#		Port "11211"
+#	</Instance>
 #</Plugin>
 
 #<Plugin mysql>
@@ -538,6 +561,7 @@ LoadPlugin users
 #	Host "localhost"
 #	Port 123
 #	ReverseLookups false
+#	IncludeUnitID true
 #</Plugin>
 
 #<Plugin nut>
@@ -758,6 +782,7 @@ LoadPlugin users
 
 #<Plugin swap>
 #	ReportByDevice false
+#	ReportBytes true
 #</Plugin>
 
 #<Plugin table>
-- 
2.30.2