From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 6 Nov 2010 08:04:39 +0000 (+0100)
Subject: Merge branch 'sp/amqp'
X-Git-Tag: collectd-5.0.0-beta0~28
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=626041ce6fa004ce49c183f35147f762a63cf302

Merge branch 'sp/amqp'
---

626041ce6fa004ce49c183f35147f762a63cf302
diff --cc src/collectd.conf.in
index 12cec759,31a113a0..42addd27
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -150,13 -149,25 +151,27 @@@
  # ription of those options is available in the collectd.conf(5) manual page. #
  ##############################################################################
  
+ #<Plugin "amqp">
+ #  <Publish "name">
+ #    Host "localhost"
+ #    Port "5672"
+ #    VHost "/"
+ #    User "guest"
+ #    Password "guest"
+ #    Exchange "amq.fanout"
+ #    RoutingKey "collectd"
+ #    Persistent false
+ #    StoreRates false
+ #  </Publish>
+ #</Plugin>
+ 
  #<Plugin apache>
 -#	URL "http://localhost/status?auto"
 -#	User "www-user"
 -#	Password "secret"
 -#	CACert "/etc/ssl/ca.crt"
 +#  <Instance "local">
 +#    URL "http://localhost/status?auto"
 +#    User "www-user"
 +#    Password "secret"
 +#    CACert "/etc/ssl/ca.crt"
 +#  </Instance>
  #</Plugin>
  
  #<Plugin apcups>