Florian Forster [Sat, 27 Nov 2010 10:00:29 +0000 (11:00 +0100)]
Merge branch 'collectd-4.9' into collectd-4.10
Conflicts:
ChangeLog
src/collectd.conf.pod
version-gen.sh
Florian Forster [Sat, 27 Nov 2010 09:55:47 +0000 (10:55 +0100)]
Bump version to 4.9.4; Update ChangeLog.
Florian Forster [Fri, 26 Nov 2010 21:46:26 +0000 (22:46 +0100)]
src/utils_time.[ch]: Implement work-around for Mac OS X …
… which, apparently, doesn't have clock_gettime(2).
Florian Forster [Thu, 25 Nov 2010 10:51:17 +0000 (11:51 +0100)]
Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
Sven Trenkel [Thu, 25 Nov 2010 09:56:30 +0000 (10:56 +0100)]
netapp: Fixed incompatible changes between NetApp Release 7.2 and 7.3 that prevented collecting SIS data
Florian Forster [Tue, 23 Nov 2010 17:45:49 +0000 (18:45 +0100)]
swap plugin: Fix a bug collecting swap I/O.
Florian Forster [Tue, 23 Nov 2010 12:02:21 +0000 (13:02 +0100)]
src/utils_cache.c: Call the "missing" callbacks when a value is not being updated.
Florian Forster [Tue, 23 Nov 2010 11:57:25 +0000 (12:57 +0100)]
src/common.[ch]: Implement "parse_identifier_vl".
Florian Forster [Tue, 23 Nov 2010 11:56:11 +0000 (12:56 +0100)]
src/plugin.[ch]: Implement "missing" callbacks.
This is a first step towards moving the threshold checking code into
a plugin.
Florian Forster [Thu, 18 Nov 2010 08:48:17 +0000 (09:48 +0100)]
src/collectd.conf.in: Add the LPAR plugin.
Florian Forster [Thu, 18 Nov 2010 08:45:22 +0000 (09:45 +0100)]
collectd.conf(5): Add documentation for the LPAR plugin.
Florian Forster [Wed, 17 Nov 2010 14:18:03 +0000 (15:18 +0100)]
Merge branch 'ff/highres'
Conflicts:
src/netapp.c
Florian Forster [Tue, 16 Nov 2010 11:20:18 +0000 (12:20 +0100)]
Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
Sven Trenkel [Tue, 16 Nov 2010 11:11:45 +0000 (12:11 +0100)]
Fixed RedHat init script to shut down collectd on reboot/halt.
Florian Forster [Tue, 16 Nov 2010 08:20:04 +0000 (09:20 +0100)]
network plugin: Introduce new types for the "high resolution" time fields.
Florian Forster [Sun, 14 Nov 2010 09:52:13 +0000 (10:52 +0100)]
collectd.conf(5): Document the dangers of messing with the interval setting.
Florian Forster [Fri, 12 Nov 2010 07:13:42 +0000 (08:13 +0100)]
processes plugin: Don't complain about a failed open(/proc/$PID/cmdline)
... if the error is ENOENT. This merely means we were too slow and that
we can safely ignore the process.
Florian Forster [Thu, 11 Nov 2010 15:56:32 +0000 (16:56 +0100)]
unixsock plugin: Implement the "DeleteSocket" option.
Sven Trenkel [Thu, 11 Nov 2010 14:19:15 +0000 (15:19 +0100)]
python: Added support for subsecond interval.
Florian Forster [Thu, 11 Nov 2010 13:20:58 +0000 (14:20 +0100)]
src/utils_rrdcreate.c: Remove a too strict assertion.
We don't actually check anywhere that vl->time is greater than 10, so we
cannot assure this.
Florian Forster [Thu, 11 Nov 2010 12:33:38 +0000 (13:33 +0100)]
v5upgrade target: Implement "upgrades" for the ZFS ARC plugin.
Florian Forster [Thu, 11 Nov 2010 11:35:36 +0000 (12:35 +0100)]
zfs_arc plugin: Change the order of type instance "fields" for the "cache_result" type.
Florian Forster [Thu, 11 Nov 2010 10:30:37 +0000 (11:30 +0100)]
zfs_arc plugin: Use the more generic "cache_*" types …
… instead of those awful "arc_*" types.
Florian Forster [Sat, 6 Nov 2010 14:04:31 +0000 (15:04 +0100)]
src/utils_cmd_flush.c: Fix parsing of the "timeout" option.
Florian Forster [Sat, 6 Nov 2010 13:26:38 +0000 (14:26 +0100)]
rrdtool plugin: Make sure "cache_timeout + random_variation" dosn't get negative.
Florian Forster [Sat, 6 Nov 2010 13:26:16 +0000 (14:26 +0100)]
src/{collectd,plugin}.c: Don't cast "-1" to cdtime_t.
Florian Forster [Sat, 6 Nov 2010 11:11:23 +0000 (12:11 +0100)]
Merge branch 'collectd-4.10'
Florian Forster [Sat, 6 Nov 2010 11:08:20 +0000 (12:08 +0100)]
Merge branch 'collectd-4.9' into collectd-4.10
Conflicts:
src/collectd.conf.in
src/python.c
Florian Forster [Sat, 6 Nov 2010 08:58:57 +0000 (09:58 +0100)]
README: Add libperfstat as an optional dependency.
Florian Forster [Sat, 6 Nov 2010 08:58:25 +0000 (09:58 +0100)]
AUTHORS: Add Aurélien Reynaud
Florian Forster [Sat, 6 Nov 2010 08:55:29 +0000 (09:55 +0100)]
README: Add the "LPAR" plugin.
Florian Forster [Sat, 6 Nov 2010 08:40:05 +0000 (09:40 +0100)]
Merge branch 'ar/lpar'
Aurelien Reynaud [Thu, 14 Oct 2010 20:09:29 +0000 (22:09 +0200)]
lpar plugin: rename NS_TO_TICKS() macro to CLOCKTICKS_TO_TICKS()
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Aurelien Reynaud [Thu, 14 Oct 2010 20:09:28 +0000 (22:09 +0200)]
lpar plugin: update commen t regarding poll_idle vs pool_busy
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Aurelien Reynaud [Thu, 14 Oct 2010 20:09:27 +0000 (22:09 +0200)]
lpar plugin: check for donation support in libperfstat
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sat, 6 Nov 2010 08:04:39 +0000 (09:04 +0100)]
Merge branch 'sp/amqp'
Florian Forster [Sat, 6 Nov 2010 08:04:25 +0000 (09:04 +0100)]
AUTHORS: Add Sebastien Pahl.
Florian Forster [Sat, 6 Nov 2010 08:00:00 +0000 (09:00 +0100)]
amqp plugin: Document the lock required to hold when calling "camqp_write_locked".
Florian Forster [Sat, 6 Nov 2010 07:53:02 +0000 (08:53 +0100)]
amqp plugin: Rename the "shutdown" function to avoid problems with shutdown(2).
Florian Forster [Sat, 6 Nov 2010 07:43:51 +0000 (08:43 +0100)]
amqp plugin: Fix order of includes.
Florian Forster [Sat, 6 Nov 2010 07:42:48 +0000 (08:42 +0100)]
src/types.db: Add type "current_sessions".
Florian Forster [Wed, 3 Nov 2010 12:49:58 +0000 (13:49 +0100)]
Many plugins and files: Convert "interval_g" and "vl->interval" to cdtime_t.
Florian Forster [Sun, 31 Oct 2010 16:15:06 +0000 (17:15 +0100)]
Merge branch 'master' into ff/subsecond
Florian Forster [Sun, 31 Oct 2010 16:10:43 +0000 (17:10 +0100)]
Move the "cdtime_t" type to "collectd.h".
This will make it possible to turn "interval_g" into a "cdtime_t".
Florian Forster [Sun, 31 Oct 2010 16:07:40 +0000 (17:07 +0100)]
src/collectd.h: Do not include <stdbool.h> here.
Florian Forster [Sun, 31 Oct 2010 14:55:06 +0000 (15:55 +0100)]
powerdns plugin: Make calculation of timeout value more precise.
Florian Forster [Sun, 31 Oct 2010 14:51:51 +0000 (15:51 +0100)]
ipvs plugin: Remove explicit reference of "interval_g".
Florian Forster [Sun, 31 Oct 2010 14:44:18 +0000 (15:44 +0100)]
src/common.c: parse_values: Add error handling.
Florian Forster [Sun, 31 Oct 2010 14:35:50 +0000 (15:35 +0100)]
thermal plugin: Remove explicit reference to "interval_g".
Florian Forster [Sun, 31 Oct 2010 13:41:43 +0000 (14:41 +0100)]
src/utils_cache.c: Fix timeout checking.
Florian Forster [Sun, 31 Oct 2010 13:36:11 +0000 (14:36 +0100)]
rrdtool plugin: Fix the "random variation" implementation.
Florian Forster [Sun, 31 Oct 2010 13:11:59 +0000 (14:11 +0100)]
Various plugins: More fixes for the "cdtime_t" change.
Florian Forster [Sun, 31 Oct 2010 12:48:05 +0000 (13:48 +0100)]
java plugin: Fix conversion from / to Java.
Florian Forster [Sun, 31 Oct 2010 12:18:11 +0000 (13:18 +0100)]
libvirt plugin: Don't set the time explicitly.
Florian Forster [Sun, 31 Oct 2010 12:09:51 +0000 (13:09 +0100)]
Various plugins: Some more fixes with the time_t → cdtime_t change.
Florian Forster [Sun, 31 Oct 2010 11:52:31 +0000 (12:52 +0100)]
network plugin: Don't use the "true" and "false" macros from <stdbool.h>.
They cause more trouble with other includes that they are worth.
Florian Forster [Sun, 31 Oct 2010 11:51:43 +0000 (12:51 +0100)]
src/plugin.[ch]: Change the flush callbacks to take a "cdtime_t".
Florian Forster [Sun, 31 Oct 2010 11:51:02 +0000 (12:51 +0100)]
src/utils_time.h: Add macros for converting to "struct timespec" ..
.. and "struct timeval".
Florian Forster [Sun, 31 Oct 2010 11:50:35 +0000 (12:50 +0100)]
src/plugin.[ch]: Change the "time" member to "cdtime_t".
Florian Forster [Sun, 31 Oct 2010 11:39:10 +0000 (12:39 +0100)]
src/configfile.[ch]: Add "cf_util_get_cdtime".
Florian Forster [Sat, 30 Oct 2010 12:04:12 +0000 (14:04 +0200)]
Merge branch 'master' into ff/subsecond
Florian Forster [Sat, 30 Oct 2010 12:03:02 +0000 (14:03 +0200)]
Various plugins: Don't call "time(2)" in the plugins to set vl.time.
vl.time is initialized to zero instead and the current time is filled in
by dispatch_values().
Florian Forster [Sat, 30 Oct 2010 11:56:52 +0000 (13:56 +0200)]
src/utils_time.[ch]: Add module for sub-second time handling.
Sven Trenkel [Mon, 11 Oct 2010 11:35:39 +0000 (13:35 +0200)]
netapp plugin: Fixed a bug that prevented the configured interval to be passed on to the dispatch function.
Florian Forster [Wed, 6 Oct 2010 12:32:56 +0000 (14:32 +0200)]
lpar plugin: Calculate "pool busy" from "pool idle", not the other way around.
Florian Forster [Wed, 6 Oct 2010 08:11:10 +0000 (10:11 +0200)]
Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
Sven Trenkel [Mon, 4 Oct 2010 23:26:22 +0000 (01:26 +0200)]
Fixed epic documentation fail. Python3 and meta-data support was added with 4.10 but is still listed as missing.
Sven Trenkel [Fri, 1 Oct 2010 00:41:38 +0000 (02:41 +0200)]
Add sys.argv. Not too many programs consider the possibility that it might not exist resulting in unhandled exceptions.
Sven Trenkel [Thu, 30 Sep 2010 10:59:21 +0000 (12:59 +0200)]
Fixed possible memory leak in case of broken match_value configs.
Florian Forster [Thu, 30 Sep 2010 07:23:22 +0000 (09:23 +0200)]
src/types.db: Remove unused type "pinba_view".
Florian Forster [Thu, 30 Sep 2010 06:35:33 +0000 (08:35 +0200)]
network plugin: Increase default buffer size to 1452.
Florian Forster [Wed, 29 Sep 2010 15:56:58 +0000 (17:56 +0200)]
src/utils_cache.c: Replace a left-over hard-coded default of "2" with "timeout_g".
Florian Forster [Wed, 29 Sep 2010 15:06:00 +0000 (17:06 +0200)]
Merge branch 'kr/ctxt'
Florian Forster [Wed, 29 Sep 2010 15:04:53 +0000 (17:04 +0200)]
contextswitch plugin: Some coding style changes.
Florian Forster [Wed, 29 Sep 2010 15:04:20 +0000 (17:04 +0200)]
contextswitch plugin: Add copyright and author information.
Florian Forster [Mon, 27 Sep 2010 12:05:52 +0000 (14:05 +0200)]
mysql plugin: Remove some inactive (legacy) code.
Florian Forster [Mon, 27 Sep 2010 09:45:01 +0000 (11:45 +0200)]
apache plugin: Remove legacy code.
Configurations without an "<Instance />" block are not supported
anymore. The documentation and default config have been adapted.
Florian Forster [Fri, 24 Sep 2010 16:51:14 +0000 (18:51 +0200)]
curl_json plugin: Improve error handling.
Florian Forster [Fri, 24 Sep 2010 09:52:52 +0000 (11:52 +0200)]
curl_json plugin: Restore struct when handling error.
Florian Forster [Wed, 15 Sep 2010 15:21:40 +0000 (17:21 +0200)]
src/collectd.h: Do not include <sensors/sensors.h> here.
Florian Forster [Sun, 12 Sep 2010 06:21:08 +0000 (08:21 +0200)]
lpar plugin: Use a global "perfstat_partition_total_t" struct.
Florian Forster [Sun, 12 Sep 2010 06:07:38 +0000 (08:07 +0200)]
lpar plugin: Account "idle" pool time rather than "max".
Manuel Luis Sanmartín Rozada [Wed, 8 Sep 2010 09:01:23 +0000 (11:01 +0200)]
PATCH apache.c: support IBM HTTP Server.
IBM HTTP Server is a version of apache 2 that comes with Websphere.
IBM change the server name header to:
Server: IBM_HTTP_Server
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sat, 11 Sep 2010 09:24:14 +0000 (11:24 +0200)]
lpar plugin: Explain donations a bit more.
Florian Forster [Sat, 11 Sep 2010 09:18:47 +0000 (11:18 +0200)]
lpar plugin: Rename the "system" metric (from "sys").
Aurelien Reynaud [Sat, 19 Jun 2010 18:03:52 +0000 (20:03 +0200)]
Fix errno thread-safety under AIX
Unlike Linux or Solaris, errno under AIX is not thread-safe by
default.
This patch sets _THREAD_SAFE_ERRNO when AIX is detected in order to
force the thread-safe implementation of errno. Without this, calls
like stat() in the rrdtool plugin fail with errno incorrectly set,
leading to the inability to create previously absent rrd files.
Maybe _THREAD_SAFE should be set instead, to prevent other possible
threads-related problems, but this is enough to scratch my current
itch...
Here is the relevant part of /usr/include/errno.h on AIX:
#if defined(_THREAD_SAFE) || defined(_THREAD_SAFE_ERRNO)
/*
* Per thread errno is provided by the threads provider. Both the extern
* int
* and the per thread value must be maintained by the threads library.
*/
extern int *_Errno( void );
#define errno (*_Errno())
#else
extern int errno;
#endif /* _THREAD_SAFE || _THREAD_SAFE_ERRNO */
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sat, 11 Sep 2010 09:04:44 +0000 (11:04 +0200)]
lpar plugin: Introduce a "NS_TO_TICKS" macro.
This makes the code easier to read, IMHO.
Florian Forster [Sat, 11 Sep 2010 09:04:04 +0000 (11:04 +0200)]
lpar plugin: Move / add comments.
Aurélien Reynaud [Thu, 9 Sep 2010 20:43:16 +0000 (22:43 +0200)]
lpar plugin update
Hello,
here is a new patch against ar/lpar with the following features :
- get back to the original implementation with gauges only. A new type
"vcpu" is created (it was "lpar_pcpu" in the original)
- I tried to keep as much as possible of your changes, but some have
been reverted (the init function is back) because it was simpler for me
to port my previous code rather than adapt it to the current form. Feel
free to change them again
- the "consumed" metric might seem superfluous at first sight as it
could be calculated in the frontend in the general case. But I thought
it might come in handy when dealing with dedicated partitions, where
donated and stolen values are no easy concepts. Not everyone wants to
dig into the code and the APIs to find out what they mean and whether
they should be added to or substracted from other values...
As a side note, one of the changes you introduced was better checking
of the return status from perfstat_partition_total() using errno. This
reminded me that under AIX errno is by default unsafe to use in a
multithreaded environment (which collectd is). I posted a fix ("Fix
errno thread-safety under AIX") on Sat, 19 Jun 2010, which if I am not
mistaken has not been merged yet.
Best regards,
Aurélien Reynaud
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sun, 5 Sep 2010 08:12:02 +0000 (10:12 +0200)]
collection3: Add graph for "ps_disk_octets".
Florian Forster [Sun, 5 Sep 2010 07:42:40 +0000 (09:42 +0200)]
notify_email plugin: Check for "session == NULL" and return gracefully.
I don't know how libesmtp handles NULL pointers and I don't want to take
my chances.
Florian Forster [Sun, 5 Sep 2010 07:36:55 +0000 (09:36 +0200)]
notify_email plugin: Serialize all accesses to libesmtp using a mutex.
Jerome Oufella [Wed, 1 Sep 2010 18:35:58 +0000 (14:35 -0400)]
collection3: fix multiple hosts selection issue
When selecting multiple hosts in collection3's hosts list, and with some
plugins only (the ones that use a specific resource name such as memory
or tcpconns), the resulting graph list will be limited to one single
graph (instead of one per host).
This patch addresses this issue by modifying the name of the hash key
in the group_files_by_plugin_instance function, making it less prone
to name collisions by prefixing it by the host name.
Comments and enhancements will be welcome.
Signed-off-by: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sat, 4 Sep 2010 20:30:44 +0000 (22:30 +0200)]
nginx plugin: Make the cURL callback code easier to understand.
Florian Forster [Fri, 3 Sep 2010 10:48:26 +0000 (12:48 +0200)]
lpar plugin: Fix error handling of the "perfstat_partition_total" function.
According to the documentation the function returns -1 on error. The
code now assumes anything but one (the number of structures filled) as
error.
Florian Forster [Fri, 3 Sep 2010 10:22:25 +0000 (12:22 +0200)]
lpar plugin: Document why comsumed ticks may be larger than entitled ticks.
Florian Forster [Fri, 3 Sep 2010 09:05:37 +0000 (11:05 +0200)]
lpar plugin: Refactor reading of "shared partitions".
Especially calculating the ticks unavailable to the partition has been
improved. The "pool statistics" may need some further work.
The code has been written without an AIX machine at hand, so it's
absolutely untested and may not even compile. Sorry.
Florian Forster [Fri, 3 Sep 2010 07:39:13 +0000 (09:39 +0200)]
lpar plugin: Use booleans for the config options.
Aurélien Reynaud [Wed, 1 Sep 2010 20:28:38 +0000 (22:28 +0200)]
lpar plugin: new attempt
Hello Florian,
here is a new version of my lpar plugin. I tried to address the
shortcomings of the previous attempt:
- Minimum and maximum proc capacity are gone, being static values
- The plugin now uses the cpu type for every value, so there is no need
anymore for the lpar_cpu type
- This also means there is no need anymore to compute rates in the
plugin, so the code is IMHO much more elegant
- There is a config option "ReportBySerial", as described in my previous
email
- We now use pool_busy_time directly instead of computing it from total
and idle
The patch is against the current 4.10 branch, rather than against
ar/lpar, because it is more of a complete rewrite than just fixes. I
could provide a patch against ar/lpar however if you prefer so.
Regards,
Aurélien Reynaud
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Florian Forster [Wed, 18 Aug 2010 09:31:38 +0000 (11:31 +0200)]
lpar plugin: Use the "cpu" type for the general CPU statistics.