From bd77f3c016a363ae9ab83b75a0745fe16b57f60f Mon Sep 17 00:00:00 2001
From: Sebastian Harl <sh@tokkee.org>
Date: Sat, 19 May 2012 14:26:09 +0200
Subject: [PATCH] changelog, collectd.conf: Added new plugins introduced in
 version 5.1.0.

---
 debian/changelog     |  5 +++++
 debian/collectd.conf | 53 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23e5f1a..7cf0e00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,15 @@ collectd (5.1.0-1) unstable; urgency=low
     New plugins:
     - AMQP output plugin: amqp
     - AIX logical partitions statistics: lpar (disabled in Debian; AIX only)
+    - Network interface card statistics: ethstat
+    - Linux software-RAID device information: md
+    - Information about Non-Uniform Memory Access: numa
     - Redis key-value database server statistics: redis (disabled in Debian;
       libcredis is not available)
     - Check thresholds and for missing values: threshold
     - Varnish HTTP accelerator daemon statistics: varnish
+    - Sends data to Carbon, the storage layer of Graphite: write_graphite
+    - Write values to a MongoDB NoSQL database server: write_mongodb
     - Write values to a Redis key-value database server: write_redis (disabled
       in Debian; libcredis is not available)
     New targets:
diff --git a/debian/collectd.conf b/debian/collectd.conf
index 9f1a918..7477053 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -49,6 +49,7 @@ LoadPlugin disk
 #LoadPlugin dns
 #LoadPlugin email
 LoadPlugin entropy
+#LoadPlugin ethstat
 #LoadPlugin exec
 #LoadPlugin filecount
 #LoadPlugin fscache
@@ -64,6 +65,7 @@ LoadPlugin irq
 LoadPlugin load
 #LoadPlugin madwifi
 #LoadPlugin mbmon
+#LoadPlugin md
 #LoadPlugin memcachec
 #LoadPlugin memcached
 LoadPlugin memory
@@ -76,17 +78,22 @@ LoadPlugin memory
 #LoadPlugin notify_desktop
 #LoadPlugin notify_email
 #LoadPlugin ntpd
+#LoadPlugin numa
 #LoadPlugin nut
 #LoadPlugin olsrd
 #LoadPlugin openvpn
-#LoadPlugin perl
+#<LoadPlugin perl>
+#	Globals true
+#</LoadPlugin>
 #LoadPlugin pinba
 #LoadPlugin ping
 #LoadPlugin postgresql
 #LoadPlugin powerdns
 LoadPlugin processes
 #LoadPlugin protocols
-#LoadPlugin python
+#<LoadPlugin python>
+#	Globals true
+#</LoadPlugin>
 #LoadPlugin rrdcached
 LoadPlugin rrdtool
 #LoadPlugin sensors
@@ -108,7 +115,9 @@ LoadPlugin users
 #LoadPlugin vmem
 #LoadPlugin vserver
 #LoadPlugin wireless
+#LoadPlugin write_graphite
 #LoadPlugin write_http
+#LoadPlugin write_mongodb
 
 #<Plugin amqp>
 #	<Publish "name">
@@ -159,6 +168,8 @@ LoadPlugin users
 #<Plugin "bind">
 #	URL "http://localhost:8053/"
 #
+#	ParseTime false
+#
 #	OpCodes true
 #	QTypes true
 #	ServerStats true
@@ -304,6 +315,13 @@ LoadPlugin users
 #	MaxConns 5
 #</Plugin>
 
+#<Plugin ethstat>
+#	Interface "eth0"
+#	Map "rx_csum_offload_errors" "if_rx_errors" "checksum_offload"
+#	Map "multicast" "if_multicast"
+#	MappedOnly false
+#</Plugin>
+
 #<Plugin exec>
 #	Exec user "/path/to/exec"
 #	Exec "user:group" "/path/to/exec"
@@ -405,6 +423,11 @@ LoadPlugin users
 #	Port 411
 #</Plugin>
 
+#<Plugin md>
+#	Device "/dev/md0"
+#	IgnoreSelected false
+#</Plugin>
+
 #<Plugin memcachec>
 #	<Page "plugin_instance">
 #		Server "localhost"
@@ -679,6 +702,7 @@ LoadPlugin users
 </Plugin>
 
 #<Plugin sensors>
+#	SensorConfigFile "/etc/sensors3.conf"
 #	Sensor "it8712-isa-0290/temperature-temp1"
 #	Sensor "it8712-isa-0290/fanspeed-fan3"
 #	Sensor "it8712-isa-0290/voltage-in8"
@@ -732,6 +756,10 @@ LoadPlugin users
 #	</Host>
 #</Plugin>
 
+#<Plugin swap>
+#	ReportByDevice false
+#</Plugin>
+
 #<Plugin table>
 #	<Table "/proc/slabinfo">
 #		Instance "slabinfo"
@@ -834,6 +862,18 @@ LoadPlugin users
 #	Verbose false
 #</Plugin>
 
+#<Plugin write_graphite>
+#	<Carbon>
+#		Host "localhost"
+#		Port "2003"
+#		Prefix "collectd"
+#		Postfix "collectd"
+#		StoreRates false
+#		AlwaysAppendDS false
+#		EscapeCharacter "_"
+#	</Carbon>
+#</Plugin>
+
 #<Plugin write_http>
 #	<URL "http://example.com/collectd-post">
 #		User "collectd"
@@ -846,6 +886,15 @@ LoadPlugin users
 #	</URL>
 #</Plugin>
 
+#<Plugin write_mongodb>
+#	<Node "example">
+#		Host "localhost"
+#		Port "27017"
+#		Timeout 1000
+#		StoreRates false
+#	<Node>
+#</Plugin>
+
 Include "/etc/collectd/filters.conf"
 Include "/etc/collectd/thresholds.conf"
 
-- 
2.30.2