collectd.conf: Updated sample configurations for 5.2.

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 74770533ff16cd056a8311df3c48489c2e858e61..72105212d2997bafacc46822d922d8ec81f9d664 100644 (file)
--- 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>