upstart example config: clarify expect stanza ambiguity

[collectd.git] / README

diff --git a/README b/README
index 3e3a030..723060c 100644 (file)
--- a/README
+++ b/README
@@ -229,6 +229,9 @@ Features
       Read onewire sensors using the owcapu library of the owfs project.
       Please read in collectd.conf(5) why this plugin is experimental.
 
       Read onewire sensors using the owcapu library of the owfs project.
       Please read in collectd.conf(5) why this plugin is experimental.
 

+    - openldap
+      Read monitoring information from OpenLDAP's cn=Monitor subtree.
+

     - openvpn
       RX and TX of each client in openvpn-status.log (status-version 2).
       <http://openvpn.net/index.php/documentation/howto.html>
     - openvpn
       RX and TX of each client in openvpn-status.log (status-version 2).
       <http://openvpn.net/index.php/documentation/howto.html>


@@ -293,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


@@ -364,6 +371,9 @@ Features
     - zfs_arc
       Statistics for ZFS' “Adaptive Replacement Cache” (ARC).
 
     - zfs_arc
       Statistics for ZFS' “Adaptive Replacement Cache” (ARC).
 

+    - zookeeper
+      Read data from Zookeeper's MNTR command.
+

   * Output can be written or sent to various destinations by the following
     plugins:
 
   * Output can be written or sent to various destinations by the following
     plugins:
 


@@ -604,12 +614,16 @@ Prerequisites
     particular.
     <http://developer.apple.com/corefoundation/>
 
     particular.
     <http://developer.apple.com/corefoundation/>
 

+  * libatasmart (optional)
+    Used by the `smart' plugin.
+    <http://git.0pointer.de/?p=libatasmart.git>
+

   * libclntsh (optional)
     Used by the `oracle' plugin.
 
   * libclntsh (optional)
     Used by the `oracle' plugin.
 

-  * libcredis (optional)
-    Used by the `redis' plugin. Please note that you require a 0.2.2 version
-    or higher. <http://code.google.com/p/credis/>
+  * libhiredis (optional)
+    Used by the redis plugin. Please note that you require a 0.10.0 version
+    or higher. <https://github.com/redis/hiredis>

 
   * libcurl (optional)
     If you want to use the `apache', `ascent', `bind', `curl', `curl_json',
 
   * libcurl (optional)
     If you want to use the `apache', `ascent', `bind', `curl', `curl_json',


@@ -650,6 +664,10 @@ Prerequisites
     libjvm” below.
     <http://openjdk.java.net/> (and others)
 
     libjvm” below.
     <http://openjdk.java.net/> (and others)
 

+  * libldap (optional)
+    Used by the `openldap' plugin.
+    <http://www.openldap.org/>
+

   * liblvm2 (optional)
     Used by the `lvm' plugin.
     <ftp://sources.redhat.com/pub/lvm2/>
   * liblvm2 (optional)
     Used by the `lvm' plugin.
     <ftp://sources.redhat.com/pub/lvm2/>


@@ -858,6 +876,23 @@ Configuring with libjvm
   Adding "-ljvm" to the JAVA_LDFLAGS is done automatically, you don't have to
   do that.
 
   Adding "-ljvm" to the JAVA_LDFLAGS is done automatically, you don't have to
   do that.
 

+Generating the configure script
+-------------------------------
+
+Collectd ships with a `build.sh' script to generate the `configure'
+script shipped with releases.
+
+To generate the `configure` script, you'll need the following dependencies:
+
+- autoconf
+- automke
+- flex
+- bison
+- libtool
+- libtool-ltdl
+
+The `build.sh' script takes no arguments.
+

 Crosscompiling
 --------------
 
 Crosscompiling
 --------------