Merge branch 'pyr/riemann'

[collectd.git] / src / collectd.conf.in

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index db81a4ad5241c36ad0135a035c47051a1f9c4afd..9c02ce603a07993e0a3e292727c781d0946ffa78 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -28,6 +28,7 @@
 
 #Timeout      2
 #ReadThreads  5
+#WriteThreads 5
 
 ##############################################################################
 # Logging                                                                    #
@@ -159,8 +160,9 @@
 #@BUILD_PLUGIN_WIRELESS_TRUE@LoadPlugin wireless
 #@BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@LoadPlugin write_graphite
 #@BUILD_PLUGIN_WRITE_HTTP_TRUE@LoadPlugin write_http
-#@BUILD_PLUGIN_WRITE_REDIS_TRUE@LoadPlugin write_redis
 #@BUILD_PLUGIN_WRITE_MONGODB_TRUE@LoadPlugin write_mongodb
+#@BUILD_PLUGIN_WRITE_REDIS_TRUE@LoadPlugin write_redis
+#@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@LoadPlugin write_riemann
 #@BUILD_PLUGIN_XMMS_TRUE@LoadPlugin xmms
 #@BUILD_PLUGIN_ZFS_ARC_TRUE@LoadPlugin zfs_arc
 
@@ -217,6 +219,7 @@
 #<Plugin apcups>
 #      Host "localhost"
 #      Port "3551"
+#      ReportSeconds true
 #</Plugin>
 
 #<Plugin ascent>
@@ -334,6 +337,7 @@
 #              #SelectDB "custdb0"
 #              Query "num_of_customers"
 #              #Query "..."
+#              #Host "..."
 #      </Database>
 #</Plugin>
 
@@ -1040,23 +1044,32 @@
 #      </URL>
 #</Plugin>
 
-#<Plugin write_redis>
+#<Plugin write_mongodb>
 #      <Node "example">
 #              Host "localhost"
-#              Port "6379"
+#              Port "27017"
 #              Timeout 1000
+#              StoreRates false
 #      </Node>
 #</Plugin>
 
-#<Plugin write_mongodb>
+#<Plugin write_redis>
 #      <Node "example">
 #              Host "localhost"
-#              Port "27017"
+#              Port "6379"
 #              Timeout 1000
-#              StoreRates false
 #      </Node>
 #</Plugin>
 
+#<Plugin write_riemann>
+#      <Node "example">
+#              Host "localhost">
+#              Port 5555
+#              StoreRates true
+#      </Node>
+#      Tag "foobar"
+#</Plugin>
+
 ##############################################################################
 # Filter configuration                                                       #
 #----------------------------------------------------------------------------#