projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.8'
[collectd.git]
/
README
diff --git
a/README
b/README
index
a737f86
..
4641788
100644
(file)
--- a/
README
+++ b/
README
@@
-33,9
+33,6
@@
Features
Batterycharge, -current and voltage of ACPI and PMU based laptop
batteries.
Batterycharge, -current and voltage of ACPI and PMU based laptop
batteries.
- - curl
- Parse statistics from websites using regular expressions.
-
- bind
Name server and resolver statistics from the `statistics-channel'
interface of BIND 9.5, 9,6 and later.
- bind
Name server and resolver statistics from the `statistics-channel'
interface of BIND 9.5, 9,6 and later.
@@
-43,10
+40,6
@@
Features
- conntrack
Number of nf_conntrack entries.
- 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.
- cpu
CPU utilization: Time spent in the system, user, nice, idle, and related
states.
@@
-54,6
+47,13
@@
Features
- cpufreq
CPU frequency (For laptops with speed step or a similar technology)
- cpufreq
CPU frequency (For laptops with speed step or a similar technology)
+ - curl
+ Parse statistics from websites using regular expressions.
+
+ - 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.
- dbi
Executes SQL statements on various databases and interprets the returned
data.