Improved the build process a bit..

Bumped version to 3.5.alpha0

diff --git a/ChangeLog b/ChangeLog
new file mode 100644 (file)
index 0000000..5b4af8d
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,120 @@
+2005-12-07, Version 3.5.0
+       * A bug in the `load' module under Solaris has been fixed.
+       * The `users' module has been contributed by Sebastian Harl. It counts
+         currently logged in users.
+
+2005-11-15, Version 3.4.0 (Revision 236)
+       * A PID-file is written to /var/run upon startup. Thanks to `Tommie'
+         from gentoo's bugzilla for writing the patch.
+       * The build dependency for librrd has been removed. Binaries built
+         without librrd are client-only and will multicast their value as
+         with the `-c' argument.
+       * A patch by Peter Holik adds a module for monitoring CPU frequencies.
+       * The newly introduced `-f' switch prevents daemon initialization
+         (forking, closing standard filehandles, etc.) Thanks to Alvaro
+         Barcellos for this patch.
+
+2005-11-04, Version 3.3.0 (Revision 216)
+       * New modules have been added:
+         - `serial', for monitoring traffic on the serial interfaces
+         - `nfs', for graphing NFS procedure calls
+         - `tape', traffic from/to tape devices
+       * The the memory.rrd now accepts more than 4Gig of memory.
+
+2005-10-26, Version 3.2.0 (Revision 200)
+       * Support for graphing the processes has been added (thanks to Lyonel
+         Vincent)
+       * If reading from hddtemp failes collectd will increase the time
+         between polls up to one day.
+       * The init.d files have been improved.
+       * Problems with the spec file have been fixed.
+
+2005-10-16, Version 3.1.0 (Revision 194)
+       * Added the `setsid' syscall to the startup code.
+       * Support for hddtemp has been added (thanks to Vincent Stehlé)
+
+2005-09-30, Version 3.0.0 (Revision 184)
+       * The ability to send/receive data to/from the network (think
+         multicast) has been added.
+       * Modules have been split up into shared libraries can be loaded at
+         runtime. The biggest advantage is that the core program doesn't need
+         to be linked against an external library.
+       * A patch by George Kargiotakis has been applied: It fixes the sensors
+         behaviour then more than one sensor is being queried.
+
+2005-09-16, Version 2.1.0 (Revision 172)
+       * A module for swap statistics has been added.
+
+2005-09-09, Version 2.0.0 (Revision 135)
+       * Filenames can no longer be configured at program startup. The only
+         options as of this version are the directory and ping hosts.
+       * CPU statistics now include Wait-IO. If privided under Linux IRQ and
+         Soft-IRQ statistics are added to `System'. 
+       * Diskstats now collect read and write bytes, not sectors.
+       * Ping statistics can now be collected for more than one host. There
+         is no default any more: If no host is given no host will be pinged.
+       * A self-written patch for libping has been applied so it builds
+         cleanly.
+
+2005-09-01, Version 1.8.1 (Revision 123)
+       * Much improved configure-script: libraries and features may now be
+         disabled.
+       * More detailed warnings/error messages when RRD update failes.
+
+2005-08-29, Version 1.8.0:
+       * Support for collecting disk statistics under Solaris.
+
+2005-08-25, Version 1.7.0:
+       * Support for libstatgrab[1] for load, memory usage and network
+         traffic. CPU- and disk-usage are not (yet) supported, since
+         libstatgrab returns insufficient information. I will contact the
+         authors.
+       * Improved the CPU-initialization code for Solaris. Apparently CPUs
+         aren't neccessarily counted linear which is now handled correctly.
+       [1]: http://www.i-scream.org/libstatgrab/
+
+2005-08-21, Version 1.6.0:
+       * Basic support for Solaris: System load and cpu-usage can be
+         collected unter Solaris, too. Other stats will follow later.
+       * Many fixes in the autoconf-script
+       * Collection/Museum scripts have been added unter contrib/museum
+       * collectd may now be started in unprivileged mode, though ping
+         statistics will not work.
+
+2005-07-17, Version 1.5.1:
+       * Diskstats-RRDs now use major/minor for naming. Some systems have
+         weird strings as disk-names..
+
+2005-07-17, Version 1.5:
+       * A new module, diskstats, has been added. It collects information
+         about the disks and partitions.
+
+2005-07-11, Version 1.4.2:
+       * The meminfo mofule has been changed to work with more platforms
+         and/or kernel versions.
+
+2005-07-10, Version 1.4.1: Correct traffic stats
+       * The traffic rrd-file is now created with DS-type `COUNTER' which I
+         forgot to correct when I changed that module.
+
+2005-07-09, Version 1.4: More traffic stats
+       * Traffic is now collected for all interfaces that can be found
+       * Temperature-statistics are read from lm-sensors if available
+
+2005-07-08, Version 1.3: CPU stats
+       * Collecting CPU statistics now
+
+2004-07-12, Version 1.2: Using syslog
+       * collectd is now using the syslog facility to report errors, warnings
+         and the like..
+       * The default directory is now /var/db/collectd
+
+2004-07-10, Version 1.1: Minor changes
+       * Nothing really usefull to say ;)
+
+2004-07-09, Version 1.0: Initial Version
+       * The following modules are provided:
+         * Load average
+         * Ping time
+         * Traffic
+         * Memory info

diff --git a/Makefile.am b/Makefile.am
index f8279e3ed6273b37a0384bd342c7a8a90289e97d..39b12b1f77bc461ee477cbe8c9790a7d0a25def5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,3 +6,6 @@ EXTRA_DIST = collectd.spec contrib debian
 
 dist-hook:
        find $(distdir) -type d -name '.svn' | xargs rm -rf
+
+install-exec-hook:
+       $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run

diff --git a/README b/README
index 3da2aaff1f74e01960a7789640803cf004ad9f0d..ca28e009f49117dc5c657b93e6c60518d081c948 100644 (file)
--- a/README
+++ b/README
@@ -53,6 +53,9 @@ Features
     - Traffic
       (In/Outbound traffic on the interfaces)
 
+    - Users
+      (Currently logged in users)
+
   * Performance: Running as a daemon collectd doesn't spend much time in
     startup. Since collectd links against libping, librrd and libsensors it
     doesn't need to start any other processes.

diff --git a/collectd.spec b/collectd.spec
new file mode 100644 (file)
index 0000000..746f670
--- /dev/null
+++ b/collectd.spec
@@ -0,0 +1,135 @@
+Summary:       Statistics collection daemon for filling RRD files.
+Name:           collectd
+Version:       3.5.0
+Release:       1
+Source:                http://verplant.org/collectd/%{name}-%{version}.tar.gz
+License:       GPL
+Group:         System Environment/Daemons
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+BuildPrereq:   lm_sensors-devel, rrdtool-devel
+Requires:      rrdtool
+Packager:      Florian octo Forster <octo@verplant.org>
+Vendor:                Florian octo Forster <octo@verplant.org>
+
+%description
+collectd is a small daemon written in C for performance.  It reads various
+system  statistics  and updates  RRD files,  creating  them if neccessary.
+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.
+
+%package sensors
+Summary:       libsensors-module for collectd.
+Group:         System Environment/Daemons
+Requires:      collectd = %{version}, lm_sensors
+%description sensors
+This  plugin  for  collectd  provides  querying  of sensors  supported  by
+lm_sensors.
+
+%package hddtemp
+Summary:       hddtemp-module for collectd.
+Group:         System Environment/Daemons
+Requires:      collectd = %{version}, hddtemp >= 0.3
+%description hddtemp
+This plugin for  collectd provides querying  the hddtemp-daemon.  For more
+information see hddtemp's homepage:  http://www.guzu.net/linux/hddtemp.php
+
+%prep
+rm -rf $RPM_BUILD_ROOT
+%setup
+
+%build
+./configure --prefix=%{_prefix} --sbindir=%{_sbindir} --mandir=%{_mandir} --libdir=%{_libdir}
+make
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/default
+cp debian/collectd.default $RPM_BUILD_ROOT/etc/default/collectd
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+cp contrib/init.d-rh7 $RPM_BUILD_ROOT/etc/rc.d/init.d/collectd
+mkdir -p $RPM_BUILD_ROOT/var/lib/collectd
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
+%doc contrib
+%config /etc/default/collectd
+%attr(0755,root,root) /etc/rc.d/init.d/collectd
+%attr(0755,root,root) %{_sbindir}/collectd
+%attr(0444,root,root) %{_mandir}/man1/*
+%attr(0444,root,root) %{_libdir}/%{name}/cpu.so*
+%attr(0444,root,root) %{_libdir}/%{name}/cpufreq.so*
+%attr(0444,root,root) %{_libdir}/%{name}/disk.so*
+%attr(0444,root,root) %{_libdir}/%{name}/load.so*
+%attr(0444,root,root) %{_libdir}/%{name}/memory.so*
+%attr(0444,root,root) %{_libdir}/%{name}/nfs.so*
+%attr(0444,root,root) %{_libdir}/%{name}/ping.so*
+%attr(0444,root,root) %{_libdir}/%{name}/processes.so*
+%attr(0444,root,root) %{_libdir}/%{name}/serial.so*
+%attr(0444,root,root) %{_libdir}/%{name}/swap.so*
+%attr(0444,root,root) %{_libdir}/%{name}/traffic.so*
+%attr(0444,root,root) %{_libdir}/%{name}/users.so*
+%dir /var/lib/collectd
+
+%files sensors
+%attr(0444,root,root) %{_libdir}/%{name}/sensors.so*
+
+%files hddtemp
+%attr(0444,root,root) %{_libdir}/%{name}/hddtemp.so*
+
+%changelog
+* Wed Dec 07 2005 Florian octo Forster <octo@verplant.org> 3.5.0-1
+- New upstream version
+
+* Sat Nov 26 2005 Florian octo Forster <octo@verplant.org> 3.4.0-1
+- New upstream version
+
+* Sat Nov 05 2005 Florian octo Forster <octo@verplant.org> 3.3.0-1
+- New upstream version
+
+* Tue Oct 26 2005 Florian octo Forster <octo@verplant.org> 3.2.0-1
+- New upstream version
+- Added statement to remove the `*.la' files. This fixes a problem when
+  `Unpackaged files terminate build' is in effect.
+- Added `processes.so*' to the main package
+
+* Fri Oct 14 2005 Florian octo Forster <octo@verplant.org> 3.1.0-1
+- New upstream version
+- Added package `collectd-hddtemp'
+
+* Fri Sep 30 2005 Florian octo Forster <octo@verplant.org> 3.0.0-1
+- New upstream version
+- Split the package into `collectd' and `collectd-sensors'
+
+* Fri Sep 16 2005 Florian octo Forster <octo@verplant.org> 2.1.0-1
+- New upstream version
+
+* Mon Sep 10 2005 Florian octo Forster <octo@verplant.org> 2.0.0-1
+- New upstream version
+
+* Mon Aug 29 2005 Florian octo Forster <octo@verplant.org> 1.8.0-1
+- New upstream version
+
+* Sun Aug 25 2005 Florian octo Forster <octo@verplant.org> 1.7.0-1
+- New upstream version
+
+* Sun Aug 21 2005 Florian octo Forster <octo@verplant.org> 1.6.0-1
+- New upstream version
+
+* Sun Jul 17 2005 Florian octo Forster <octo@verplant.org> 1.5.1-1
+- New upstream version
+
+* Sun Jul 17 2005 Florian octo Forster <octo@verplant.org> 1.5-1
+- New upstream version
+
+* Mon Jul 11 2005 Florian octo Forster <octo@verplant.org> 1.4.2-1
+- New upstream version
+
+* Sat Jul 09 2005 Florian octo Forster <octo@verplant.org> 1.4-1
+- Built on RedHat 7.3

