X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=README;h=5071617209c7a76d7779cc4a9cfed1972605b464;hb=d4732c5d271e9624019ad6771fad3b6aa304e380;hp=2f80cc896475759d352c9ac21d3e87ba316c7070;hpb=79c87aeda9172e219a842e393c6499c8bf37662a;p=collectd.git
diff --git a/README b/README
index 2f80cc89..50716172 100644
--- a/README
+++ b/README
@@ -43,10 +43,6 @@ Features
- conntrack
Number of nf_conntrack entries.
- - curl_json
- Retrieves JSON data via cURL and parses it according to user
- configuration.
-
- cpu
CPU utilization: Time spent in the system, user, nice, idle, and related
states.
@@ -54,6 +50,10 @@ Features
- cpufreq
CPU frequency (For laptops with speed step or a similar technology)
+ - curl_json
+ Retrieves JSON data via cURL and parses it according to user
+ configuration.
+
- dbi
Executes SQL statements on various databases and interprets the returned
data.
@@ -481,11 +481,16 @@ Prerequisites
If present, the uuid plugin will check for UUID from HAL.
- * libiptc (optional, if not found a version shipped with this distribution
- can be used if the Linux kernel headers are available)
+ * libiptc (optional)
For querying iptables counters.
+ If not found on the system, a version shipped with this distribution can
+ be used. It requires some Linux headers in /usr/include/linux. You can
+ force the build system to use the shipped version by specifying
+ --with-libiptc=shipped
+ when running the configure script.
+
* libjvm (optional)
Library that encapsulates the `Java Virtual Machine' (JVM). This library is
used by the Java plugin to execute Java bytecode. See âConfiguring with
@@ -568,7 +573,7 @@ Prerequisites
* libyajl (optional)
Parse JSON data. This is needed for the `curl_json' plugin.
-
+
Configuring / Compiling / Installing
------------------------------------