Replaced all hardcoded heartbeat values (== 25 seconds) with `COLLECTD_HEARTBEAT'.

[collectd.git] / src / collectd.pod

diff --git a/src/collectd.pod b/src/collectd.pod
index b21f688..8227ed9 100644 (file)
--- a/src/collectd.pod
+++ b/src/collectd.pod
@@ -122,9 +122,9 @@ collectd is linked against C<librrd>.
 The other two modes, B<client mode> and B<server mode>, are used to send data
 over a network and receive it again.
 
-In B<client mode> the daemon collectd the data locally and send it's result to
-one or more network addresses. No RRD files are written in this case. This is
-the only mode available if collectd is not linked against C<librrd>.
+In B<client mode> the daemon collects the data locally and sends it's results
+to one or more network addresses. No RRD files are written in this case. This
+is the only mode available if collectd is not linked against C<librrd>.
 
 If started in B<server mode> the daemon will listen on one or more interfaces
 and write the data it receives to RRD files. No data is collected locally.
@@ -387,18 +387,11 @@ The DS'es depend on the module creating the RRD files:
 
   DS:users:GAUGE:25:0:65535
 
-=item VServer socket msg. accounting (F<vserver-I<E<lt>xidE<gt>>/socket.rrd>)
+=item VServer load (F<vserver-I<E<lt>xidE<gt>>/load.rrd>)
 
-  DS:unix_in:COUNTER:25:0:9223372036854775807
-  DS:unix_out:COUNTER:25:0:9223372036854775807
-  DS:inet_in:COUNTER:25:0:9223372036854775807
-  DS:inet_out:COUNTER:25:0:9223372036854775807
-  DS:inet6_in:COUNTER:25:0:9223372036854775807
-  DS:inet6_out:COUNTER:25:0:9223372036854775807
-  DS:other_in:COUNTER:25:0:9223372036854775807
-  DS:other_out:COUNTER:25:0:9223372036854775807
-  DS:unspec_in:COUNTER:25:0:9223372036854775807
-  DS:unspec_out:COUNTER:25:0:9223372036854775807
+  DS:shortterm:GAUGE:25:0:100
+  DS:midterm:GAUGE:25:0:100
+  DS:longterm:GAUGE:25:0:100
 
 =item VServer threads (F<vserver-I<E<lt>xidE<gt>>/threads.rrd>)
 
@@ -407,17 +400,17 @@ The DS'es depend on the module creating the RRD files:
   DS:uninterruptible:GAUGE:25:0:65535
   DS:onhold:GAUGE:25:0:65535
 
-=item VServer load (F<vserver-I<E<lt>xidE<gt>>/load.rrd>)
+=item VServer network traffic (F<vserver-I<E<lt>xidE<gt>>/traffic-I<E<lt>nameE<gt>>.rrd>)
 
-  DS:avg1:GAUGE:25:0:100
-  DS:avg5:GAUGE:25:0:100
-  DS:avg15:GAUGE:25:0:100
+  DS:incoming:COUNTER:25:0:9223372036854775807
+  DS:outgoing:COUNTER:25:0:9223372036854775807
+  DS:failed:COUNTER:25:0:9223372036854775807
 
-=item VServer processes (F<vserver-I<E<lt>xidE<gt>>/processes.rrd>)
+=item VServer processes (F<vserver-I<E<lt>xidE<gt>>/vs_processes.rrd>)
 
   DS:total:GAUGE:25:0:65535
 
-=item VServer memory usage (F<vserver-I<E<lt>xidE<gt>>/memory.rrd>)
+=item VServer memory usage (F<vserver-I<E<lt>xidE<gt>>/vs_memory.rrd>)
 
   DS:vm:GAUGE:25:0:9223372036854775807
   DS:vml:GAUGE:25:0:9223372036854775807