diff --git a/configure.in b/configure.in
index f297bdad70deaea92304cf0338499eb40e77c6b8..7941cd53c61d5f473f6d8d9576eddc27822572fb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/collectd.c)
-AM_INIT_AUTOMAKE(collectd, 3.4.0)
+AM_INIT_AUTOMAKE(collectd, 3.5.alpha0)
 AM_CONFIG_HEADER(src/config.h src/libping/config.h)
 AC_LANG(C)
 
@@ -75,7 +75,8 @@ AC_CHECK_FUNCS(strncasecmp strcasecmp strncmp)
 AC_CHECK_FUNCS(getloadavg, [have_getloadavg="yes"], [have_getloadavg="no"])
 
 # For users module
-AC_CHECK_FUNCS(getutent getutxent)
+have_getutent="no"
+AC_CHECK_FUNCS(getutent getutxent, [have_getutent="yes"])
 
 AC_MSG_CHECKING([for kernel type ($host_os)])
 case $host_os in
@@ -410,7 +411,7 @@ AM_CONDITIONAL(BUILD_MODULE_TRAFFIC, test "x$enable_traffic" = "xyes")
 AC_ARG_ENABLE(users, AC_HELP_STRING([--disable-users], [Disable user count statistics]),, [enable_users="yes"])
 if test "x$enable_users" != "xno"
 then
-       if test "x$ac_system" = "xLinux" -o "x$ac_system" = "xSolaris"
+       if test "x$have_getutent" = "xyes"
        then
                enable_users="yes"
        else

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..7199fb7
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,117 @@
+collectd (3.5.0-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Florian Forster <octo@verplant.org>  Wed, 07 Dec 2005 11:50:17 +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
+
+  * New upstream version
+  * Added examples from the contrib/ directory
+  * Added /etc/default/collectd for easy configuration
+  * Added libsensors3 to the dependencies
+
+ -- Florian Forster <octo@verplant.org>  Fri,  9 Jul 2005 01:01:32 +0200
+
+collectd (1.3-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Florian Forster <octo@verplant.org>  Fri,  8 Jul 2005 19:05:16 +0200
+