+2006-11-01, Version 3.10.2
+ * The sample config file has been improved.
+ * Errors in the manpages have been corrected.
+ * The ping-plugin now adds hosts during initialization, not during
+ startup. This speeds up starup when no network connectivity is
+ available. Also, the hosts are being added later when the network is
+ available.
+ * Improved BSD-support for the df-plugin.
+ * Fixed syntax errors in the swap-plugin for Mac OS X.
+ * Fix a wrong structure being passed to `getnameinfo' in the ntpd-
+ plugin.
+ * Don't disable the mysql-plugin if connecting to the database fails
+ during initialization. Instead, try again in increasing intervals.
+
2006-07-19, Version 3.10.1
* A bug in the apcups plugin was fixed: Is the plugin is loaded, but
the apcups cannot be reached, unconnected sockets will pile up and
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(collectd, 3.10.1)
+AC_INIT(collectd, 3.10.2)
AC_CONFIG_SRCDIR(src/collectd.c)
AC_CONFIG_HEADERS(src/config.h)
AM_INIT_AUTOMAKE(dist-bzip2)
AC_CHECK_FUNCS(getifaddrs)
# For mount interface
-AC_CHECK_FUNCS(getfsent getvfsent listmntent)
-AC_CHECK_FUNCS(getfsstat getvfsstat)
+#AC_CHECK_FUNCS(getfsent getvfsent)
-# Check for different versions of `getmntent' here..
-AC_FUNC_GETMNTENT
-if test "x$ac_cv_lib_sun_getmntent" = "xyes"
-then
- AC_DEFINE(HAVE_SUN_GETMNTENT, 1,
- [Define if the function getmntent exists. It's the version from libsun.])
+have_getfsstat="no"
+AC_CHECK_FUNCS(getfsstat, [have_getfsstat="yes"])
+have_getvfsstat="no"
+AC_CHECK_FUNCS(getvfsstat, [have_getvfsstat="yes"])
+have_listmntent="no"
+AC_CHECK_FUNCS(listmntent, [have_listmntent="yes"])
+
+have_getmntent="no"
+AC_CHECK_FUNCS(getmntent, [have_getmntent="c"])
+if test "x$have_getmntent" = "xno"; then
+ AC_CHECK_LIB(sun, getmntent, [have_getmntent="sun"])
fi
-if test "x$ac_cv_lib_seq_getmntent" = "xyes"
-then
- AC_DEFINE(HAVE_SEQ_GETMNTENT, 1,
- [Define if the function getmntent exists. It's the version from libseq.])
+if test "x$have_getmntent" = "xno"; then
+ AC_CHECK_LIB(seq, getmntent, [have_getmntent="seq"])
fi
-if test "x$ac_cv_lib_gen_getmntent" = "xyes"
-then
- AC_DEFINE(HAVE_GEN_GETMNTENT, 1,
- [Define if the function getmntent exists. It's the version from libgen.])
+if test "x$have_getmntent" = "xno"; then
+ AC_CHECK_LIB(gen, getmntent, [have_getmntent="gen"])
fi
-if test "x$ac_cv_func_getmntent" = "xyes"; then
- saveCFLAGS="$CFLAGS"
- CFLAGS="-Wall -Werror $CFLAGS"
+if test "x$have_getmntent" = "xc"; then
AC_CACHE_CHECK([whether getmntent takes one argument],
- [fu_cv_getmntent1],
+ [have_one_getmntent],
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM([[AC_INCLUDES_DEFAULT
+#include <mntent.h>
#include "$srcdir/src/utils_mount.h"]],
- [[(void)getmntent((FILE *)NULL);]]
+ [[
+ FILE *fh;
+ struct mntent *me;
+ fh = setmntent ("/etc/mtab", "r");
+ me = getmntent (fh);
+ ]]
),
- [fu_cv_getmntent1=yes],
- [fu_cv_getmntent1=no]
+ [have_one_getmntent="yes"],
+ [have_one_getmntent="no"]
)
)
- if test "x$fu_cv_getmntent1" = "xno"; then
- AC_CACHE_CHECK([whether getmntent takes two arguments],
- [fu_cv_getmntent2],
- AC_COMPILE_IFELSE(
- AC_LANG_PROGRAM([[AC_INCLUDES_DEFAULT
+ AC_CACHE_CHECK([whether getmntent takes two arguments],
+ [have_two_getmntent],
+ AC_COMPILE_IFELSE(
+ AC_LANG_PROGRAM([[AC_INCLUDES_DEFAULT
+#include <sys/mnttab.h>
#include "$srcdir/src/utils_mount.h"]],
- [[(void)getmntent((FILE *)NULL,
- (struct mnttab *)NULL);]]
- ),
- [fu_cv_getmntent2=yes],
- [fu_cv_getmntent2=no]
- )
+ [[
+ FILE *fh;
+ struct mnttab mt;
+ int status;
+ fh = fopen ("/etc/mnttab", "r");
+ status = getmntent (fh, &mt);
+ ]]
+ ),
+ [have_two_getmntent="yes"],
+ [have_two_getmntent="no"]
)
+ )
+fi
+
+# Check for different versions of `getmntent' here..
+
+if test "x$have_getmntent" = "xc"; then
+ if test "x$have_one_getmntent" = "xyes"; then
+ AC_DEFINE(HAVE_ONE_GETMNTENT, 1,
+ [Define if the function getmntent exists and takes one argument.])
+ fi
+ if test "x$have_two_getmntent" = "xyes"; then
+ AC_DEFINE(HAVE_TWO_GETMNTENT, 1,
+ [Define if the function getmntent exists and takes two arguments.])
fi
- CFLAGS="$saveCFLAGS"
-fi
-if test "x$fu_cv_getmntent1" = "xyes"; then
- AC_DEFINE(HAVE_GETMNTENT1,
- 1,
- [Define if there is a function named getmntent
- for reading the list of mounted filesystems, and
- that function takes a single argument. (4.3BSD,
- SunOS, HP-UX, Dynix, Irix, Linux)]
- )
fi
-if test "x$fu_cv_getmntent2" = "xyes"; then
- AC_DEFINE(HAVE_GETMNTENT2,
- 1,
- [Define if there is a function named getmntent
- for reading the list of mounted filesystems, and
- that function takes two arguments. (SVR4)]
- )
+if test "x$have_getmntent" = "xsun"; then
+ AC_DEFINE(HAVE_SUN_GETMNTENT, 1,
+ [Define if the function getmntent exists. It's the version from libsun.])
+fi
+if test "x$have_getmntent" = "xseq"; then
+ AC_DEFINE(HAVE_SEQ_GETMNTENT, 1,
+ [Define if the function getmntent exists. It's the version from libseq.])
+fi
+if test "x$have_getmntent" = "xgen"; then
+ AC_DEFINE(HAVE_GEN_GETMNTENT, 1,
+ [Define if the function getmntent exists. It's the version from libgen.])
fi
# Check for structures
--- /dev/null
+collectd on Debian
+==================
+
+General notes:
+--------------
+
+- This package is split up into several packages to prevent you from having to
+ install dependencies (or recommended packages) that you don't actually need.
+ Any plugin that has dependencies other than libc gets its own package.
+
+Configuring collectd:
+---------------------
+
+- collectd uses a similar configuration layout as openvpn does. That is to
+ say that one daemon process is started for each configuration file found in
+ /etc/collectd/.
+
+- See collectd.conf(5) for details about configuring collectd.
+
+Building your own plugins:
+--------------------------
+
+- If you want to contribute plugins to the official distribution you should
+ read http://collectd.org/dev-info.shtml.
+
+- If you want to build plugins for your personal use only simply install the
+ collectd-dev package and use /usr/share/doc/collectd-dev/examples/myplugin.c
+ as a starting point (Note: This is already a working example, though it does
+ not collect any useful data).
+
+ The resulting file can be compiled as follows:
+
+ gcc -shared -o myplugin.so myplugin.c
+
+ Copy myplugin.so to /usr/lib/collectd and add the following line to your
+ collectd config file:
+
+ LoadPlugin myplugin
+
+ Restart collectd and you're done.
+
-collectd (3.10.1-0octo1) unstable; urgency=low
+collectd (3.10.2-0octo1) unstable; urgency=low
- * New upstream version
+ * New upstream release.
- -- Florian Forster <octo@verplant.org> Wed, 19 Jul 2006 18:49:16 +0200
+ -- Florian Forster <octo@leeloo.home.verplant.org> Wed, 1 Nov 2006 16:16:49 +0100
-collectd (3.10.0-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@leeloo.home.verplant.org> Sun, 9 Jul 2006 12:53:01 +0200
-
-collectd (3.9.4) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@leeloo.home.verplant.org> Sun, 25 Jun 2006 19:50:44 +0200
-
-collectd (3.9.3) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@leeloo.home.verplant.org> Thu, 1 Jun 2006 22:41:55 +0200
-
-collectd (3.9.2-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Tue, 9 May 2006 11:12:00 +0200
-
-collectd (3.8.5-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Tue, 9 May 2006 10:56:00 +0200
-
-collectd (3.9.1-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Fri, 21 Apr 2006 17:38:08 +0200
-
-collectd (3.9.0-1) unstable; urgency=low
-
- * New upstream version
- * Added the `apache' plugin in an extra package. It links against
- `libcurl3'.
-
- -- Florian Forster <octo@verplant.org> Fri, 14 Apr 2006 19:31:05 +0200
-
-collectd (3.8.4-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Sun, 9 Apr 2006 16:01:11 +0200
-
-collectd (3.8.3-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Sun, 2 Apr 2006 10:34:05 +0200
-
-collectd (3.8.2-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Tue, 14 Mar 2006 09:47:00 +0200
-
-collectd (3.8.1-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Mon, 13 Mar 2006 21:09:09 +0200
-
-collectd (3.8.0-2) unstable; urgency=low
-
- * Much improved init script. Thanks to Sebastian for his work :)
-
- -- Florian Forster <octo@verplant.org> Sat, 11 Mar 2006 16:09:44 +0200
-
-collectd (3.8.0-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Thu, 09 Mar 2006 18:18:10 +0200
-
-collectd (3.7.2-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Sat, 18 Feb 2006 12:36:09 +0200
-
-collectd (3.7.1-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Sat, 04 Feb 2006 10:44:05 +0200
-
-collectd (3.7.0-1) unstable; urgency=low
-
- * New upstream version
- * Removed package `collectd-hddtemp'
-
- -- Florian Forster <octo@verplant.org> Mon, 30 Jan 2006 21:19:19 +0200
-
-collectd (3.6.2-1) unstable; urgency=low
+collectd (3.10.1-4) unstable; urgency=low
- * New upstream version
+ * Changed collectd-dbg's section and priority to "devel" and "extra"
+ respectively.
+ * Set init start sequence code to 95 to be sure to start after any daemons
+ that data is collected from.
- -- Florian Forster <octo@verplant.org> Tue, 24 Jan 2006 10:48:22 +0200
+ -- Sebastian Harl <sh@tokkee.org> Thu, 5 Oct 2006 10:25:07 +0000
-collectd (3.6.1-1) unstable; urgency=low
+collectd (3.10.1-3) unstable; urgency=low
- * New upstream version
+ * Added --oknodo to start-stop-daemon in the init script (Closes: #379703).
- -- Florian Forster <octo@verplant.org> Fri, 20 Jan 2006 12:56:12 +0200
+ -- Sebastian Harl <sh@tokkee.org> Tue, 25 Jul 2006 18:34:55 +0200
-collectd (3.6.0-1) unstable; urgency=low
+collectd (3.10.1-2) unstable; urgency=low
- * New upstream version
- * New module `mysql'
- * Removed all modules but `sensors' and `hddtemp' since they can be
- (de)activated using the config file.
+ * Added collectd-dbg package.
- -- Florian Forster <octo@verplant.org> Tue, 17 Jan 2006 12:50:28 +0200
+ -- Sebastian Harl <sh@tokkee.org> Sun, 23 Jul 2006 23:39:42 +0200
-collectd (3.5.1-1) unstable; urgency=low
+collectd (3.10.1-1) unstable; urgency=low
- * New upstream version
+ * New upstream release.
+ * Dynamically link against external liboping.
+ - New binary package collectd-ping.
+ - Added collectd-ping to suggested packages.
+ * Moved config file from /usr/share/doc/collectd/examples/ to
+ /etc/collectd/.
- -- Florian Forster <octo@verplant.org> Sun, 18 Dec 2005 23:09:11 +0200
+ -- Sebastian Harl <sh@tokkee.org> Sat, 22 Jul 2006 21:43:37 +0200
-collectd (3.5.0-1) unstable; urgency=low
-
- * New upstream version
- * Added dependency to `cpufreqd | powernowd | cpudyn' to `collectd-cpufreq'
- * Added `collectd-users'
- * Added `--localstatedir=/var' to `./configure'
-
- -- Florian Forster <octo@verplant.org> Fri, 16 Dec 2005 13:06:43 +0200
-
-collectd (3.4.0-1) unstable; urgency=low
-
- * New upstream version
- * The package has been split up into one binary package and many many plugin
- packages
-
- -- Florian Forster <octo@verplant.org> Sat, 26 Nov 2005 13:14:22 +0200
-
-collectd (3.3.0-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Sat, 05 Nov 2005 12:02:50 +0200
-
-collectd (3.2.0-1) unstable; urgency=low
-
- * New upstream version
- * Problems with the debian init.d file have been fixed.
- * Added `processes.so*' to the main package
-
- -- Florian Forster <octo@verplant.org> Tue, 25 Oct 2005 09:34:29 +0200
-
-collectd (3.1.0-1) unstable; urgency=low
-
- * New upstream version
- * Added package `collectd-hddtemp'
-
- -- Florian Forster <octo@verplant.org> Fri, 14 Oct 2005 19:32:59 +0200
-
-collectd (3.0.0-1) unstable; urgency=low
-
- * New upstream version
- * Split the package into `collectd' and `collectd-sensors'
-
- -- Florian Forster <octo@verplant.org> Fri, 30 Sep 2005 14:15:15 +0200
-
-collectd (2.1.0-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Fri, 16 Sep 2005 21:24:10 +0200
-
-collectd (2.0.0-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Sat, 10 Sep 2005 16:11:37 +0200
-
-collectd (1.8.1-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Mon, 01 Sep 2005 21:27:16 +0200
-
-collectd (1.8.0-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Mon, 29 Aug 2005 12:09:20 +0200
-
-collectd (1.7.0-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Sun, 25 Aug 2005 10:50:08 +0200
-
-collectd (1.6.0-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Sun, 21 Aug 2005 19:03:02 +0200
-
-collectd (1.5.1-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Sun, 17 Jul 2005 11:56:50 +0200
-
-collectd (1.5-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Sun, 17 Jul 2005 11:56:50 +0200
-
-collectd (1.4.2-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Mon, 11 Jul 2005 10:40:20 +0200
-
-collectd (1.4.1-1) unstable; urgency=low
-
- * New upstream version
-
- -- Florian Forster <octo@verplant.org> Fri, 10 Jul 2005 11:34:45 +0200
-
-collectd (1.4-1) unstable; urgency=low
+collectd (3.10.0-1) unstable; urgency=low
- * New upstream version
- * Added examples from the contrib/ directory
- * Added /etc/default/collectd for easy configuration
- * Added libsensors3 to the dependencies
+ * New upstream release.
+ New plugins:
+ - APC UPS's charge, load, input/output/battery voltage, etc.: apcups
+ - NTP daemon's local clock drift, offset to peers, etc.: ntpd
+ * Upstream no longer provides a debian/ directory. Thus no repackaging is
+ required any longer.
+ * Not using getifaddrs() is now the default in upstream. getifaddrs.dpatch
+ no longer needed.
+ * Added collectd-hddtemp as a suggestion to the collectd package.
- -- Florian Forster <octo@verplant.org> Fri, 9 Jul 2005 01:01:32 +0200
+ -- Sebastian Harl <sh@tokkee.org> Sun, 9 Jul 2006 21:52:13 +0200
-collectd (1.3-1) unstable; urgency=low
+collectd (3.9.4+debian-1) unstable; urgency=low
- * Initial release.
+ * Initial release (Closes: #373008).
+ * Removed upstream's debian/ directory from .orig.tar.gz.
+ * getifaddrs.dpatch: Patching src/traffic.c to read data from /proc instead
+ of using getifaddrs(). getifaddrs() does not seem to work correctly on
+ AMD64.
- -- Florian Forster <octo@verplant.org> Fri, 8 Jul 2005 19:05:16 +0200
+ -- Sebastian Harl <sh@tokkee.org> Fri, 7 Jul 2006 15:49:42 +0200
+++ /dev/null
-usr/lib/collectd/apache.so*
+++ /dev/null
-usr/lib/collectd/mysql.so*
+++ /dev/null
-usr/lib/collectd/sensors.so*
--- /dev/null
+# Config file for collectd(1).
+#
+# Some plugins need additional configuration and are disabled by default.
+# Please read collectd.conf(5) for details.
+
+Mode Local
+
+# If in "Client" mode you have to specify which server to send datagrams to.
+#Mode Client
+#Server 123.123.123.123 12345
+
+#Mode Server
+
+#Mode Log
+
+#DataDir /var/lib/collectd
+#PIDFILE /var/run/collectd.pid
+#PluginDir /usr/lib/collectd
+
+#LoadPlugin apache
+#LoadPlugin apcups
+#LoadPlugin apple_sensors
+LoadPlugin battery
+LoadPlugin cpu
+#LoadPlugin cpufreq
+LoadPlugin df
+LoadPlugin disk
+#LoadPlugin hddtemp
+LoadPlugin load
+LoadPlugin memory
+#LoadPlugin mysql
+#LoadPlugin nfs
+#LoadPlugin ntpd
+#LoadPlugin ping
+LoadPlugin processes
+#LoadPlugin sensors
+#LoadPlugin serial
+LoadPlugin swap
+#LoadPlugin tape
+LoadPlugin traffic
+LoadPlugin users
+#LoadPlugin vserver
+#LoadPlugin wireless
+
+#<Plugin apache>
+# URL http://localhost/status?auto
+# User www-user
+# Password secret
+# CACert /etc/ssl/ca.crt
+#</Plugin>
+
+#<Plugin apcups>
+# Host localhost
+# Port 3551
+#</Plugin>
+
+#<Plugin hddtemp>
+# Host 127.0.0.1
+# Port 7634
+#</Plugin>
+
+#<Plugin ntpd>
+# Host localhost
+# Port 123
+#</Plugin>
+
+#<Plugin mysql>
+# Host localhost
+# User db_user
+# Password secret
+# Database db_name
+#</Plugin>
+
+#<Plugin ping>
+# Host host.foo.bar
+# Host host.baz.qux
+#</Plugin>
+
+#<Plugin traffic>
+# Interface eth0
+# IgnoreSelected false
+#</Plugin>
+
+++ /dev/null
-etc/collectd.conf
+++ /dev/null
-usr/lib/collectd
-usr/sbin
-etc/init.d
-var/lib/collectd
+++ /dev/null
-AUTHORS
-COPYING
-ChangeLog
-INSTALL
-NEWS
-README
+++ /dev/null
-contrib/collectd2html.pl
-contrib/collection.cgi
+++ /dev/null
-usr/sbin/collectd
d_start() {
i=0
- if [ ! -d "$CONFIGDIR" -a -e "$FALLBACKCONF" ]
+ if [ ! -d "$CONFIGDIR" ]
then
- start-stop-daemon --start --quiet --exec $DAEMON \
- -- -C "$FALLBACKCONF"
+ if [ -e "$FALLBACKCONF" ]
+ then
+ $DAEMON -C "$FALLBACKCONF" 2> /dev/null
+ else
+ echo ""
+ echo "This package is not configured yet. Please refer"
+ echo "to /usr/share/doc/collectd/README.Debian for"
+ echo "details."
+ echo ""
+ exit 0
+ fi
else
for FILE in `ls $CONFIGDIR/*.conf 2>/dev/null`
do
if [ $i == 0 ]
then
- echo -n " (";
+ echo -n " ("
else
- echo -n ", ";
+ echo -n ", "
fi
- $DAEMON -C "$FILE" 2>/dev/null
+ $DAEMON -C "$FILE" 2> /dev/null
if [ $? == 0 ]
then
- echo -n "$NAME";
+ echo -n "$NAME"
else
- echo -n "$NAME failed";
+ echo -n "$NAME failed"
fi
i=$(($i+1))
if [ $i == 0 ]
then
- echo -n "[no config found]";
+ echo -n "[no config found]"
+ exit 1
else
echo -n ")"
fi
# Function that stops the daemon/service.
#
d_stop() {
- start-stop-daemon --stop --quiet --exec $DAEMON
+ start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
}
case "$1" in
exit 0
-# vim:syntax=sh
+# vim: syntax=sh noexpandtab sw=8 ts=8 :
+++ /dev/null
-src/collectd.1
-src/collectd.conf.5
+++ /dev/null
-#!/bin/bash -e
-# postinst script for collectd
-#
-# see: dh_installdeb(1)
-#
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
-case "$1" in
- configure)
- [ -d /etc/collectd ] || mkdir -p /etc/collectd
-
- if [ -e /etc/collectd.conf -a ! -e /etc/collectd/default.conf ]; then
- mv /etc/collectd.conf /etc/collectd/default.conf
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-
-#! /bin/sh
+#!/bin/bash
# postrm script for collectd
#
# see: dh_installdeb(1)
case "$1" in
- purge)
- rm -rf /var/lib/collectd
- rm -rf /etc/collectd
- rm -f /etc/collectd.conf
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- *)
+ purge)
+ rm -rf /var/lib/collectd
+ rm -rf /etc/collectd
+ ;;
+
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
+ ;;
+
esac
# dh_installdeb will replace this with shell code automatically
#DEBHELPER#
exit 0
+
Source: collectd
Section: utils
Priority: optional
-Maintainer: Florian Forster <octo@verplant.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, librrd0-dev | librrd2-dev, libsensors-dev, libmysqlclient14-dev, libcurl3-dev, liboping-dev
-Standards-Version: 3.6.1
+Maintainer: Sebastian Harl <sh@tokkee.org>
+Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-dev,
+ libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev,
+ libsensors-dev, liboping-dev (> 0.3.3)
+Standards-Version: 3.7.2
Package: collectd
Architecture: any
-Depends: libc6, librrd0 | librrd2
-Suggests: collectd-mysql, collectd-sensors, librrds-perl
-Description: Statistics collection daemon for filling RRD files.
+Depends: ${shlibs:Depends}
+Suggests: collectd-apache, collectd-mysql, collectd-sensors, collectd-dev,
+ collectd-hddtemp, collectd-ping, librrds-perl
+Description: statistics collection daemon
collectd is a small daemon written in C for performance. It reads various
- system statistics and updates RRD files, creating them if neccessary. Since
+ system statistics and updates RRD files, creating them if necessary. Since
the daemon doesn't need to startup every time it wants to update the files
it's very fast and easy on the system. Also, the statistics are very fine
grained since the files are updated every 10 seconds.
+ .
+ This package contains the main program file and the following plugins:
+ * APC UPS's charge, load, input/output/battery voltage, etc.: apcups
+ * Apple computer's sensors information: apple_sensors (server mode only)
+ * battery status: battery
+ * CPU utilization: cpu
+ * CPU frequency: cpufreq
+ * disk space usage: df
+ * disk and partition throughput: disk
+ * system load averages: load
+ * memory usage: memory
+ * NFS utilization: nfs
+ * NTP daemon's local clock drift, offset to peers, etc.: ntpd
+ * number of processes: processes
+ * serial port traffic: serial
+ * swap usage: swap
+ * tape drive usage: tape (server mode only)
+ * network traffic: traffic
+ * number of users logged into the system: users
+ * system ressources used by Linux-VServers: vserver
+ * wireless network stats: wireless
+
+Package: collectd-dbg
+Section: devel
+Architecture: any
+Priority: extra
+Depends: collectd (= ${Source-Version}), collectd-apache (= ${Source-Version}),
+ collectd-hddtemp (= ${Source-Version}), collectd-mysql (= ${Source-Version}),
+ collectd-ping (= ${Source-Version}), collectd-sensors (= ${Source-Version})
+Description: statistics collection daemon (debugging symbols)
+ collectd is a small daemon written in C for performance. It reads various
+ system statistics and updates RRD files, creating them if necessary. Since
+ the daemon doesn't need to startup every time it wants to update the files
+ it's very fast and easy on the system. Also, the statistics are very fine
+ grained since the files are updated every 10 seconds.
+ .
+ This package contains the debugging symbols.
Package: collectd-apache
Architecture: any
-Depends: collectd (= ${Source-Version}), apache2 | apache, libcurl3
-Description: collectd plugin for Apache-statistics
- collectd module to collect Apache statistics. It reads the page generated by
- `mod_status' and writes it's content into RRD files.
+Depends: collectd (= ${Source-Version}), ${shlibs:Depends}
+Description: statistics collection daemon (Apache plugin)
+ collectd is a small daemon written in C for performance. It reads various
+ system statistics and updates RRD files, creating them if necessary. Since
+ the daemon doesn't need to startup every time it wants to update the files
+ it's very fast and easy on the system. Also, the statistics are very fine
+ grained since the files are updated every 10 seconds.
+ .
+ This package contains the Apache plugin which collects Apache statistics
+ provided by Apache's mod_status.
+
+Package: collectd-hddtemp
+Architecture: any
+Depends: collectd (= ${Source-Version}), ${shlibs:Depends}
+Recommends: hddtemp
+Description: statistics collection daemon (hddtemp plugin)
+ collectd is a small daemon written in C for performance. It reads various
+ system statistics and updates RRD files, creating them if necessary. Since
+ the daemon doesn't need to startup every time it wants to update the files
+ it's very fast and easy on the system. Also, the statistics are very fine
+ grained since the files are updated every 10 seconds.
+ .
+ This package contains the hddtemp plugin which collects harddisk temperatures.
Package: collectd-mysql
Architecture: any
-Depends: collectd (= ${Source-Version}), libmysqlclient14
-Description: collectd plugin for MySQL-statistics
- collectd module to collect MySQL statistics. It links against
- `libmysqlclient14' though other versions should do, too.
+Depends: collectd (= ${Source-Version}), ${shlibs:Depends}
+Description: statistics collection daemon (MySQL plugin)
+ collectd is a small daemon written in C for performance. It reads various
+ system statistics and updates RRD files, creating them if necessary. Since
+ the daemon doesn't need to startup every time it wants to update the files
+ it's very fast and easy on the system. Also, the statistics are very fine
+ grained since the files are updated every 10 seconds.
+ .
+ This package contains the MySQL plugin which collects MySQL statistics
+ provided by MySQL's "show status" command.
-Package: collectd-sensors
+Package: collectd-ping
Architecture: any
-Depends: collectd (= ${Source-Version}), libsensors3
-Description: collectd module for libsensors.
- collectd module to collect system temperatures.
+Depends: collectd (= ${Source-Version}), ${shlibs:Depends}
+Description: statistics collection daemon (ping plugin)
+ collectd is a small daemon written in C for performance. It reads various
+ system statistics and updates RRD files, creating them if necessary. Since
+ the daemon doesn't need to startup every time it wants to update the files
+ it's very fast and easy on the system. Also, the statistics are very fine
+ grained since the files are updated every 10 seconds.
+ .
+ This package contains the ping plugin which collects network latency
+ statistics.
-Package: collectd-multimeter
+Package: collectd-sensors
Architecture: any
Depends: collectd (= ${Source-Version}), ${shlibs:Depends}
-Description: statistics collection daemon (multimeter plugin)
+Description: statistics collection daemon (sensors plugin)
+ collectd is a small daemon written in C for performance. It reads various
+ system statistics and updates RRD files, creating them if necessary. Since
+ the daemon doesn't need to startup every time it wants to update the files
+ it's very fast and easy on the system. Also, the statistics are very fine
+ grained since the files are updated every 10 seconds.
+ .
+ This package contains the sensors plugin which collects lm_sensors
+ information (e.g. CPU temperature, fan speeds).
+
+Package: collectd-dev
+Architecture: all
+Depends: collectd (= ${Source-Version})
+Description: statistics collection daemon (development files)
collectd is a small daemon written in C for performance. It reads various
system statistics and updates RRD files, creating them if necessary. Since
the daemon doesn't need to startup every time it wants to update the files
it's very fast and easy on the system. Also, the statistics are very fine
grained since the files are updated every 10 seconds.
.
- This package contains the multimeter plugin which collects values from a
- multimeter connected to a serial port.
+ This package contains the development files needed to create your own
+ plugins.
-This package was debianized by Florian Forster <octo@verplant.org> on
-Fri, 8 Jul 2005 19:05:16 +0200.
-
-It was downloaded from http://collectd.org/
-
-Copyright Holder: Florian Forster <octo@verplant.org>
+This package was debianized by Sebastian Harl <sh@tokkee.org> on
+Wed, 10 May 2006 09:20:39 +0200.
+
+It was downloaded from <http://collectd.org/files/>.
+
+Upstream Authors:
+ Core Developer:
+ Florian Forster <octo@verplant.org>
+
+ For individual credits, see AUTHORS.
+
+Copyright Holders (in alphabetical order):
+ Andre M. Hedrick <andre@suse.com>
+ Anthony Gialluca <tonyabg@charter.net>
+ David Bacher <drbacher@gmail.com>
+ Florian Forster <octo@verplant.org>
+ Free Software Foundation, Inc.
+ Jason Pepas <cell@ices.utexas.edu>
+ Kern Sibbald
+ Lyonel Vincent <lyonel@ezix.org>
+ Niki W. Waibel <niki.waibel@newlogic.com>
+ Peter Holik <peter@holik.at>
+ Roy Keene, Keene Enterprises <libconfig@rkeene.org>
+ Scott Garrett <sgarrett@technomancer.com>
+ Sebastian Harl <sh@tokkee.org>
+ Vincent Stehlé <vincent.stehle@free.fr>
License:
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-\f
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-\f
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-\f
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-\f
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-\f
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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 Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+ Files src/apache.c
+ src/apple_sensors.c
+ src/mysql.c
+ src/ntpd.c
+ src/battery.c
+ src/wireless.c
+ Copyright (C) 2006 Florian Forster <octo@verplant.org>
+
+ File src/apcups.c
+ Copyright (C) 2006 Anthony Gialluca <tonyabg@charter.net>
+ Copyright (C) 2000-2004 Kern Sibbald
+ Copyright (C) 1996-99 Andre M. Hedrick <andre@suse.com>
+
+ File src/cpufreq.c
+ Copyright (C) 2005, 2006 Peter Holik <peter@holik.at>
+
+ File src/hddtemp.c
+ Copyright (C) 2005, 2006 Vincent Stehlé <vincent.stehle@free.fr>
+
+ File src/nfs.c
+ Copyright (C) 2005, 2006 Jason Pepas <cell@ices.utexas.edu>
+
+ File src/processes.c
+ Copyright (C) 2005 Lyonel Vincent <lyonel@ezix.org>
+ Copyright (C) 2006 Florian Forster <octo@verplant.org> (Mach code)
+
+ File src/serial.c
+ Copyright (C) 2005, 2006 David Bacher <drbacher@gmail.com>
+
+ File src/tape.c
+ Copyright (C) 2005, 2006 Scott Garrett <sgarrett@technomancer.com>
+
+ File src/users.c
+ Copyright (C) 2005, 2006 Sebastian Harl <sh@tokkee.org>
+
+ Files src/utils_debug.c
+ src/utils_debug.h
+ src/utils_mount.c
+ src/utils_mount.h
+ Copyright (C) 2005, 2006 Niki W. Waibel <niki.waibel@gmx.net>
+
+ File src/vserver.c
+ Copyright (C) 2006 Sebastian Harl <sh@tokkee.org>
+
+ All other files (except libltdl/* and src/libconfig/*):
+ Copyright (C) 2005, 2006 Florian Forster <octo@verplant.org>
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in `/usr/share/common-licenses/GPL'.
+
+ File libltdl/ltdl.c
+ Copyright (C) 1998-2000, 2004, 2005 Free Software Foundation, Inc.
+ Originally by Thomas Tanner <tanner@ffii.org>
+
+ File libltdl/ltdl.h
+ Copyright (C) 1998-2000 Free Software Foundation, Inc.
+ Originally by Thomas Tanner <tanner@ffii.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+
+On Debian systems, the complete text of the GNU Lesser General Public License
+can be found in `/usr/share/common-licenses/LGPL'.
+
+ Files src/libconfig/*
+ Copyright (C) Roy Keene <libconfig@rkeene.org>
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+The Debian packaging is (C) 2006, Sebastian Harl <sh@tokkee.org> and
+is licensed under the GPL, see above.
+
--- /dev/null
+/*
+ * /usr/share/doc/collectd/examples/sample_plugin.c
+ *
+ * A sample plugin for collectd.
+ *
+ * Written by Sebastian Harl <sh@tokkee.org>
+ *
+ * This is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <collectd/common.h> /* rrd_update_file */
+#include <collectd/plugin.h> /* plugin_* */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/* Optional config file support */
+/* #include <collectd/configfile.h> */
+
+/* Optional debugging support
+ * (only available if collectd was compiled with debugging support) */
+/* #include <collectd/utils_debug.h> */
+
+#define MODULE_NAME "myplugin"
+
+/* Name of the rrd file under DataDir (/var/lib/collectd by default)
+ *
+ * The name may contain slashes to create subdirectories. */
+static char *my_rrd = "myplugin.rrd";
+
+/* DS definitions for the rrd file
+ *
+ * See the rrdcreate(1) manpage for details. The heartbeat is configurable in
+ * collectd. It defaults to 25. */
+static char *ds_def[] =
+{
+ "DS:my_ds:GAUGE:25:0:U",
+ NULL
+};
+
+/* DS count */
+static int ds_num = 1;
+
+/* Time at which the read function is called */
+extern time_t curtime;
+
+/* Initialize the plugin
+ *
+ * This function is called to set up a plugin before using it. */
+static void my_init(void)
+{
+ /* we have nothing to do here :-) */
+ return;
+}
+
+/* Get the data
+ *
+ * This function implements the magic used to get the desired values that
+ * should be stored in the rrd file. It uses plugin_submit to transfer the
+ * data to whatever place is configured in the config file. If there are more
+ * than one instances you should pass a uniq identifier as seconds argument to
+ * the plugin_submit function. */
+#define BUFSIZE 256
+static void my_read(void)
+{
+ long int data = 0;
+ char buf[BUFSIZE] = "";
+
+ /* magic ;-) */
+ data = random();
+
+ if (snprintf(buf, BUFSIZE, "%u:%li",
+ (unsigned int)curtime, data) >= BUFSIZE)
+ return;
+
+ plugin_submit(MODULE_NAME, NULL, buf);
+ return;
+}
+#undef BUFSIZE
+
+/* Save the data
+ *
+ * This function saves the data to the appropriate location by calling
+ * rrd_update_file. It is used to "calculate" the filename and DS definition
+ * appropriate for the given instance. */
+static void my_write(host, inst, val)
+ char *host;
+ char *inst;
+ char *val;
+{
+ rrd_update_file(host, my_rrd, val, ds_def, ds_num);
+ return;
+}
+
+/* Register the plugin
+ *
+ * This function registers the plugin with collectd. It has to be named
+ * "module_register". */
+void module_register(void)
+{
+ plugin_register(MODULE_NAME, my_init, my_read, my_write);
+ return;
+}
+
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+# debian/rules for collectd
+#
+# Written by Sebastian Harl <sh@tokkee.org>.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
CFLAGS = -Wall -g
-PLUGINS = apache mysql sensors multimeter
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
config.status: configure
dh_testdir
- # Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
- --localstatedir=/var --sysconfdir=/etc
+ CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --localstatedir=/var --sysconfdir=/etc
build: build-stamp
-build-stamp: config.status
+build-stamp: config.status
dh_testdir
-
- # Add here commands to compile the package.
+
$(MAKE)
- #docbook-to-man debian/collectd.sgml > collectd.1
-
+
touch build-stamp
clean:
dh_testdir
dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
+ rm -f build-stamp
+
-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
+
dh_clean
-install: build
+install-indep:
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs -i
+
+ include_dir=$(CURDIR)/debian/collectd-dev/usr/include/collectd/ \
+ && mkdir -p $$include_dir \
+ && cp src/*.h $$include_dir
+
+install-arch: build
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
-
- for PLUGIN in $(PLUGINS); do \
- mkdir -p $(CURDIR)/debian/collectd-$${PLUGIN}/usr/lib/collectd; \
- done
-
- # Add here commands to install the package into debian/collectd.
- $(MAKE) DESTDIR=$(CURDIR)/debian/collectd install
- rm $(CURDIR)/debian/collectd/usr/lib/collectd/*.a || true
- rm $(CURDIR)/debian/collectd/usr/lib/collectd/*.la || true
-
- for PLUGIN in $(PLUGINS); do \
- mv $(CURDIR)/debian/collectd/usr/lib/collectd/$${PLUGIN}.* $(CURDIR)/debian/collectd-$${PLUGIN}/usr/lib/collectd; \
- done
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
+ dh_installdirs -a
+
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/collectd
+
+ rm -f $(CURDIR)/debian/collectd/usr/lib/collectd/*.la
+
+ rm -f $(CURDIR)/debian/collectd/etc/collectd.conf
+ install -D -m 0644 $(CURDIR)/debian/collectd.conf \
+ $(CURDIR)/debian/collectd/etc/collectd/collectd.conf
+
+ for PLUGIN in apache hddtemp mysql ping sensors; do \
+ plugin_dir=$(CURDIR)/debian/collectd-$$PLUGIN/usr/lib/collectd/; \
+ mkdir -p $$plugin_dir; \
+ mv $(CURDIR)/debian/collectd/usr/lib/collectd/$$PLUGIN.so \
+ $$plugin_dir; \
+ done
+
+binary-indep: install-indep
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -i ChangeLog
+ dh_installdocs -A -i debian/README.Debian AUTHORS README TODO
+ dh_installexamples -i debian/examples/myplugin.c
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+binary-arch: build install-arch
dh_testdir
dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
- dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
- dh_installdeb
-# dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_installchangelogs -a ChangeLog
+ dh_installdocs -A -a debian/README.Debian AUTHORS README TODO
+ dh_installexamples -a contrib/collectd2html.pl contrib/collection.cgi
+ dh_installinit -a -- defaults 95
+ dh_installman -a src/collectd.1 src/collectd.conf.5
+ dh_link -a
+ dh_strip -a --dbg-package=collectd-dbg
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install-indep install-arch
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
/* #endif HAVE_GETVFSSTAT || HAVE_GETFSSTAT */
/* Solaris (SunOS 10): int getmntent(FILE *fp, struct mnttab *mp); */
-#elif HAVE_GEN_GETMNTENT
+#elif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_GETMNTENT
static cu_mount_t *cu_mount_gen_getmntent (void)
{
struct mnttab mt;
return (first);
} /* static cu_mount_t *cu_mount_gen_getmntent (void) */
-/* #endif HAVE_GEN_GETMNTENT */
+/* #endif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_GETMNTENT */
#elif HAVE_SEQ_GETMNTENT
#warn "This version of `getmntent' hat not yet been implemented!"
/* #endif HAVE_SEQ_GETMNTENT */
-#elif HAVE_SUN_GETMNTENT
-#warn "This version of `getmntent' hat not yet been implemented!"
-/* #endif HAVE_SUN_GETMNTENT */
-
-#elif HAVE_GETMNTENT
+#elif HAVE_ONE_GETMNTENT
static cu_mount_t *cu_mount_getmntent (void)
{
FILE *fp;
return (first);
}
-#endif /* HAVE_GETMNTENT */
+#endif /* HAVE_ONE_GETMNTENT */
/* *** *** *** ******************************************** *** *** *** */
/* *** *** *** *** *** *** public functions *** *** *** *** *** *** */
new = cu_mount_getfsstat ();
#elif HAVE_GEN_GETMNTENT
new = cu_mount_gen_getmntent ();
-#elif HAVE_GETMNTENT
+#elif HAVE_ONE_GETMNTENT
new = cu_mount_getmntent ();
#else
new = NULL;
projects / collectd.git / commitdiff