From: Sebastian Harl <sh@teamix.net>
Date: Wed, 28 Nov 2012 11:45:14 +0000 (+0100)
Subject: Merged branch 'master' into experimental.
X-Git-Tag: collectd-5.2.0-1--debmon70+1~1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3e85530c01dd20b8eea5e36411e4cda72cda56ac;p=pkg-collectd.git

Merged branch 'master' into experimental.
---

3e85530c01dd20b8eea5e36411e4cda72cda56ac
diff --cc debian/collectd.conf
index 9b6acea,210eb04..a422f40
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@@ -513,14 -444,32 +514,34 @@@ LoadPlugin user
  #</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 modbus>
+ #	<Data "data_name">
+ #		RegisterBase 1234
+ #		RegisterType float
+ #		Type gauge
+ #		Instance "..."
+ #	</Data>
+ #
+ #	<Host "name">
+ #		Address "addr"
+ #		Port "1234"
+ #		Interval 60
+ #
+ #		<Slave 1>
+ #			Instance "foobar" # optional
+ #			Collect "data_name"
+ #		</Slave>
+ #	</Host>
+ #</Plugin>
+ 
  #<Plugin mysql>
  #	<Database db_name>
  #		Host "database.serv.er"