Merge branch 'ph/ipmi'

diff --combined AUTHORS
index ff3dce3,35cbec6..d924a91
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -4,8 -4,8 +4,8 @@@ This package was written by
  apcups plugin by:
    Anthony Gialluca <tonyabg at charter.net>
  
- cpufreq, multimeter and irq plugin, as well as some bugfixes in the exec plugin
- by:
+ cpufreq, multimeter and irq plugin, some bugfixes in the exec plugin,
+ notifications in the ipmi plugin by:
    Peter Holik <peter at holik.at>
  
  hddtemp plugin by:
@@@ -47,9 -47,6 +47,9 @@@ tape plugin by
  teamspeak2 plugin by:
    Stefan Hacker <stefan.hacker at web.de>
  
 +tcpconns plugin:
 +  Michael Stapelberg <michael+git@stapelberg.de> (OpenBSD port)
 +
  users plugin by:
    Sebastian Harl <sh at tokkee.org>
  

diff --combined src/collectd.conf.pod
index 5a1ced2,c8d9a12..11a4192
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -472,6 -472,38 +472,38 @@@ other interfaces are collected
  
  =back
  
+ =head2 Plugin C<ipmi>
+ 
+ =over 4
+ 
+ =item B<Sensor> I<Sensor>
+ 
+ Selects sensors to collect or to ignore, depending on B<IgnoreSelected>.
+ 
+ =item B<IgnoreSelected> I<true>|I<false>
+ 
+ If no configuration if given, the B<ipmi> plugin will collect data from all
+ sensors found of type "temperature", "voltage", "current" and "fanspeed".
+ This option enables you to do that: By setting B<IgnoreSelected> to I<true>
+ the effect of B<Sensor> is inverted: All selected sensors are ignored and
+ all other sensors are collected.
+ 
+ =item B<NotifySensorAdd> I<true>|I<false>
+ 
+ If a sensor appears after initialization time of a minute a notification
+ is sent.
+ 
+ =item B<NotifySensorRemove> I<true>|I<false>
+ 
+ If a sensor disappears a notification is sent.
+ 
+ =item B<NotifySensorNotPresent> I<true>|I<false>
+ 
+ If you have for example dual power supply and one of them is (un)plugged then
+ a notification is sent.
+ 
+ =back
+ 
  =head2 Plugin C<iptables>
  
  =over 4
@@@ -1078,9 -1110,6 +1110,9 @@@ The username used to connect to the dat
  
  =back
  
 +Please note that parameters are only supported by PostgreSQL's protocol
 +version 3 and above which was introduced in version 7.4 of PostgreSQL.
 +
  =item B<Column> I<type> [I<type instance>]
  
  Specify the I<type> and optional I<type instance> used to dispatch the value
@@@ -1090,43 -1119,23 +1122,43 @@@ B<Column> options has to match the colu
  
  =back
  
 -The following predefined queries are available:
 +The following predefined queries are available (the definitions can be found
 +in the F<postgresql_default.conf> file which, by default, is available at
 +C<I<prefix>/share/collectd/>):
  
  =over 4
  
 -=item B<database>
 +=item B<backends>
 +
 +This query collects the number of backends, i.E<nbsp>e. the number of
 +connected clients.
 +
 +=item B<transactions>
 +
 +This query collects the numbers of committed and rolled-back transactions of
 +the user tables.
 +
 +=item B<queries>
 +
 +This query collects the numbers of various table modifications (i.E<nbsp>e.
 +insertions, updates, deletions) of the user tables.
 +
 +=item B<query_plans>
 +
 +This query collects the numbers of various table scans and returned tuples of
 +the user tables.
 +
 +=item B<table_states>
  
 -This query collects general database statistics, i.E<nbsp>e. the number of
 -backends and committed and rolled-back transactions.
 +This query collects the numbers of live and dead rows in the user tables.
  
 -=item B<user_tables>
 +=item B<disk_io>
  
 -This query collects user-table usage statistics, i.E<nbsp>e. the numbers of
 -various table scans and the numbers of various table modifications.
 +This query collects disk block access counts for user tables.
  
 -=item B<io_user_tables>
 +=item B<disk_usage>
  
 -This query collects block access counts for user-tables.
 +This query collects the on-disk size of the database in bytes.
  
  =back
  
@@@ -1207,9 -1216,8 +1239,9 @@@ B<PostgreSQL Documentation> for details
  
  Specify a I<query> which should be executed for the database connection. This
  may be any of the predefined or user-defined queries. If no such option is
 -given, it defaults to "database", "user_tables" and "io_user_tables". Else,
 -the specified queries are used only.
 +given, it defaults to "backends", "transactions", "queries", "query_plans",
 +"table_states", "disk_io" and "disk_usage". Else, the specified queries are
 +used only.
  
  =back