collection.cgi: Add the new network RRD-files `if_errors.rrd' and `if_packets.rrd'.
ping plugin: Updated the ping plugin to work with liboping 0.2.2.
liboping: Use `oping.h' rather than the (old) `liboping.h'.
liboping: Updated `oping.h' to version 0.2.2. This has been forgotten previously.
renamed: src/liboping/liboping.h -> src/liboping/oping.h
Merge branch 'install-config'
collectd.conf: Un-comment a valid mode using the automake mechanismn.
Don't overwrite an existing config file. Use `collectd.conf.pkg-orig' instead.
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.
This makes it easier for user interfaces to know what host, and what a plugin
subdirectory is.
Merge branch 'collectd-3.9'
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.
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.
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.
What's not done yet is checking wether or not the (destination) file already
exists and _don't_ overwrite it.
renamed: contrib/collectd.conf -> src/collectd.conf.in
Merge branch 'master' into processes
liboping: Updated liboping to version 0.2.2
Merge branch 'v39/liboping-license'
liboping: Include information about the package in the source districution.
The included files are: AUTHORS, COPYING, ChangeLog, and README
The included files are: AUTHORS, COPYING, ChangeLog, and README
traffic plugin: Documented the new optioins in collectd.conf(5).
traffic plugin: Made it possible to select/ignore certain interfaces.
Based on an idea by and a discussion with Zhuang Yuyao.
Based on an idea by and a discussion with Zhuang Yuyao.
liboping: Added license and other information.
octo@alice:~/collectd $ git add src/liboping/{AUTHORS,COPYING,ChangeLog,README}
octo@alice:~/collectd $ git add src/liboping/{AUTHORS,COPYING,ChangeLog,README}
Merge branch 'v39/libconfig-license'
libconfig: Include the license information in the distribution tarball.
Also added README and other information.
Also added README and other information.
Merge branch 'collectd-3.9'
configure.in: Bumped verion to 3.9.4.
18 years agoCorrected the date of the 3.9.4 version in `ChangeLog', `debian/changelog' and `colle...
Corrected the date of the 3.9.4 version in `ChangeLog', `debian/changelog' and `collectd.spec'.
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.
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.
Merge branch 'collectd-3.9'
collectd-3.9: Removed `src/libping' since it's not used.
Merge branch 'svn-trunk'
Copied missing files from the subversion repository.
ChangeLog: Added the bugfix with `operating_mode'.
Merge branch 'v393-fix' into b39-fix
Applied all the changes that `git-svnimport' missed.
Merge branch 'v392-fix' into v393-fix
Merge branch 'v391-fix' into v392-fix
Applied all the changes that `git-svnimport' missed.
Merge branch 'v390-fix' into v391-fix
Applied all the changes that `git-svnimport' missed.
Copied missing files from the subversion repository.
Set `operating_mode' to a defined state, even if not linking with librrd.
Added information about version 3.9.4 to `collectd.spec' and `debian/changelog'.
Added a ChangeLog entry about 3.9.4.
It containes information about the Solaris fixes by Christophe Kalt.
It containes information about the Solaris fixes by Christophe Kalt.
processes branch: Implement cputime consumed by specific processes.
processes branch: Check for `linux/config.h' in the configure script.
It's used to get the HZ value.
It's used to get the HZ value.
processes branch: Added code to actually write the RSS data of a process.
processes branch: Change many types and includes.
Also convert jiffies to useconds and (rss) pages to bytes.
Also convert jiffies to useconds and (rss) pages to bytes.
processes branch: Fixed the collection of LWP statistics.
It's working now, but doesn't write any RRD files yet.
It's working now, but doesn't write any RRD files yet.
processes plugin: Implemented a config-hook.
Also fixed typos.
Also fixed typos.
Merge branch 'processes-fix' into processes
Merge branches 'processes-fix' and 'solaris-fixes'
Conflicts:
src/swap.c
Conflicts:
src/swap.c
processes plugin: Added some more error- and debug-messages.
Mostly to play with the merging of git, though ;)
Mostly to play with the merging of git, though ;)
Merge branch 'master' into processes
Merge branch 'master-merge' into processes
octo@leeloo:~/collectd $ svn merge -r822:823 branches/disk-linux trunk
octo@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk
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.
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.
solaris-fixes branch: Complain in the syslog if `swapctl' failes.
Shouldn't happen, but one ought to know if it does.
Shouldn't happen, but one ought to know if it does.
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.
It's supposed to fix the swap plugin under Solaris, but appears to have some
problems.
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.
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@leeloo:~/collectd $ svn cp tags/collectd-3.9.3 branches/solaris-fixes
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 :)
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@casella:~/collectd $ svn cp trunk branches/disk-linux
octo@leeloo:~/collectd $ svn merge -r812:815 branches/apcups trunk
trunk: add .gitignore
Thanks to Olaf Rempel for this patch.
Thanks to Olaf Rempel for this patch.
trunk: Added the `apcups' and the `ntpd' plugins to the `README' file.
trunk: traffic plugin: fix linux pkt/err counters
Thanks to Olaf Rempel for this patch.
Thanks to Olaf Rempel for this patch.
trunk: fix some fd-leaks
Thanks to Olaf Rempel for this patch.
Thanks to Olaf Rempel for this patch.
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..
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..
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.
`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.
apcups branch: Removed `read_nbytes' and replaced with `sread'.
`sread' is the secure-read function provided by `common.c'. This removed
duplicate code..
`sread' is the secure-read function provided by `common.c'. This removed
duplicate code..
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..? ;)
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@casella:~/collectd $ svn cp trunk branches/apcups
trunk: Added config options of the `apcups' plugin to the `collectd.conf' manpage.
trunk: Added configuration options for `ntpd' to the `collectd.conf' manpage.
processes branch: A first version to collect more detailed process statistics..
octo@casella:~/collectd $ svn merge -r753:807 trunk branches/processes
trunk: Documentes the two new plugins, apcups and ntpd
octo@casella:~/collectd $ svn merge -r754:800 branches/ntpd trunk
octo@casella:~/collectd $ svn rm branches/ntpd
octo@casella:~/collectd $ svn rm branches/ntpd
octo@casella:~/collectd $ svn merge -r784:HEAD branches/apcups trunk
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.
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.
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).
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).
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..
Apparently seconds is what we get. I was assuming it was milliseconds for some
unknown reason..
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.
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.
apcups branch: Renamed the temperature-DS to `value' to work with existing plugins.
apcups branch: Fixed some minor issues with the apcups plugin. It's working now.
freebsd branch: swap plugin: Added the possibility to use `libkvm' to collect swap statistics.
For some weird reason one needs r00t for this, though..
For some weird reason one needs r00t for this, though..
freebsd branch: memory plugin: Include "utils_debug.h" because DBG is being used.
18 years agofreebsd branch: swap plugin: Use `sysctlnametomib' to query the mib if we don't know it.
freebsd branch: swap plugin: Use `sysctlnametomib' to query the mib if we don't know it.
Maybe this should be the default?
Maybe this should be the default?
freebsd branch: memory plugin: Use `errno', not the return value of `sysctlbyname', as argument to `strerror'.
freebsd branch: memory plugin: Quick bugfix. Works under FreeBSD now.
memory plugin: MACH_VM_STATISTICS_H -> HAVE_MACH_VM_STATISTICS_H
Not really a bug. It worked the other way, too..
Not really a bug. It worked the other way, too..
freebsd branch: memory.c: Hopefully working version.
Use `sysctlbyname' to get values instead of the `sysctl' call. Also, use the
`HAVE_SYSCTLBYNAME' define rather than `VM_TOTAL'.
Use `sysctlbyname' to get values instead of the `sysctl' call. Also, use the
`HAVE_SYSCTLBYNAME' define rather than `VM_TOTAL'.
freebsd branch: First attempt at porting the `memory' plugin to FreeBSD.
octo@huhu:~/collectd $ svn cp trunk branches/freebsd
octo@leeloo:~/collectd $ svn merge -r737:784 branches/apcups trunk
The trunk did not compile with the `apcups' plugin enabled. Since it's enabled
by default some extra action was neccessary. The `apcups' plugin in the branch
compiles and may be useable, so I'm merging it back to get to some consistent
state.
The trunk did not compile with the `apcups' plugin enabled. Since it's enabled
by default some extra action was neccessary. The `apcups' plugin in the branch
compiles and may be useable, so I'm merging it back to get to some consistent
state.
apcups branch: Fix minor issues with the apcups plugin.
- Removed `#include <errno.h>' since it is included from `collectd.h'.
- Changed `global_host' back to NULL. Added a ?:-construct to use a default
value when querying the server.
- Use `strcmp' rather than `strncmp' to compare the full string, not just part
of the strings.
- Removed `#include <errno.h>' since it is included from `collectd.h'.
- Changed `global_host' back to NULL. Added a ?:-construct to use a default
value when querying the server.
- Use `strcmp' rather than `strncmp' to compare the full string, not just part
of the strings.
1. Was erroneously using tokptr vice key.
2. Changed calls to strcmp to strncmp so that
only definate ranges where being compared.
2. Changed calls to strcmp to strncmp so that
only definate ranges where being compared.
1. Keeping the socket open on my system, when apcupsd is shutdown, collectd dies as well.
I re-inserted the net_close() and now when apcupsd is shutdown (or otherwise goes away)
collectd stays running.
2. Changed the 'complain' and 'complain_step' code so that it will chirp the first time, then
every 6 hours. As it was originally it would only start complaining after 6 hours. Additionally
I made complain an unsigned int. If it was an int and rolled over I wasn't certain what would happen.
3. 'global_host' set to localhost. It was set to NULL, but what happens is if someone does not enter
an apcups section to collectd.conf, then it will not connect to anyone. With 'global_host' set to localhost
the default behavior is now to connect to the apcupsd on the localhost.
4. Added entry for apcupsd.so in 'contrib/collectd.spec'.
I re-inserted the net_close() and now when apcupsd is shutdown (or otherwise goes away)
collectd stays running.
2. Changed the 'complain' and 'complain_step' code so that it will chirp the first time, then
every 6 hours. As it was originally it would only start complaining after 6 hours. Additionally
I made complain an unsigned int. If it was an int and rolled over I wasn't certain what would happen.
3. 'global_host' set to localhost. It was set to NULL, but what happens is if someone does not enter
an apcups section to collectd.conf, then it will not connect to anyone. With 'global_host' set to localhost
the default behavior is now to connect to the apcupsd on the localhost.
4. Added entry for apcupsd.so in 'contrib/collectd.spec'.
Changed the build system to link against the system's `liboping' if it is found.
If it is not found the version shipped in `src/liboping' is used.
If it is not found the version shipped in `src/liboping' is used.
octo@leeloo:~/collectd $ svn merge -r773:777 branches/collectd-3.9 trunk