Florian Forster [Mon, 10 Jul 2006 21:10:19 +0000 (23:10 +0200)]
collection.cgi: The new processes RRD files have been added.
The new files are:
* ps_rss
* ps_cputime
* ps_count
* ps_pagefaults
Florian Forster [Mon, 10 Jul 2006 21:03:52 +0000 (23:03 +0200)]
processes plugin: The DS-type of the pagefault RRD-file is COUNTER, not GAUGE.
Florian Forster [Mon, 10 Jul 2006 18:51:57 +0000 (20:51 +0200)]
processes plugin: Renamed the selection option to `Process'.
Florian Forster [Mon, 10 Jul 2006 15:21:22 +0000 (17:21 +0200)]
processes plugin: Improved the storage of counters, so they work when the number of running instances varies.
Florian Forster [Mon, 10 Jul 2006 12:34:45 +0000 (14:34 +0200)]
processes plugin: Implement collecting the number of pagefaults for a selected process.
Florian Forster [Mon, 10 Jul 2006 08:13:48 +0000 (10:13 +0200)]
processes plugin: Implement number of processes and number of threads/LWPs of a specific name.
Florian Forster [Mon, 10 Jul 2006 07:53:38 +0000 (09:53 +0200)]
Merge branch 'master' into ff/processes
Florian Forster [Sun, 9 Jul 2006 12:46:27 +0000 (14:46 +0200)]
debian/: Corrected the files needed for building Debian packages.
Florian Forster [Sun, 9 Jul 2006 10:54:26 +0000 (12:54 +0200)]
Bumped version to 3.10.0.
Florian Forster [Sun, 9 Jul 2006 10:51:13 +0000 (12:51 +0200)]
collectd.spec: Added the `ntpd' plugin.
Florian Forster [Sun, 9 Jul 2006 10:46:37 +0000 (12:46 +0200)]
Don't include the debian/ subdirectory in the distribution tarball, since Sebastian has packaged an official package.
Apparently Debian developers prefer not having this directory in the tarball..
Florian Forster [Sun, 9 Jul 2006 10:38:44 +0000 (12:38 +0200)]
Merge branch 'ff/traffic'
Florian Forster [Sun, 9 Jul 2006 10:34:55 +0000 (12:34 +0200)]
collection.cgi: Add the new network RRD-files `if_errors.rrd' and `if_packets.rrd'.
Florian Forster [Sun, 9 Jul 2006 10:16:02 +0000 (12:16 +0200)]
ping plugin: Updated the ping plugin to work with liboping 0.2.2.
Florian Forster [Sun, 9 Jul 2006 10:07:48 +0000 (12:07 +0200)]
liboping: Use `oping.h' rather than the (old) `liboping.h'.
Florian Forster [Sun, 9 Jul 2006 10:06:06 +0000 (12:06 +0200)]
liboping: Updated `oping.h' to version 0.2.2. This has been forgotten previously.
Florian Forster [Sun, 9 Jul 2006 10:05:33 +0000 (12:05 +0200)]
renamed: src/liboping/liboping.h -> src/liboping/oping.h
Florian Forster [Sun, 9 Jul 2006 09:43:04 +0000 (11:43 +0200)]
Merge branch 'install-config'
Florian Forster [Sun, 9 Jul 2006 09:38:51 +0000 (11:38 +0200)]
collectd.conf: Un-comment a valid mode using the automake mechanismn.
Florian Forster [Sun, 9 Jul 2006 09:21:31 +0000 (11:21 +0200)]
Don't overwrite an existing config file. Use `collectd.conf.pkg-orig' instead.
Florian Forster [Sun, 9 Jul 2006 08:49:15 +0000 (10:49 +0200)]
traffic plugin: Store the new `if_packets.rrd' and `if_errors.rrd' in a seperate subdirectory.
This makes it easier for user interfaces to know what host, and what a plugin
subdirectory is.
Florian Forster [Sun, 9 Jul 2006 08:16:49 +0000 (10:16 +0200)]
Merge branch 'collectd-3.9'
Florian Forster [Sun, 9 Jul 2006 08:16:15 +0000 (10:16 +0200)]
network: Be more verbose when `network_create_socket' failes due to a wrong `mode'.
On Sat, Jul 08, 2006 at 02:14:05PM +0000, Cryptronic wrote:
> collectd[6889]: network_create_socket (zensoredip, 25826) failed
if this is the only error you get, you most likely need to put
Mode Client
Somewhere before the `Listen' statement.
Florian Forster [Sun, 9 Jul 2006 00:30:51 +0000 (02:30 +0200)]
collectd.conf: (Un)comment plugins based on the configure-setting. Install the file in `sysconfdir'.
What's not done yet is checking wether or not the (destination) file already
exists and _don't_ overwrite it.
Florian Forster [Sat, 8 Jul 2006 23:53:27 +0000 (01:53 +0200)]
renamed: contrib/collectd.conf -> src/collectd.conf.in
Florian Forster [Sat, 8 Jul 2006 17:29:42 +0000 (19:29 +0200)]
Merge branch 'master' into processes
Florian Forster [Sat, 8 Jul 2006 17:24:22 +0000 (19:24 +0200)]
liboping: Updated liboping to version 0.2.2
Florian Forster [Sat, 8 Jul 2006 17:03:37 +0000 (19:03 +0200)]
Merge branch 'v39/liboping-license'
Florian Forster [Sat, 8 Jul 2006 17:03:03 +0000 (19:03 +0200)]
liboping: Include information about the package in the source districution.
The included files are: AUTHORS, COPYING, ChangeLog, and README
Florian Forster [Sat, 8 Jul 2006 16:53:25 +0000 (18:53 +0200)]
traffic plugin: Documented the new optioins in collectd.conf(5).
Florian Forster [Sat, 8 Jul 2006 16:37:15 +0000 (18:37 +0200)]
traffic plugin: Made it possible to select/ignore certain interfaces.
Based on an idea by and a discussion with Zhuang Yuyao.
Florian Forster [Fri, 7 Jul 2006 09:44:34 +0000 (11:44 +0200)]
liboping: Added license and other information.
octo@alice:~/collectd $ git add src/liboping/{AUTHORS,COPYING,ChangeLog,README}
Florian Forster [Fri, 7 Jul 2006 08:40:59 +0000 (10:40 +0200)]
Merge branch 'v39/libconfig-license'
Florian Forster [Fri, 7 Jul 2006 08:40:28 +0000 (10:40 +0200)]
libconfig: Include the license information in the distribution tarball.
Also added README and other information.
Florian Forster [Sun, 25 Jun 2006 17:42:08 +0000 (19:42 +0200)]
Merge branch 'collectd-3.9'
Florian Forster [Sun, 25 Jun 2006 17:34:15 +0000 (19:34 +0200)]
configure.in: Bumped verion to 3.9.4.
Florian Forster [Sun, 25 Jun 2006 17:33:51 +0000 (19:33 +0200)]
Corrected the date of the 3.9.4 version in `ChangeLog', `debian/changelog' and `collectd.spec'.
Florian Forster [Sun, 25 Jun 2006 13:45:21 +0000 (15:45 +0200)]
configfile: Be more verbose if the `Server' or `Local' modes are not available.
This happends if not linking against librrd. Some people missed the summary at
the end of the configure script and the error message wasn't helping them.
Florian Forster [Sun, 25 Jun 2006 10:13:07 +0000 (12:13 +0200)]
Merge branch 'collectd-3.9'
Florian Forster [Sun, 25 Jun 2006 10:09:15 +0000 (12:09 +0200)]
collectd-3.9: Removed `src/libping' since it's not used.
Florian Forster [Sun, 25 Jun 2006 09:25:52 +0000 (11:25 +0200)]
Merge branch 'svn-trunk'
Florian Forster [Sun, 25 Jun 2006 09:22:59 +0000 (11:22 +0200)]
Copied missing files from the subversion repository.
Florian Forster [Sun, 25 Jun 2006 09:15:35 +0000 (11:15 +0200)]
ChangeLog: Added the bugfix with `operating_mode'.
Florian Forster [Sun, 25 Jun 2006 08:56:59 +0000 (10:56 +0200)]
Merge branch 'v393-fix' into b39-fix
Florian Forster [Sun, 25 Jun 2006 08:53:36 +0000 (10:53 +0200)]
Applied all the changes that `git-svnimport' missed.
Florian Forster [Sun, 25 Jun 2006 08:52:53 +0000 (10:52 +0200)]
Merge branch 'v392-fix' into v393-fix
Florian Forster [Sun, 25 Jun 2006 08:51:57 +0000 (10:51 +0200)]
Merge branch 'v391-fix' into v392-fix
Florian Forster [Sun, 25 Jun 2006 08:50:41 +0000 (10:50 +0200)]
Applied all the changes that `git-svnimport' missed.
Florian Forster [Sun, 25 Jun 2006 08:48:42 +0000 (10:48 +0200)]
Merge branch 'v390-fix' into v391-fix
Florian Forster [Sun, 25 Jun 2006 08:42:32 +0000 (10:42 +0200)]
Applied all the changes that `git-svnimport' missed.
Florian Forster [Sun, 25 Jun 2006 08:36:10 +0000 (10:36 +0200)]
Copied missing files from the subversion repository.
Florian Forster [Sun, 25 Jun 2006 08:27:04 +0000 (10:27 +0200)]
Set `operating_mode' to a defined state, even if not linking with librrd.
Florian Forster [Sun, 18 Jun 2006 17:53:40 +0000 (19:53 +0200)]
Added information about version 3.9.4 to `collectd.spec' and `debian/changelog'.
Florian Forster [Sun, 18 Jun 2006 17:03:59 +0000 (19:03 +0200)]
Added a ChangeLog entry about 3.9.4.
It containes information about the Solaris fixes by Christophe Kalt.
Florian Forster [Sun, 18 Jun 2006 16:16:46 +0000 (18:16 +0200)]
processes branch: Implement cputime consumed by specific processes.
Florian Forster [Sun, 18 Jun 2006 15:42:09 +0000 (17:42 +0200)]
processes branch: Check for `linux/config.h' in the configure script.
It's used to get the HZ value.
Florian Forster [Sun, 18 Jun 2006 13:22:52 +0000 (15:22 +0200)]
processes branch: Added code to actually write the RSS data of a process.
Florian Forster [Sun, 18 Jun 2006 13:06:29 +0000 (15:06 +0200)]
processes branch: Change many types and includes.
Also convert jiffies to useconds and (rss) pages to bytes.
Florian Forster [Sun, 18 Jun 2006 10:00:07 +0000 (12:00 +0200)]
processes branch: Fixed the collection of LWP statistics.
It's working now, but doesn't write any RRD files yet.
Florian Forster [Sat, 17 Jun 2006 21:27:36 +0000 (23:27 +0200)]
processes plugin: Implemented a config-hook.
Also fixed typos.
Florian Forster [Sat, 17 Jun 2006 19:16:31 +0000 (21:16 +0200)]
Merge branch 'processes-fix' into processes
Florian Forster [Sat, 17 Jun 2006 19:15:42 +0000 (21:15 +0200)]
Merge branches 'processes-fix' and 'solaris-fixes'
Conflicts:
src/swap.c
Florian Forster [Sat, 17 Jun 2006 18:33:18 +0000 (20:33 +0200)]
processes plugin: Added some more error- and debug-messages.
Mostly to play with the merging of git, though ;)
Florian Forster [Sat, 17 Jun 2006 18:15:23 +0000 (20:15 +0200)]
Merge branch 'master' into processes
Florian Forster [Sat, 17 Jun 2006 18:14:15 +0000 (20:14 +0200)]
Merge branch 'master-merge' into processes
octo [Fri, 16 Jun 2006 23:02:01 +0000 (23:02 +0000)]
octo@leeloo:~/collectd $ svn merge -r822:823 branches/disk-linux trunk
octo [Thu, 15 Jun 2006 21:51:52 +0000 (21:51 +0000)]
octo@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk
octo [Thu, 15 Jun 2006 20:37:27 +0000 (20:37 +0000)]
solaris-fixes branch: Change `pagesize' to be a `unsigned long long'.
Christophe Kalt is having problems with what appears to be a 32bit overflow.
This is just to make sure the multiplications with `pagesize' are not causing
this.
octo [Thu, 15 Jun 2006 20:28:20 +0000 (20:28 +0000)]
solaris-fixes branch: Complain in the syslog if `swapctl' failes.
Shouldn't happen, but one ought to know if it does.
octo [Thu, 15 Jun 2006 20:24:43 +0000 (20:24 +0000)]
solaris-fixes branch: Applied the swap-patch by Christophe Kalt.
It's supposed to fix the swap plugin under Solaris, but appears to have some
problems.
octo [Thu, 15 Jun 2006 20:19:12 +0000 (20:19 +0000)]
solaris-fixes branch: Fix the debugging output in `configfile.c'.
The Solaris libc doesn't like if you pass a NULL pointer to as the string used
with printf like formatting. This patch introduces a macro which escapes this.
octo [Thu, 15 Jun 2006 10:59:49 +0000 (10:59 +0000)]
octo@leeloo:~/collectd $ svn cp tags/collectd-3.9.3 branches/solaris-fixes
octo [Wed, 14 Jun 2006 09:40:02 +0000 (09:40 +0000)]
disk-linux branch: Fix a bug in the disk plugin.
When `{read,write}-sectors' hit the 32 bit boundary, `atoi' would always return
LONG_MAX, resulting in the same counter-value being logged over and over again,
resulting in zero-entries in the RRD file.
Thanks to James Valente for reporting this bug and providing much debugging
information :)
octo [Wed, 14 Jun 2006 09:03:23 +0000 (09:03 +0000)]
octo@casella:~/collectd $ svn cp trunk branches/disk-linux
octo [Sat, 10 Jun 2006 14:54:58 +0000 (14:54 +0000)]
octo@leeloo:~/collectd $ svn merge -r812:815 branches/apcups trunk
octo [Sat, 10 Jun 2006 14:46:55 +0000 (14:46 +0000)]
trunk: add .gitignore
Thanks to Olaf Rempel for this patch.
octo [Sat, 10 Jun 2006 14:40:39 +0000 (14:40 +0000)]
trunk: Added the `apcups' and the `ntpd' plugins to the `README' file.
octo [Sat, 10 Jun 2006 13:59:15 +0000 (13:59 +0000)]
trunk: traffic plugin: fix linux pkt/err counters
Thanks to Olaf Rempel for this patch.
octo [Sat, 10 Jun 2006 13:57:55 +0000 (13:57 +0000)]
trunk: fix some fd-leaks
Thanks to Olaf Rempel for this patch.
octo [Sat, 10 Jun 2006 13:39:18 +0000 (13:39 +0000)]
trunk: Updated the `collection.cgi' with the `ntpd' types.
Some ntpd-specific types have been added. The `apcups_*' types have been
removed, since the apcups-plugin uses pretty generic types that are also used
the `battery' plugin and possibly others..
octo [Sat, 10 Jun 2006 13:20:35 +0000 (13:20 +0000)]
apcups branch: Remove `write_nbytes' and replace it with `swrite'.
`swrite' is defined in `common.c' and (re)used by other plugins.
Also, use `[u]int16_t' rather than `short', since the C standard doesn't
garuantee a specific size for this storage type.
Finally, the naming of the `packet_size' variable has been unified.
octo [Sat, 10 Jun 2006 13:09:25 +0000 (13:09 +0000)]
apcups branch: Removed `read_nbytes' and replaced with `sread'.
`sread' is the secure-read function provided by `common.c'. This removed
duplicate code..
octo [Sat, 10 Jun 2006 12:59:43 +0000 (12:59 +0000)]
apcups branch: Fixed the behavior of `sread'.
If `sread' receives an EOF it will now close the file descriptor and return an
error. Prior to this revision it would try to read again and possibly fail
then.. Alternatively it might have crashed, who knows..? ;)
octo [Sat, 10 Jun 2006 12:52:23 +0000 (12:52 +0000)]
octo@casella:~/collectd $ svn cp trunk branches/apcups
octo [Sat, 10 Jun 2006 12:51:00 +0000 (12:51 +0000)]
trunk: Added config options of the `apcups' plugin to the `collectd.conf' manpage.
octo [Sat, 10 Jun 2006 12:44:13 +0000 (12:44 +0000)]
trunk: Added configuration options for `ntpd' to the `collectd.conf' manpage.
octo [Sat, 10 Jun 2006 12:33:34 +0000 (12:33 +0000)]
processes branch: A first version to collect more detailed process statistics..
octo [Sat, 10 Jun 2006 12:32:35 +0000 (12:32 +0000)]
octo@casella:~/collectd $ svn merge -r753:807 trunk branches/processes
octo [Sat, 10 Jun 2006 11:38:39 +0000 (11:38 +0000)]
trunk: Documentes the two new plugins, apcups and ntpd
octo [Sat, 10 Jun 2006 11:31:52 +0000 (11:31 +0000)]
octo@casella:~/collectd $ svn merge -r754:800 branches/ntpd trunk
octo@casella:~/collectd $ svn rm branches/ntpd
octo [Sat, 10 Jun 2006 11:15:01 +0000 (11:15 +0000)]
octo@casella:~/collectd $ svn merge -r784:HEAD branches/apcups trunk
octo [Sat, 10 Jun 2006 11:08:15 +0000 (11:08 +0000)]
apcups branch: Don't close the socket after each iteration.
The apcups daemon can handle it and it's nicer to the system to just leave the
socket open, so that's what we're doing. The socket is still closed if
`APCMAIN' is defined.
octo [Sat, 10 Jun 2006 11:01:05 +0000 (11:01 +0000)]
apcups branch: Some debug messages and such.
collectd dies when the port is forwarded using ssh and then the server exits.
Apparently ssh doesn't anser with a connection refused right away which may
result in problems..
This revision adds some debug messages and handles `EOF' correctly (when
reading).
octo [Fri, 9 Jun 2006 20:05:12 +0000 (20:05 +0000)]
ntpd branch: Changed the RRD files of the NTPd plugin to store seconds rather than milliseconds.
Apparently seconds is what we get. I was assuming it was milliseconds for some
unknown reason..
octo [Fri, 9 Jun 2006 11:39:52 +0000 (11:39 +0000)]
apcups branch: Renames some RRD files and DSes.
The `charge_percent' has been renamed to `load_percent' because it's actually
the load on the UPS, not the charge.
The `charge' file has been renamed to `charge_percent', because the values are
in percent, not Ah.
octo [Fri, 9 Jun 2006 09:35:57 +0000 (09:35 +0000)]
apcups branch: Renamed the temperature-DS to `value' to work with existing plugins.
octo [Thu, 8 Jun 2006 17:57:43 +0000 (17:57 +0000)]
apcups branch: Fixed some minor issues with the apcups plugin. It's working now.
octo [Thu, 8 Jun 2006 17:32:49 +0000 (17:32 +0000)]
freebsd branch: swap plugin: Added the possibility to use `libkvm' to collect swap statistics.
For some weird reason one needs r00t for this, though..
octo [Thu, 8 Jun 2006 17:31:43 +0000 (17:31 +0000)]
freebsd branch: memory plugin: Include "utils_debug.h" because DBG is being used.
octo [Wed, 7 Jun 2006 17:11:52 +0000 (17:11 +0000)]
freebsd branch: swap plugin: Use `sysctlnametomib' to query the mib if we don't know it.
Maybe this should be the default?