Merge branch 'pr/2454'

diff --combined src/collectd.conf.in
index 7b685aa,c2b3598..655910d
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -495,7 -495,6 +495,7 @@@
  #             </Result>
  #     </Query>
  #     <Database "customers_db">
 +#             #Plugin "mycompany"
  #             Driver "mysql"
  #             DriverOption "host" "localhost"
  #             DriverOption "username" "collectd"
@@@ -1046,7 -1045,6 +1046,7 @@@
  #    </Result>
  #  </Query>
  #  <Database "product_information">
 +#    #Plugin "warehouse"
  #    ConnectID "db01"
  #    Username "oracle"
  #    Password "secret"
@@@ -1133,7 -1131,6 +1133,7 @@@
  #             StoreRates true
  #     </Writer>
  #     <Database foo>
 +#             #Plugin "kingdom"
  #             Host "hostname"
  #             Port "5432"
  #             User "username"
@@@ -1173,6 -1170,7 +1173,7 @@@
  #<Plugin processes>
  #     CollectFileDescriptor true
  #     CollectContextSwitch true
+ #     CollectMemoryMaps true
  #     Process "name"
  #     ProcessMatch "name" "regex"
  #     <Process "collectd">

diff --combined src/collectd.conf.pod
index 383c12b,b392baa..44ecd36
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -1624,7 -1624,6 +1624,7 @@@ finance page and dispatch the value to 
  
    <Plugin curl>
      <Page "stock_quotes">
 +      Plugin "quotes"
        URL "http://finance.google.com/finance?q=NYSE%3AAMD"
        User "foo"
        Password "bar"
@@@ -1656,11 -1655,6 +1656,11 @@@ The following options are valid within 
  
  =over 4
  
 +=item B<Plugin> I<Plugin>
 +
 +Use I<Plugin> as the plugin name when submitting values.
 +Defaults to C<curl>.
 +
  =item B<URL> I<URL>
  
  URL of the web site to retrieve. Since a regular expression will be used to
@@@ -1821,11 -1815,6 +1821,11 @@@ The following options are valid within 
  Use I<Name> as the host name when submitting values. Defaults to the global
  host name setting.
  
 +=item B<Plugin> I<Plugin>
 +
 +Use I<Plugin> as the plugin name when submitting values.
 +Defaults to C<curl_json>.
 +
  =item B<Instance> I<Instance>
  
  Sets the plugin instance to I<Instance>.
@@@ -2041,7 -2030,6 +2041,7 @@@ than those of other plugins. It usuall
        </Result>
      </Query>
      <Database "product_information">
 +      #Plugin "warehouse"
        Driver "mysql"
        Interval 120
        DriverOption "host" "localhost"
@@@ -2223,11 -2211,6 +2223,11 @@@ the daemon. Other than that, that name 
  
  =over 4
  
 +=item B<Plugin> I<Plugin>
 +
 +Use I<Plugin> as the plugin name when submitting query results from
 +this B<Database>. Defaults to C<dbi>.
 +
  =item B<Interval> I<Interval>
  
  Sets the interval (in seconds) in which the values will be collected from this
@@@ -3690,7 -3673,6 +3690,7 @@@ Synopsis of the configuration
     <Page "plugin_instance">
       Server "localhost"
       Key "page_key"
 +     Plugin "plugin_name"
       <Match>
         Regex "(\\d+) bytes sent"
         DSType CounterAdd
@@@ -3718,11 -3700,6 +3718,11 @@@ B<Page> block
  
  When connected to the memcached server, asks for the page I<Key>.
  
 +=item B<Plugin> I<Plugin>
 +
 +Use I<Plugin> as the plugin name when submitting values.
 +Defaults to C<memcachec>.
 +
  =item E<lt>B<Match>E<gt>
  
  Match blocks define which strings to look for and how matches substrings are
@@@ -5771,7 -5748,6 +5771,7 @@@ plugin's documentation above for detail
        </Result>
      </Query>
      <Database "product_information">
 +      #Plugin "warehouse"
        ConnectID "db01"
        Username "oracle"
        Password "secret"
@@@ -5794,11 -5770,6 +5794,11 @@@ values submitted to the daemon. Other t
  
  =over 4
  
 +=item B<Plugin> I<Plugin>
 +
 +Use I<Plugin> as the plugin name when submitting query results from
 +this B<Database>. Defaults to C<oracle>.
 +
  =item B<ConnectID> I<ID>
  
  Defines the "database alias" or "service name" to connect to. Usually, these
@@@ -5854,7 -5825,7 +5854,7 @@@ The address of the OVS DB server JSON-R
  enable the interface, OVS DB daemon should be running with C<--remote=ptcp:>
  option. See L<ovsdb-server(1)> for more details. The option may be either
  network hostname, IPv4 numbers-and-dots notation or IPv6 hexadecimal string
 -format. Defaults to B<'localhost'>.
 +format. Defaults to C<localhost>.
  
  =item B<Port> I<service>
  
