From: Florian Forster Date: Tue, 19 Aug 2008 09:19:08 +0000 (+0200) Subject: Merge branch 'ph/ipmi' X-Git-Tag: collectd-4.5.0~67 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=6a968db27aab6d8c4cfe4f6e4c5bf3183eb84794;hp=-c;p=collectd.git Merge branch 'ph/ipmi' --- 6a968db27aab6d8c4cfe4f6e4c5bf3183eb84794 diff --combined AUTHORS index ff3dce30,35cbec60..d924a910 --- a/AUTHORS +++ b/AUTHORS @@@ -4,8 -4,8 +4,8 @@@ This package was written by apcups plugin by: Anthony Gialluca - 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 hddtemp plugin by: @@@ -47,9 -47,6 +47,9 @@@ tape plugin by teamspeak2 plugin by: Stefan Hacker +tcpconns plugin: + Michael Stapelberg (OpenBSD port) + users plugin by: Sebastian Harl diff --combined src/collectd.conf.pod index 5a1ced2b,c8d9a120..11a41922 --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod @@@ -472,6 -472,38 +472,38 @@@ other interfaces are collected =back + =head2 Plugin C + + =over 4 + + =item B I + + Selects sensors to collect or to ignore, depending on B. + + =item B I|I + + If no configuration if given, the B 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 to I + the effect of B is inverted: All selected sensors are ignored and + all other sensors are collected. + + =item B I|I + + If a sensor appears after initialization time of a minute a notification + is sent. + + =item B I|I + + If a sensor disappears a notification is sent. + + =item B I|I + + If you have for example dual power supply and one of them is (un)plugged then + a notification is sent. + + =back + =head2 Plugin C =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 I [I] Specify the I and optional I used to dispatch the value @@@ -1090,43 -1119,23 +1122,43 @@@ B 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 file which, by default, is available at +C/share/collectd/>): =over 4 -=item B +=item B + +This query collects the number of backends, i.Ee. the number of +connected clients. + +=item B + +This query collects the numbers of committed and rolled-back transactions of +the user tables. + +=item B + +This query collects the numbers of various table modifications (i.Ee. +insertions, updates, deletions) of the user tables. + +=item B + +This query collects the numbers of various table scans and returned tuples of +the user tables. + +=item B -This query collects general database statistics, i.Ee. 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 +=item B -This query collects user-table usage statistics, i.Ee. 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 +=item B -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 for details Specify a I 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