From 10cf0cf31853309d4c5fb204fb527c9286161448 Mon Sep 17 00:00:00 2001
From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 2 May 2013 22:28:11 +0200
Subject: [PATCH] collectd.conf: Updated for 5.3.0.

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

diff --git a/debian/collectd.conf b/debian/collectd.conf
index a422f40..2fcf6cf 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -29,6 +29,7 @@ FQDNLookup true
 
 #Timeout 2
 #ReadThreads 5
+#WriteThreads 5
 
 ##############################################################################
 # Logging                                                                    #
@@ -133,6 +134,7 @@ LoadPlugin rrdtool
 LoadPlugin swap
 #LoadPlugin table
 #LoadPlugin tail
+#LoadPlugin tail_csv
 #LoadPlugin tcpconns
 #LoadPlugin teamspeak2
 #LoadPlugin ted
@@ -149,6 +151,7 @@ LoadPlugin users
 #LoadPlugin write_graphite
 #LoadPlugin write_http
 #LoadPlugin write_mongodb
+#LoadPlugin write_riemann
 
 ##############################################################################
 # Plugin configuration                                                       #
@@ -212,6 +215,7 @@ LoadPlugin users
 #<Plugin apcups>
 #	Host "localhost"
 #	Port "3551"
+#	ReportSeconds true
 #</Plugin>
 
 #<Plugin ascent>
@@ -340,6 +344,7 @@ LoadPlugin users
 #		SelectDB "custdb0"
 #		Query "num_of_customers"
 #		Query "..."
+#		Host "..."
 #	</Database>
 #</Plugin>
 
@@ -789,6 +794,7 @@ LoadPlugin users
 #	DaemonAddress "unix:/var/run/rrdcached.sock"
 #	DataDir "/var/lib/rrdcached/db/collectd"
 #	CreateFiles true
+#	CreateFilesAsync false
 #	CollectStatistics true
 #
 # The following settings are rather advanced
@@ -805,6 +811,7 @@ LoadPlugin users
 #	CacheTimeout 120
 #	CacheFlush 900
 #	WritesPerSecond 30
+#	CreateFilesAsync false
 #	RandomTimeout 0
 #
 # The following settings are rather advanced
@@ -914,6 +921,33 @@ LoadPlugin users
 #	</File>
 #</Plugin>
 
+#<Plugin "tail_csv">
+#	<Metric "dropped">
+#		Type "percent"
+#		Instance "dropped"
+#		ValueFrom 1
+#	</Metric>
+#	<Metric "mbps">
+#		Type "bytes"
+#		Instance "wire-realtime"
+#		ValueFrom 2
+#	</Metric>
+#	<Metric "alerts">
+#		Type "alerts_per_second"
+#		ValueFrom 3
+#	</Metric>
+#	<Metric "kpps">
+#		Type "kpackets_wire_per_sec.realtime"
+#		ValueFrom 4
+#	</Metric>
+#	<File "/var/log/snort/snort.stats">
+#		Instance "snort-eth0"
+#		Interval 600
+#		Collect "dropped" "mbps" "alerts" "kpps"
+#		TimeFrom 0
+#	</File>
+#</Plugin>
+
 #<Plugin tcpconns>
 #	ListeningPorts false
 #	LocalPort "25"
@@ -979,15 +1013,15 @@ LoadPlugin users
 #</Plugin>
 
 #<Plugin write_graphite>
-#	<Carbon>
+#	<Node "example">
 #		Host "localhost"
 #		Port "2003"
 #		Prefix "collectd"
 #		Postfix "collectd"
-#		StoreRates false
+#		StoreRates true
 #		AlwaysAppendDS false
 #		EscapeCharacter "_"
-#	</Carbon>
+#	</Node>
 #</Plugin>
 
 #<Plugin write_http>
@@ -1011,6 +1045,17 @@ LoadPlugin users
 #	<Node>
 #</Plugin>
 
+#<Plugin write_riemann>
+#	<Node "example">
+#		Host "localhost"
+#		Port 5555
+#		Protocol UDP
+#		StoreRates true
+#		AlwaysAppendDS false
+#	</Node>
+#	Tag "foobar"
+#</Plugin>
+
 Include "/etc/collectd/filters.conf"
 Include "/etc/collectd/thresholds.conf"
 
-- 
2.30.2