@@@ -5920,7 -5891,7 +5920,7 @@@ The address of the OVS DB server JSON-R
  enable the interface, OVS DB daemon should be running with C<--remote=ptcp:>
  option. See L<ovsdb-server(1)> for more details. The option may be either
  network hostname, IPv4 numbers-and-dots notation or IPv6 hexadecimal string
 -format. Defaults to B<'localhost'>.
 +format. Defaults to C<localhost>.
  
  =item B<Port> I<service>
  
@@@ -6152,7 -6123,6 +6152,7 @@@ L<http://www.postgresql.org/docs/manual
      </Writer>
  
      <Database foo>
 +      Plugin "kingdom"
        Host "hostname"
        Port "5432"
        User "username"
@@@ -6474,11 -6444,6 +6474,11 @@@ activating this option. The draw-back i
  amount of time will be lost, for example, if a single statement within the
  transaction fails or if the database server crashes.
  
 +=item B<Plugin> I<Plugin>
 +
 +Use I<Plugin> as the plugin name when submitting query results from
 +this B<Database>. Defaults to C<postgresql>.
 +
  =item B<Instance> I<name>
  
  Specify the plugin instance name that should be used instead of the database
@@@ -6743,6 -6708,7 +6743,7 @@@ collected for these selected processes 
   - number of processes
   - number of threads
   - number of open files (under Linux)
+  - number of memory mapped files (under Linux)
   - io data (where available)
   - context switches (under Linux)
   - minor and major pagefaults.
@@@ -6763,6 -6729,12 +6764,12 @@@ slashes
  
  Collect context switch of the process.
  
+ =item B<CollectMemoryMaps> I<Boolean>
+ 
+ Collect the number of memory mapped files of the process.
+ The limit for this number is configured via F</proc/sys/vm/max_map_count> in
+ the Linux kernel.
+ 
  =back
  
  =head2 Plugin C<protocols>
@@@ -7738,7 -7710,6 +7745,7 @@@ user using (extended) regular expressio
  
    <Plugin "tail">
      <File "/var/log/exim4/mainlog">
 +      Plugin "mail"
        Instance "exim"
        Interval 60
        <Match>
@@@ -7771,13 -7742,11 +7778,13 @@@ The config consists of one or more B<Fi
  logfile to parse. Within each B<File> block, there are one or more B<Match>
  blocks, which configure a regular expression to search for.
  
 -The B<Instance> option in the B<File> block may be used to set the plugin
 -instance. So in the above example the plugin name C<tail-foo> would be used.
 -This plugin instance is for all B<Match> blocks that B<follow> it, until the
 -next B<Instance> option. This way you can extract several plugin instances from
 -one logfile, handy when parsing syslog and the like.
 +The B<Plugin> and B<Instance> options in the B<File> block may be used to set
 +the plugin name and instance respectively. So in the above example the plugin name
 +C<mail-exim> would be used.
 +
 +These options are applied for all B<Match> blocks that B<follow> it, until the
 +next B<Plugin> or B<Instance> option. This way you can extract several plugin
 +instances from one logfile, handy when parsing syslog and the like.
  
  The B<Interval> option allows you to define the length of time between reads. If
  this is not set, the default Interval will be used.
@@@ -7965,8 -7934,7 +7972,8 @@@ B<Synopsis:
         Index 1
     </Metric>
     <File "/var/log/snort/snort.stats">
 -       Instance "snort-eth0"
 +       Plugin "snortstats"
 +       Instance "eth0"
         Interval 600
         Collect "snort-dropped"
     </File>
@@@ -8018,11 -7986,6 +8025,11 @@@ I<File> block but there can be multipl
  
  =over 4
  
 +=item B<Plugin> I<Plugin>
 +
 +Use I<Plugin> as the plugin name when submitting values.
 +Defaults to C<tail_csv>.
 +
  =item B<Instance> I<PluginInstance>
  
  Sets the I<plugin instance> used when dispatching the values.
@@@ -9367,7 -9330,6 +9374,7 @@@ Synopsis
          Prefix "collectd/"
          Database 1
          MaxSetSize -1
 +        MaxSetDuration -1
          StoreRates true
      </Node>
    </Plugin>
@@@ -9430,12 -9392,6 +9437,12 @@@ to C<0>
  The B<MaxSetSize> option limits the number of items that the I<Sorted Sets> can
  hold. Negative values for I<Items> sets no limit, which is the default behavior.
  
 +=item B<MaxSetDuration> I<Seconds>
 +
 +The B<MaxSetDuration> option limits the duration of items that the
 +I<Sorted Sets> can hold. Negative values for I<Items> sets no duration, which
 +is the default behavior.
 +
  =item B<StoreRates> B<true>|B<false>
  
  If set to B<true> (the default), convert counter values to rates. If set to