Merge pull request #719 from mfournier/openldap-improvements-rebased

[collectd.git] / README

diff --git a/README b/README
index 90550af..76d2e4f 100644 (file)
--- a/README
+++ b/README
@@ -146,9 +146,6 @@ Features
       Detailed CPU statistics of the “Logical Partitions” virtualization
       technique built into IBM's POWER processors.
 
       Detailed CPU statistics of the “Logical Partitions” virtualization
       technique built into IBM's POWER processors.
 

-    - libvirt
-      CPU, memory, disk and network I/O statistics from virtual machines.
-

     - lvm
       Size of “Logical Volumes” (LV) and “Volume Groups” (VG) of Linux'
       “Logical Volume Manager” (LVM).
     - lvm
       Size of “Logical Volumes” (LV) and “Volume Groups” (VG) of Linux'
       “Logical Volume Manager” (LVM).


@@ -299,6 +296,10 @@ Features
       to have its measurements fed to collectd. This includes multimeters,
       sound level meters, thermometers, and much more.
 
       to have its measurements fed to collectd. This includes multimeters,
       sound level meters, thermometers, and much more.
 

+    - smart
+      Collect SMART statistics, notably load cycle count, temperature
+      and bad sectors.
+

     - snmp
       Read values from SNMP (Simple Network Management Protocol) enabled
       network devices such as switches, routers, thermometers, rack monitoring
     - snmp
       Read values from SNMP (Simple Network Management Protocol) enabled
       network devices such as switches, routers, thermometers, rack monitoring


@@ -350,6 +351,9 @@ Features
     - varnish
       Various statistics from Varnish, an HTTP accelerator.
 
     - varnish
       Various statistics from Varnish, an HTTP accelerator.
 

+    - virt
+      CPU, memory, disk and network I/O statistics from virtual machines.
+

     - vmem
       Virtual memory statistics, e. g. the number of page-ins/-outs or the
       number of pagefaults.
     - vmem
       Virtual memory statistics, e. g. the number of page-ins/-outs or the
       number of pagefaults.


@@ -782,7 +786,7 @@ Prerequisites
 
   * libxml2 (optional)
     Parse XML data. This is needed for the `ascent', `bind', `curl_xml' and
 
   * libxml2 (optional)
     Parse XML data. This is needed for the `ascent', `bind', `curl_xml' and

-    `libvirt' plugins.
+    `virt' plugins.

     <http://xmlsoft.org/>
 
   * libxmms (optional)
     <http://xmlsoft.org/>
 
   * libxmms (optional)