src/collectd
src/collectd*.1
src/collectd*.5
+src/types.db.5
src/config.h.in~
src/liboconfig/.libs
src/liboconfig/*.la
+2008-01-21, Version 4.2.4
+ * unixsock plugin: A bug in the unixsock plugin caused it not to set
+ the permission on the socket as documented in the manpage. Thanks to
+ Evgeny Chukreev for fixing this issue.
+ * collectd: The documentation has been improved.
+
2007-12-28, Version 4.2.3
* sensors plugin: Updated the plugin to build and work with version 3
of the libsensors library.
to see how many connections your FTP server has to handle or how
many outgoing connections your mailserver has open.
+2008-01-11, Version 4.1.6
+ * unixsock plugin: A bug in the unixsock plugin caused it not to set
+ the permission on the socket as documented in the manpage. Thanks to
+ Evgeny Chukreev for fixing this issue.
+ * collectd: The documentation has been improved.
+
2007-12-27, Version 4.1.5
* rrdtool plugin: Fix a memory leak that only occured in very-low-
memory situations.
+For version 4.3:
+* Add notification stuff to the network plugin
+* Add notification stuff to the unixsock plugin
+
src/battery.c: commend not working code.
-general: build Darwin package
-Near future:
+Wishlist:
* Update the RPM specfile to
- build `collectd-apache'
- be free of syntax erros.
-
-For version 3.*:
* Port nfs module to solaris
* Port tape module to Linux
* Maybe look into porting the serial module
+* Build Darwin package
http://developer.apple.com/documentation/DeviceDrivers/Conceptual/AccessingHardware/AH_IOKitLib_API/chapter_5_section_1.html
http://developer.apple.com/documentation/DeviceDrivers/Conceptual/IOKitFundamentals/index.html#//apple_ref/doc/uid/TP0000011
dist_man_MANS = collectd.1 collectd-nagios.1 collectd.conf.5 \
collectd-email.5 collectd-exec.5 collectd-perl.5 \
- collectd-snmp.5 collectd-unixsock.5 collectdmon.1
+ collectd-snmp.5 collectd-unixsock.5 collectdmon.1 \
+ types.db.5
#collectd_1_SOURCES = collectd.pod
EXTRA_DIST += collectd-email.pod collectd-exec.pod collectd-nagios.pod \
collectd-perl.pod collectd-snmp.pod collectd-unixsock.pod \
- collectd.conf.pod collectd.pod collectdmon.pod
+ collectd.conf.pod collectd.pod collectdmon.pod types.db.pod
.pod.1:
pod2man --release=$(VERSION) --center=$(PACKAGE) $< >.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true
An I<Identifier> is of the form
C<I<host>B</>I<plugin>B<->I<instance>B</>I<type>B<->I<instance>> with both
I<instance>-parts being optional. If they're omitted the hyphen must be
-omitted, too.
+omitted, too. I<plugin> and each I<instance>-part may be chosen freely as long
+as the tuple (plugin, plugin instance, type instance) uniquely identifies the
+plugin within collectd. I<type> identifies the type and number of values
+(i.E<nbsp>e. data-set) passed to collectd. A large list of predefined
+data-sets is available in the B<types.db> file. See L<types.db(5)> for a
+description of the format of this file.
The I<OptionList> is an optional list of I<Options>, where each option if a
key-value-pair. A list of currently understood options can be found below, all
The last argument, I<data>, is either a function name or an array-reference.
If I<type> is B<TYPE_DATASET>, then the I<data> argument must be an
array-reference which points to an array of hashes. Each hash describes one
-data-source. For the exact layout see B<Data-Set> above. Please note that
+data-set. For the exact layout see B<Data-Set> above. Please note that
there is a large number of predefined data-sets available in the B<types.db>
-file which are automatically registered with collectd.
+file which are automatically registered with collectd - see L<types.db(5)> for
+a description of the format of this file.
If the I<type> argument is any of the other types (B<TYPE_INIT>, B<TYPE_READ>,
...) then I<data> is expected to be a function name. If the name is not
L<collectd(1)>,
L<collectd.conf(5)>,
L<collectd-exec(5)>,
+L<types.db(5)>,
L<perl(1)>,
L<threads(3perl)>,
L<threads::shared(3perl)>,
collectd's type that is to be used, e.E<nbsp>g. "if_octets" for interface
traffic or "users" for a user count. The types are read from the B<TypesDB>
(see L<collectd.conf(5)>), so you may want to check for which types are
-defined.
+defined. See L<types.db(5)> for a description of the format of this file.
=item B<Table> I<true|false>
=item B<TypesDB> I<File> [I<File> ...]
-Set one or more files that contain the data-set descriptions.
+Set one or more files that contain the data-set descriptions. See
+L<types.db(5)> for a description of the format of this file.
=item B<Interval> I<Seconds>
L<collectd-exec(5)>,
L<collectd-perl(5)>,
L<collectd-unixsock(5)>,
+L<types.db(5)>,
L<hddtemp(8)>,
L<kstat(3KSTAT)>,
L<mbmon(1)>,
L<collectd-perl(5)>,
L<collectd-snmp(5)>,
L<collectd-unixsock(5)>,
+L<types.db(5)>,
L<http://collectd.org/>
=head1 AUTHOR
/**
* collectd - src/logfile.c
* Copyright (C) 2007 Sebastian Harl
+ * Copyright (C) 2007 Florian Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
return (0);
} /* int network_get_listen_socket */
-int network_receive (void)
+static int network_receive (void)
{
char buffer[BUFF_SIZE];
int buffer_len;
--- /dev/null
+=head1 NAME
+
+types.db - Data-set specifications for the system statistics collection daemon
+B<collectd>
+
+=head1 SYNOPSIS
+
+ bitrate value:GAUGE:0:4294967295
+ counter value:COUNTER:U:U
+ if_octets rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
+
+=head1 DESCRIPTION
+
+The types.db file contains one line for each data-set specification. Each line
+consists of two fields delimited by spaces and/or horizontal tabs. The first
+field defines the name of the data-set, while the second field defines a list
+of data-source specifications, delimited by spaces and, optionally, a comma
+(",") right after each list-entry.
+
+The format of the data-source specification has been inspired by RRDtool's
+data-source specification. Each data-source is defined by a quadruple made up
+of the data-source name, type, minimal and maximal values, delimited by colons
+(":"): I<ds-name>:I<ds-type>:I<min>:I<max>. I<ds-type> may be either
+B<COUNTER> or B<GAUGE>. I<min> and I<max> define the range of valid values for
+data stored for this data-source. If B<U> is specified for either the min or
+max value, it will be set to unknown, meaning that no range checks will
+happen. See L<rrdcreate(1)> for more details.
+
+=head1 FILES
+
+The location of the types.db file is defined by the B<TypesDB> configuration
+option (see L<collectd.conf(5)>). If you want to specify custom data-sets, you
+should do so by using a custom file specified as an additional argument to the
+B<TypesDB> option.
+
+=head1 SEE ALSO
+
+L<collectd(1)>,
+L<collectd.conf(5)>,
+L<rrdcreate(1)>
+
+=head1 AUTHOR
+
+B<collectd> has been written by Florian Forster
+E<lt>octoE<nbsp>atE<nbsp>verplant.orgE<gt>.
+
+This manpage has been written by Sebastian Harl
+E<lt>shE<nbsp>atE<nbsp>tokkee.orgE<gt>.
+
+=cut
+
#!/bin/sh
-DEFAULT_VERSION="4.2.3.git"
+DEFAULT_VERSION="4.2.4.git"
VERSION="$( git describe 2> /dev/null | sed -e 's/^collectd-//' )"
projects / collectd.git / commitdiff