Merge branch 'ps/tokyotyrant'

diff --combined src/collectd.conf.in
index 9648e5a,54afd0f..2b495fa
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -118,6 -118,7 +118,7 @@@ FQDNLookup   tru
  #@BUILD_PLUGIN_TEAMSPEAK2_TRUE@LoadPlugin teamspeak2
  #@BUILD_PLUGIN_TED_TRUE@LoadPlugin ted
  #@BUILD_PLUGIN_THERMAL_TRUE@LoadPlugin thermal
+ #@BUILD_PLUGIN_TOKYOTYRANT_TRUE@LoadPlugin tokyotyrant
  #@BUILD_PLUGIN_UNIXSOCK_TRUE@LoadPlugin unixsock
  #@BUILD_PLUGIN_UPTIME_TRUE@LoadPlugin uptime
  #@BUILD_PLUGIN_USERS_TRUE@LoadPlugin users
@@@ -608,7 -609,7 +609,7 @@@
  #       Version 1
  #       Community "community_string"
  #       Collect "std_traffic"
 -#       Inverval 120
 +#       Interval 120
  #   </Host>
  #   <Host "some.server.mydomain.org">
  #       Address "192.168.0.42"
@@@ -685,6 -686,11 +686,11 @@@
  #     IgnoreSelected false
  #</Plugin>
  
+ #<Plugin tokyotyrant>
+ #     Host "localhost"
+ #     Port 1978
+ #</Plugin>
+ 
  #<Plugin unixsock>
  #     SocketFile "@prefix@/var/run/@PACKAGE_NAME@-unixsock"
  #     SocketGroup "collectd"

diff --combined src/collectd.conf.pod
index 5ceba61,80f26b6..e401d42
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -3316,6 -3316,26 +3316,26 @@@ selection is configured at all, B<all> 
  
  =back
  
+ =head2 Plugin C<tokyotyrant>
+ 
+ The C<tokyotyrant plugin> connects to a TokyoTyrant server and collects a 
+ couple metrics: number of records, and database size on disk.
+ 
+ =over 4
+ 
+ =item B<Host> I<Hostname/IP>
+ 
+ The hostname or ip which identifies the server.
+ Default: B<127.0.0.1>
+ 
+ =item B<Port> I<Service/Port>
+ 
+ The query port of the server. This needs to be a string, even if the port is
+ given in its numeric form.
+ Default: B<1978>
+ 
+ =back
+ 
  =head2 Plugin C<unixsock>
  
  =over 4
@@@ -3537,13 -3557,6 +3557,13 @@@ This applies to missing values, too: I
  missing value is generated once every B<Interval> seconds. If set to B<false>
  only one such notification is generated until the value appears again.
  
 +=item B<Percentage> B<true>|B<false>
 +
 +If set to B<true>, the minimum and maximum values given are interpreted as
 +percentage value, relative to the other data sources. This is helpful for
 +example for the "df" type, where you may want to issue a warning when less than
 +5E<nbsp>% of the total space is available. Defaults to B<false>.
 +
  =back
  
  =head1 FILTER CONFIGURATION