Florian Forster [Fri, 31 Oct 2008 14:44:53 +0000 (15:44 +0100)]
apcups plugin: Include "collectd.h" *before" <stdlib.h>.
If not defined, <stdlib.h> sets/defines _FILE_OFFSET_BITS. Since (in 32bit
mode) "collectd.h" defines that, too, you'll run into compilation problems.
Ulrich Habel [Wed, 29 Oct 2008 05:54:26 +0000 (06:54 +0100)]
src/utils_dns.c: Cast a `char' to `int' when using `tolower'.
This is needed at least on NetBSD, but probably on other non-GNU libcs as well.
Resolves: #32
Devid Antonio Filoni [Sat, 18 Oct 2008 20:01:53 +0000 (22:01 +0200)]
libiptc/libip6tc.c: Fix a glibc 2.8 compatibility problem.
Hi,
the attached patch fix the build with glibc 2.8. Please include it in
the next version.
Thanks,
Devid Antonio Filoni
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 20 Oct 2008 06:42:11 +0000 (08:42 +0200)]
src/configfile.c: Fix a closing-brace comment.
Florian Forster [Thu, 16 Oct 2008 21:16:38 +0000 (23:16 +0200)]
ChangeLog: Fix a typo.
Florian Forster [Thu, 16 Oct 2008 20:07:59 +0000 (22:07 +0200)]
ChangeLog: Added the changed poisoning behavior.
Florian Forster [Thu, 16 Oct 2008 20:04:46 +0000 (22:04 +0200)]
src/collectd.h: Poison various insecure string functions only when debugging is enabled.
Because the `poison' pragma complains about macros (which are then never
used), this feature does more harm than good in everyday use. So we'll
only activate it when building in debug mode, so hopefully authors of
new plugins will use this.
Florian Forster [Thu, 16 Oct 2008 19:41:47 +0000 (21:41 +0200)]
Bumped version to 4.4.4; Updated ChangeLog.
Florian Forster [Thu, 16 Oct 2008 07:51:33 +0000 (09:51 +0200)]
contrib/exec-munin.px: Fix the folding markers..
Florian Forster [Fri, 10 Oct 2008 10:40:38 +0000 (12:40 +0200)]
src/utils_tail.c: Call `clearerr' before `fgets'.
Hopefully this will resolve problems under the dietlibc.
Florian Forster [Fri, 10 Oct 2008 07:29:10 +0000 (09:29 +0200)]
src/Makefile.am: Fix a copy'n'paste typo.
Sebastian Harl [Wed, 8 Oct 2008 13:46:39 +0000 (15:46 +0200)]
types.db: Reintroduced the "spam_check" type.
This is used by the "email" plugin. Apparently, it got lost when converting
the plugin to the v4 interface: Instead of "spam_check", "email_check" had
been added to types.db. I did not remove "email_check" though as this would
introduce a regression - though very unlikely, somebody out there might be
using that type.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Wed, 8 Oct 2008 10:23:08 +0000 (12:23 +0200)]
collection.cgi: Added support for the "connection" type.
This is used e.g. by the "ipvs" plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Fri, 10 Oct 2008 06:17:22 +0000 (08:17 +0200)]
src/utils_cache.c: Fix a serious memory leak.
Whenever a data set went missing, the its name (the `key'; up to (5*64)+4
bytes) was not free'd.
Thanks to Niraj Tolia for reporting this :)
Florian Forster [Thu, 9 Oct 2008 06:43:48 +0000 (08:43 +0200)]
src/configfile.c: Fix a minor memory leak.
Thanks to Niraj Tolia for reporting this :)
Florian Forster [Thu, 9 Oct 2008 06:43:20 +0000 (08:43 +0200)]
network plugin: Fix a minor memory leak.
Thanks to Niraj Tolia for reporting this :)
Florian Forster [Mon, 6 Oct 2008 21:53:37 +0000 (23:53 +0200)]
collectd-nagios(1): Make the documentation easier to read, more correct and fix errors.
Florian Forster [Mon, 6 Oct 2008 13:35:42 +0000 (15:35 +0200)]
configure.in: Correct the `--enable-<plugin>' code.
The new behavior is documented in the `README' file, too.
Bruno Prémont [Sun, 5 Oct 2008 12:09:08 +0000 (14:09 +0200)]
configure.in: Let configure bail out on missing dependencies
The patch below adds check in AC_PLUGIN() that verifies if the
dependencies are met for any enabled plugin.
In case some dependency is missing (default is disabled and enabled
is selected) configure will fail after dumping summary so all
dependency issues are visible in a single configure pass.
A later addition would be to list requirements (dependencies, OS/Kernel
restrictions) for all plugins in an easily accessible location (e.g.
INSTALL file)
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 6 Oct 2008 09:46:59 +0000 (11:46 +0200)]
src/collectd-nagios.c: Improve handling of lines returned from `GETVAL'.
Then selecting only certain data sources with the `-d' option, the program
would try to read more lines from the server than the server reports, resulting
in the communication never finishing.
This patch resolves that problem and introduces a couple other error handling
blocks.
Thanks to Fabian Linzberger for pointing this out.
Florian Forster [Sun, 5 Oct 2008 10:12:52 +0000 (12:12 +0200)]
netlink plugin: Fix an incorrect format string.
Florian Forster [Fri, 3 Oct 2008 21:11:47 +0000 (23:11 +0200)]
src/utils_ignorelist.c: Fix an off-by-one errror when adding regular expressions.
Resolves: #20
Sebastian Harl [Thu, 2 Oct 2008 13:25:10 +0000 (15:25 +0200)]
collectdmon: Do not block SIGCHLD.
There is no reason to do so as we do not need to synchronize any waitpid()
calls. In fact, doing so was wrong because waitpid() should then return with
an error according to POSIX. This was still working so far since waitpid()
would not return until all children terminated and this is all we really care
about.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Thu, 2 Oct 2008 13:05:51 +0000 (15:05 +0200)]
collectd.conf(5): Briefly document "OKAY"-notifications.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Thu, 2 Oct 2008 12:54:06 +0000 (14:54 +0200)]
ipvs plugin: Use sizeof() instead of a constant.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Fri, 3 Oct 2008 11:30:58 +0000 (13:30 +0200)]
build.sh: Check for more (all?) programs needed.
Sebastian Harl [Sat, 20 Sep 2008 14:34:39 +0000 (16:34 +0200)]
collection.cgi: Added support for the memcached-specific types.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 16 Sep 2008 13:38:48 +0000 (15:38 +0200)]
src/plugin.c: Increase the plugin_log() message buffer to 1024 bytes.
512 bytes is not enough for some perl error messages.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 16 Sep 2008 13:36:18 +0000 (15:36 +0200)]
perl plugin: Log the perl error messages if bootstrapping Collectd failed.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 22 Sep 2008 12:00:31 +0000 (14:00 +0200)]
contrib/collection3: Added graphs for `apache_{bytes,requests}'.
Florian Forster [Mon, 22 Sep 2008 12:00:02 +0000 (14:00 +0200)]
contrib/collection3: Use `instance' rather than `plugin_instance'
for all the `disk_*' graphs.
Florian Forster [Wed, 17 Sep 2008 11:42:59 +0000 (13:42 +0200)]
collection3/etc/collection.conf: Added some mysql stuff.
Florian Forster [Fri, 12 Sep 2008 14:27:35 +0000 (16:27 +0200)]
collectd.conf(5): Changed the default socket paths of the powerdns plugin.
Boian Berberov [Fri, 12 Sep 2008 14:20:10 +0000 (16:20 +0200)]
powerdns plugin: Use `LOCALSTATEDIR' instead of "/var".
I was working on updating Gentoo's ebuild and I noticed that localstatedir was
not used in certain places. Please review these patches and consider them.
Boian Berberov
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Thu, 4 Sep 2008 13:01:06 +0000 (15:01 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Thu, 4 Sep 2008 13:00:40 +0000 (15:00 +0200)]
processes plugin: Fix a format string.
Florian Forster [Mon, 1 Sep 2008 11:37:27 +0000 (13:37 +0200)]
Bumped version to 4.4.3; Updated ChangeLog.
Florian Forster [Mon, 1 Sep 2008 06:04:10 +0000 (08:04 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4
Conflicts:
ChangeLog
version-gen.sh
Florian Forster [Mon, 1 Sep 2008 06:01:33 +0000 (08:01 +0200)]
ChangeLog: Entry for 4.3.4: Bring plugins in alphabetical order.
Florian Forster [Sun, 31 Aug 2008 13:11:15 +0000 (15:11 +0200)]
Bumped version to 4.3.3; Updated ChangeLog.
Florian Forster [Wed, 27 Aug 2008 08:12:55 +0000 (10:12 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4
Sebastian Harl [Tue, 26 Aug 2008 13:52:11 +0000 (15:52 +0200)]
.gitignore: Added collectd-nagios, collectdmon and perl stuff.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 26 Aug 2008 13:51:27 +0000 (15:51 +0200)]
collectd.conf.in: Moved logging plugins to the top of the file.
This will make all logging output of all other plugins available.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 26 Aug 2008 09:52:53 +0000 (11:52 +0200)]
perl plugin: Re-get the perl interpreter after parsing each configuration option.
The current perl interpreter might change while parsing the configuration
(e.g. the first interpreter is created by the "LoadPlugin" option), so this is
to make sure that we're using the right interpreter at all times.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 26 Aug 2008 15:59:18 +0000 (17:59 +0200)]
contrib/snmp-probe-host.px: Don't fail silently, but outupt an empty config.
Florian Forster [Tue, 26 Aug 2008 15:58:28 +0000 (17:58 +0200)]
contrib/snmp-probe-host.px: Work-around for Windows systems.
They don't return an error, but `success' and a string stating
NOSUCHOBJECT.
Just great.
Florian Forster [Tue, 26 Aug 2008 15:57:38 +0000 (17:57 +0200)]
contrib/snmp-probe-host.px: Fix for `table' data without instance.
Jarle Bjørgeengen [Mon, 25 Aug 2008 20:30:27 +0000 (22:30 +0200)]
Collectd::Unixsock: Allow passing of `Interval' to `PUTVAL'.
Florian Forster [Mon, 25 Aug 2008 18:49:19 +0000 (20:49 +0200)]
collectd.conf(5): Fix an example for the tail plugin.
Resolves: #27
Florian Forster [Mon, 25 Aug 2008 18:03:12 +0000 (20:03 +0200)]
memcached plugin: Wait for a *little* longer for the memcached to answer.
poll(2) takes a timeout in milliseconds, not seconds. Multiply
`interval_g' by 1000 before passing it to `poll'.
Thanks to Joost Cassee <joost at cassee.net> for helping debug this.
Florian Forster [Thu, 21 Aug 2008 15:24:32 +0000 (17:24 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Thu, 21 Aug 2008 15:14:29 +0000 (17:14 +0200)]
contrib/snmp-probe-host.px: Added script to semi-automatically create SNMP "host" blocks.
Details can be found in the inline documentation ("POD").
Mohammad Ebrahim Mohammadi Panah [Thu, 21 Aug 2008 14:52:52 +0000 (16:52 +0200)]
collectd-exec(5): Fix two typos.
Florian Forster [Thu, 21 Aug 2008 14:08:55 +0000 (16:08 +0200)]
src/plugin.c: Include the shared object when reporting errors with `lt_dlopen'.
Florian Forster [Wed, 20 Aug 2008 09:52:29 +0000 (11:52 +0200)]
memcached plugin: Remove an unused variable.
Oops.
Florian Forster [Wed, 20 Aug 2008 07:20:56 +0000 (09:20 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Tue, 19 Aug 2008 19:48:45 +0000 (21:48 +0200)]
memcached plugin: Fix a possible file descriptor leak.
Not sure if this fixes the reported bug, but it might.. Feedback would be
welcome.
References: #26
Florian Forster [Tue, 19 Aug 2008 15:18:57 +0000 (17:18 +0200)]
contrib/collection3: Added graph description for `ps_rss'.
Florian Forster [Tue, 19 Aug 2008 14:58:43 +0000 (16:58 +0200)]
contrib/collection3: Added the ability to `flush' data sets.
Both, bin/index.cgi and bin/graph.cgi can now send a FLUSH command to
the daemon via the Collectd::Unixsock module. For this to work you will
have to add the path to the UNIX socket of the `unixsock' plugin to the
configuration file `collection.conf'.
The configuration looks like this:
UnixSockAddr "/var/run/collectd-unixsock"
Florian Forster [Tue, 19 Aug 2008 14:54:10 +0000 (16:54 +0200)]
contrib/collection3: Remove an annoying debug message.
Peter Holik [Tue, 19 Aug 2008 09:08:53 +0000 (11:08 +0200)]
collectd.conf(5): Added documentation for the ipmi plugin.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Mon, 18 Aug 2008 07:30:03 +0000 (09:30 +0200)]
src/common.h: Make sfree() usable like a function.
By putting the code into a "do { } while (0)" loop it is treated like a single
statement and does not break "if () sfree()" like constructs.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sat, 16 Aug 2008 17:35:58 +0000 (19:35 +0200)]
collectd(1), collectd{-exec,.conf}(5): Fixed some minor POD errors.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 19 Aug 2008 07:45:35 +0000 (09:45 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Tue, 19 Aug 2008 07:44:56 +0000 (09:44 +0200)]
build system: Automatically enable the swap plugin if the kvm library is found.
This fixes a bug introduced with the previous commit.
Florian Forster [Tue, 19 Aug 2008 07:26:13 +0000 (09:26 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Tue, 19 Aug 2008 07:25:46 +0000 (09:25 +0200)]
Merge branch 'collectd-4.3' of /var/lib/git/collectd into collectd-4.3
Florian Forster [Tue, 19 Aug 2008 07:24:33 +0000 (09:24 +0200)]
build system: Define which version of libkvm has been checked for.
The used `kvm_getswapinfo' is apparently an extension not all versions of the
kvm library support.
Florian Forster [Mon, 18 Aug 2008 16:19:26 +0000 (18:19 +0200)]
tcpconns plugin: Fix another format string.
Florian Forster [Mon, 18 Aug 2008 14:18:41 +0000 (16:18 +0200)]
tcpconns plugin: Fix formatstrings.
Florian Forster [Mon, 18 Aug 2008 08:48:21 +0000 (10:48 +0200)]
snmp plugin: Fix a possible memory leak.
The result was not freed when `csnmp_instance_list_add' failed. This
rarely happens in 4.3, but later versions will be more strict in the
function, so this became a problem.
Florian Forster [Wed, 13 Aug 2008 09:45:45 +0000 (11:45 +0200)]
contrib/collection3: Added a couple more graph definitions.
Florian Forster [Wed, 13 Aug 2008 07:48:50 +0000 (09:48 +0200)]
contrib/collection3: Added the forgotten Collectd::Graph::Config module.
Florian Forster [Tue, 12 Aug 2008 09:31:26 +0000 (11:31 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4
Peter Holik [Tue, 12 Aug 2008 09:04:27 +0000 (11:04 +0200)]
src/utils_threshold.c: Free allocated memory before returning..
..in an error condition.
Michael Stapelberg [Sat, 9 Aug 2008 12:42:24 +0000 (14:42 +0200)]
memory plugin: The variable is named cache, not cached, at least on libstatgrab >= 0.16
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Boian Berberov [Mon, 11 Aug 2008 14:57:57 +0000 (16:57 +0200)]
configure.in: Look for ip_vs.h in the kernel sources.
Developers,
I am writing an updated ebuild for gentoo and I made this patch that allows
ip_vs.h to be located and the ipvs module to build. Normally I would include
this with the ebuild, but I thought it may be beneficial to send it to you.
Please review it and let me know what you think. I am still inexperienced with
autotools so the patch may not be well put together. If you would consider
applying it or a similar patch, please let me know so I can adjust the ebuild
accordingly.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 28 Jul 2008 09:06:51 +0000 (11:06 +0200)]
contrib/collection3: Add JavaScript code to unify the timespan of all graphs.
Using the new ``Set all images to this timespan'' button one can now easily
show the same timespan in all graphs. This allows to compare different graphs
much more easily.
Florian Forster [Mon, 28 Jul 2008 09:05:39 +0000 (11:05 +0200)]
contrib/collection3: Update `json.cgi' to use the new config parsing function.
Florian Forster [Sun, 27 Jul 2008 15:23:03 +0000 (17:23 +0200)]
controb/collection3: Implement zooming using the mouse wheel.
Also you can now re-center the graph with a double click.
Florian Forster [Sun, 27 Jul 2008 15:22:26 +0000 (17:22 +0200)]
contrib/collection3: Add a generic `instance' placeholder.
It will be replaced by either the type or plugin instance, depending on
which is defined.. This is handy for temperatures and stuff like that,
where sometimes the type instance doesn't exist.
Florian Forster [Sun, 27 Jul 2008 15:21:04 +0000 (17:21 +0200)]
contrib/collection3: Move configuration logic into Collectd::Graph::Config.
Florian Forster [Sun, 27 Jul 2008 11:08:28 +0000 (13:08 +0200)]
contrib/collection3: Updated the `collection3' stuff in contrib/.
Florian Forster [Tue, 15 Jul 2008 14:39:29 +0000 (16:39 +0200)]
ChangeLog: Updated after the merge.
Florian Forster [Tue, 15 Jul 2008 14:32:37 +0000 (16:32 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Tue, 15 Jul 2008 14:29:39 +0000 (16:29 +0200)]
Bumped version to 4.4.2; Updated ChangeLog.
Sebastian Harl [Sat, 12 Jul 2008 09:36:04 +0000 (11:36 +0200)]
configfile.c: Fixed a typo.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Peter Holik [Tue, 15 Jul 2008 06:21:21 +0000 (08:21 +0200)]
ipmi plugin: Fix a typo: sstrerror_r -> sstrerror.
Florian Forster [Mon, 14 Jul 2008 17:38:11 +0000 (19:38 +0200)]
snmp plugin: More format string fixes.
Florian Forster [Mon, 14 Jul 2008 15:35:42 +0000 (17:35 +0200)]
ntpd plugin: Use the standard types `uint8_t' etc. instead of `u_char' etc.
Florian Forster [Mon, 14 Jul 2008 15:27:36 +0000 (17:27 +0200)]
vserver plugin: Use `readdir_r' instead of `readdir'.
`readdir' is not thread safe, so use the (more thread safe) `readdir_r'.
Also, don't use the non-standard `d_type' member of the `dirent'
structure - it's not portable.
I'm aware that this plugin is very Linux specific and Linux most likely
will never use another C library than the GNU libc, but using this
member prevents me from compiling with the most restrictive `strict'
settings..
Florian Forster [Mon, 14 Jul 2008 13:47:02 +0000 (15:47 +0200)]
src/{collectd.h,perl.c}: Poison sprintf after perl.h has been included.
Florian Forster [Mon, 14 Jul 2008 09:57:41 +0000 (11:57 +0200)]
snmp plugin: Fix two format strings.
Florian Forster [Mon, 14 Jul 2008 08:04:37 +0000 (10:04 +0200)]
src/collectd.h: Don't include <pth.h>.
We don't use it, we don't check for it. Why on earth is it still in there..?
Florian Forster [Mon, 14 Jul 2008 07:44:29 +0000 (09:44 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4
Conflicts:
src/ntpd.c
Florian Forster [Mon, 14 Jul 2008 07:41:55 +0000 (09:41 +0200)]
configure.in: Use pkg-config to detect the upsclient library.
The libupsclient-config script is gone in newer versions, so we use pkg-config
instead.
Florian Forster [Mon, 14 Jul 2008 07:39:47 +0000 (09:39 +0200)]
ntpd plugin: Fix two format strings.
Florian Forster [Tue, 8 Jul 2008 11:08:13 +0000 (13:08 +0200)]
contrib/collection3: Add an basic, extensible, modular graphing front-end.
Florian Forster [Sun, 6 Jul 2008 13:24:59 +0000 (15:24 +0200)]
email plugin: Don't print `pthread_t'.
It may be a struct, so printing it is not portable.
Florian Forster [Sun, 6 Jul 2008 13:04:41 +0000 (15:04 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4