Merge branch 'ff/gmond'

diff --combined README
index 4134927,1f6973c..a0ce764
--- 1/README
--- 2/README
+++ b/README
@@@ -76,6 -76,9 +76,9 @@@ Feature
      - filecount
        Count the number of files in directories.
  
+     - gmond
+       Receive multicast traffic from Ganglia instances.
+ 
      - hddtemp
        Harddisk temperatures using hddtempd.
  
@@@ -544,24 -547,12 +547,24 @@@ Crosscompilin
    that the compiled binary actually behaves as it should, but since NANs
    are likely never passed to the libm you have a good chance to be lucky.
  
 +  Likewise, collectd needs to know the layout of doubles in memory, in order
 +  to craft uniform network packets over different architectures. For this, it
 +  needs to know how to convert doubles into the memory layout used by x86. The
 +  configure script tries to figure this out by compiling and running a few
 +  small test programs. This is of course not possible when cross-compiling.
 +  You can use the `--with-fp-layout' option to tell the configure script which
 +  conversion method to assume. Valid arguments are:
 +
 +    * `nothing'    (12345678 -> 12345678)
 +    * `endianflip' (12345678 -> 87654321)
 +    * `intswap'    (12345678 -> 56781234)
 +
  
  Contact
  -------
  
 -  For questions, bugreports, development information and basically all other
 -  concerns please send an email to collectd's mailinglist at
 +  For questions, bug reports, development information and basically all other
 +  concerns please send an email to collectd's mailing list at
    <collectd at verplant.org>.
  
    For live discussion and more personal contact visit us in IRC, we're in
@@@ -575,6 -566,5 +578,6 @@@ Autho
    Sebastian tokkee Harl <sh at tokkee.org>,
    and many contributors (see `AUTHORS').
  
 -  Please send bugreports and patches to the mailinglist, see `Contact' above.
 +  Please send bug reports and patches to the mailing list, see `Contact'
 +  above.
  

diff --combined src/collectd.conf.pod
index a97c9a0,11f9b72..8dd53ca
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -454,7 -454,7 +454,7 @@@ finance page and dispatch the value to 
        <Match>
          Regex "<span +class=\"pr\"[^>]*> *([0-9]*\\.[0-9]+) *</span>"
          DSType "GaugeAverage"
 -      # Note: `stock_value' is not a standard type.
 +        # Note: `stock_value' is not a standard type.
          Type "stock_value"
          Instance "AMD"
        </Match>
@@@ -606,9 -606,6 +606,9 @@@ like this
  use a more strict database server, you may have to select from a dummy table or
  something.)
  
 +Please note that some databases, for example B<Oracle>, will fail if you
 +include a semicolon at the end of the statement.
 +
  =item B<MinVersion> I<Version>
  
  =item B<MaxVersion> I<Value>
@@@ -962,6 -959,88 +962,88 @@@ Controls whether or not to recurse int
  
  =back
  
+ =head2 Plugin C<gmond>
+ 
+ The I<gmond> plugin received the multicast traffic sent by B<gmond>, the
+ statistics collection daemon of Ganglia. Mappings for the standard "metrics"
+ are built-in, custom mappings may be added via B<Metric> blocks, see below.
+ 
+ Synopsis:
+ 
+  <Plugin "gmond">
+    MCReceiveFrom "239.2.11.71" "8649"
+    <Metric "swap_total">
+      Type "swap"
+      TypeInstance "total"
+      DataSource "value"
+    </Metric>
+    <Metric "swap_free">
+      Type "swap"
+      TypeInstance "free"
+      DataSource "value"
+    </Metric>
+  </Plugin>
+ 
+ The following metrics are built-in:
+ 
+ =over 4
+ 
+ =item *
+ 
+ load_one, load_five, load_fifteen
+ 
+ =item *
+ 
+ cpu_user, cpu_system, cpu_idle, cpu_nice, cpu_wio
+ 
+ =item *
+ 
+ mem_free, mem_shared, mem_buffers, mem_cached, mem_total
+ 
+ =item *
+ 
+ bytes_in, bytes_out
+ 
+ =item *
+ 
+ pkts_in, pkts_out
+ 
+ =back
+ 
+ Available configuration options:
+ 
+ =over 4
+ 
+ =item B<MCReceiveFrom> I<MCGroup> [I<Port>]
+ 
+ Sets sets the multicast group and UDP port to which to subscribe.
+ 
+ Default: B<239.2.11.71>E<nbsp>/E<nbsp>B<8649>
+ 
+ =item E<lt>B<Metric> I<Name>E<gt>
+ 
+ These blocks add a new metric conversion to the internal table. I<Name>, the
+ string argument to the B<Metric> block, is the metric name as used by Ganglia.
+ 
+ =over 4
+ 
+ =item B<Type> I<Type>
+ 
+ Type to map this metric to. Required.
+ 
+ =item B<TypeInstance> I<Instance>
+ 
+ Type-instance to use. Optional.
+ 
+ =item B<DataSource> I<Name>
+ 
+ Data source to map this metric to. If the configured type has exactly one data
+ source, this is optional. Otherwise the option is required.
+ 
+ =back
+ 
+ =back
+ 
  =head2 Plugin C<hddtemp>
  
  To get values from B<hddtemp> collectd connects to B<localhost> (127.0.0.1),