Code

collectd.git
11 years agocollectd-perl(5): Don't actually use $interval_g in any examples.
Sebastian Harl [Wed, 14 Nov 2012 18:19:54 +0000 (19:19 +0100)]
collectd-perl(5): Don't actually use $interval_g in any examples.

11 years agocollectd-perl(5): Mention that $interval_g should not be used.
Sebastian Harl [Wed, 14 Nov 2012 18:19:05 +0000 (19:19 +0100)]
collectd-perl(5): Mention that $interval_g should not be used.

11 years agoperl plugin: Emit a warning when accessing $interval_g.
Sebastian Harl [Wed, 14 Nov 2012 18:08:30 +0000 (19:08 +0100)]
perl plugin: Emit a warning when accessing $interval_g.

Rather, point to plugin_get_interval().

11 years agoperl plugin: Simplified $interval_g implementation.
Sebastian Harl [Wed, 14 Nov 2012 18:05:10 +0000 (19:05 +0100)]
perl plugin: Simplified $interval_g implementation.

Don't pass any pointers to interval_g around just in order to later
dereference them. There's just no reason to do so ;-)

11 years agoCollectd.pm: Use plugin_get_interval() rather than $interval_g.
Sebastian Harl [Wed, 14 Nov 2012 18:00:25 +0000 (19:00 +0100)]
Collectd.pm: Use plugin_get_interval() rather than $interval_g.

11 years agoCollectd::Plugins::OpenVZ: Use plugin_get_interval() rather than $interval_g.
Sebastian Harl [Wed, 14 Nov 2012 17:58:01 +0000 (18:58 +0100)]
Collectd::Plugins::OpenVZ: Use plugin_get_interval() rather than $interval_g.

11 years agoperl plugin: Export plugin_get_interval() to Perl plugins.
Sebastian Harl [Wed, 14 Nov 2012 17:55:43 +0000 (18:55 +0100)]
perl plugin: Export plugin_get_interval() to Perl plugins.

11 years agosrc/plugin.c: Report an error if ctx.interval is not set.
Florian Forster [Wed, 14 Nov 2012 12:07:47 +0000 (13:07 +0100)]
src/plugin.c: Report an error if ctx.interval is not set.

11 years agorrdtool plugin: Remove warnings.
Florian Forster [Wed, 14 Nov 2012 09:33:29 +0000 (10:33 +0100)]
rrdtool plugin: Remove warnings.

They made sense when all data was collected at the same interval. This
has not been true for a while now and these warnings don't make any sense
anymore.

We could transform them into a per-VL check and use complaints to notify
the user, but I don't think it's worth it. There is an "I told you so"
in the manpage in big bold letters ...

11 years agosrc/plugin.c: Don't regularly check for read plugins.
Florian Forster [Tue, 13 Nov 2012 18:14:56 +0000 (19:14 +0100)]
src/plugin.c: Don't regularly check for read plugins.

Rather, let plugin_insert_read() wake up all the read threads.
This removes another usage of interval_g.

12 years agoUse plugin_thread_create() rather than pthread_create() in all plugins.
Sebastian Harl [Sun, 14 Oct 2012 15:52:39 +0000 (17:52 +0200)]
Use plugin_thread_create() rather than pthread_create() in all plugins.

This function copies the plugin context from the calling thread to the new
thread. While this might not strictly be necessary in most/many cases, this
will make sure that any code within a plugin uses the same context
information, thus avoiding possible problems in the future.

12 years agoplugin: Don't switch plugin context in 'write', 'notification' and 'log'.
Sebastian Harl [Sun, 14 Oct 2012 14:53:57 +0000 (16:53 +0200)]
plugin: Don't switch plugin context in 'write', 'notification' and 'log'.

Rather, keep the context (i.e. interval) information of the calling (read)
plugin. This allows the write, notify and log callbacks to access the correct
interval settings appropriate for the current data-set.

12 years agoInitialize plugin context to global interval before loading a plugin.
Sebastian Harl [Sun, 14 Oct 2012 14:42:35 +0000 (16:42 +0200)]
Initialize plugin context to global interval before loading a plugin.

This ensures that the actual interval for each plugin is available through its
context. It is a preparation for removing 'interval_g' (which has limited use
after introducing per-plugin intervals and, thus, its use is rather error-
prone).

12 years agoDon't use 'interval_g' in any plugins.
Sebastian Harl [Sun, 14 Oct 2012 14:37:18 +0000 (16:37 +0200)]
Don't use 'interval_g' in any plugins.

Rather, use plugin_get_interval () in order to honor any plugin specific
interval settings.

12 years agoplugin: Added plugin_get_interval().
Sebastian Harl [Sun, 14 Oct 2012 14:31:01 +0000 (16:31 +0200)]
plugin: Added plugin_get_interval().

This function returns the current value of the plugin's interval. If no
interval has been set in the plugin context, it will fall back to the global
interval or ten seconds as a last resort.

12 years agocollectd.conf(5): Document the "LoadPlugin / Interval" option.
Florian Forster [Sat, 6 Oct 2012 15:42:10 +0000 (17:42 +0200)]
collectd.conf(5): Document the "LoadPlugin / Interval" option.

12 years agosrc/plugin.c: Document the use of "register_complex_read".
Florian Forster [Sat, 6 Oct 2012 15:38:50 +0000 (17:38 +0200)]
src/plugin.c: Document the use of "register_complex_read".

Also add assertions to make sure plugin_init_ctx() is used correctly.

12 years agoplugin: Added plugin_thread_create().
Sebastian Harl [Fri, 3 Feb 2012 13:57:05 +0000 (14:57 +0100)]
plugin: Added plugin_thread_create().

This function is a wrapper around pthread_create() which copies the plugin
context to the new thread. Else, that information would be lost.

12 years agoplugin: Introduced basic support for per-plugin intervals.
Sebastian Harl [Thu, 2 Feb 2012 06:44:48 +0000 (07:44 +0100)]
plugin: Introduced basic support for per-plugin intervals.

This is based on a newly introduced "plugin context", which stores plugin-
related settings (currently the plugin interval) for each registered callback.
The context is initialized when loading the plugin (LoadPlugin), setting the
interval to the value of the newly introduced "Interval" option of the
LoadPlugin block, if specified.

The context is set (using thread-specific data) and restored before and after
calling any callback.

This way, single plugins don't need to take special care in order to benefit
from the new feature. plugin.c will handle (most) situations automatically.

VALUE_LIST_INIT() has been changed to honor the plugin interval settings (if
any). As a helper, the new 'plugin_interval' macro may be used to access the
current plugin's interval (read-only).

Thanks to Florian for the initial idea!

12 years agoirq plugin: Coding style fixes.
Florian Forster [Fri, 3 Feb 2012 08:30:43 +0000 (09:30 +0100)]
irq plugin: Coding style fixes.

Change-Id: Ibed2873a6862bf42ae701c4907805956ee4e07fa

12 years agoMerge pull request #19 from bostjan/master
Florian Forster [Fri, 3 Feb 2012 08:31:37 +0000 (00:31 -0800)]
Merge pull request #19 from bostjan/master

Pull request for fixes in irq plugin

12 years agoChanges in irq plugin:
Bostjan Skufca [Fri, 3 Feb 2012 02:10:08 +0000 (03:10 +0100)]
Changes in irq plugin:
- fixes errors described here: http://mailman.verplant.org/pipermail/collectd/2011-July/004638.html
- refactored parsing code in order to make it a bit more intuitive
- added a few additional comments

12 years agoMerge remote-tracking branch 'snickl/snickl/1-modbus-fix-pkgconfig'
Florian Forster [Tue, 31 Jan 2012 14:12:23 +0000 (15:12 +0100)]
Merge remote-tracking branch 'snickl/snickl/1-modbus-fix-pkgconfig'

12 years agoMerge pull request #18 from ChrisLundquist/cl/mongodb
Florian Forster [Mon, 30 Jan 2012 22:15:31 +0000 (14:15 -0800)]
Merge pull request #18 from ChrisLundquist/cl/mongodb

free our bson record after the write as not to leak memory

12 years agofree our bson record after the write as not to leak memory
Chris Lundquist [Mon, 30 Jan 2012 21:49:32 +0000 (13:49 -0800)]
free our bson record after the write as not to leak memory

12 years agoChange modbus to libmodbus to fix pkgconfig
Stefan Nickl [Sat, 28 Jan 2012 16:32:38 +0000 (17:32 +0100)]
Change modbus to libmodbus to fix pkgconfig

12 years agoMerge branch 'collectd-5.0'
Florian Forster [Sat, 28 Jan 2012 11:26:51 +0000 (12:26 +0100)]
Merge branch 'collectd-5.0'

12 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Sat, 28 Jan 2012 11:26:41 +0000 (12:26 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0

12 years agoMerge remote-tracking branch 'tokkee/sh/collectd-5.0' into collectd-5.0
Florian Forster [Sat, 28 Jan 2012 11:03:35 +0000 (12:03 +0100)]
Merge remote-tracking branch 'tokkee/sh/collectd-5.0' into collectd-5.0

12 years agoMinor doc fixes for the Python plugin.
Florian Forster [Thu, 26 Jan 2012 21:54:34 +0000 (22:54 +0100)]
Minor doc fixes for the Python plugin.

Change-Id: I233d0ae4ec035c74811ef33aa119573066c9a3f6

12 years agoMerge pull request #2 from trenkel/collectd-4.10
Florian Forster [Thu, 26 Jan 2012 13:00:33 +0000 (05:00 -0800)]
Merge pull request #2 from trenkel/collectd-4.10

Even more fun than memory leaks: Memory corruption.

12 years agopython: Fixed crash bug in case the plugin had more than one configuration block.
Sven Trenkel [Thu, 26 Jan 2012 11:20:28 +0000 (11:20 +0000)]
python: Fixed crash bug in case the plugin had more than one configuration block.

12 years agooracle plugin: Fix use of the OCIErrorGet() function.
Florian Forster [Thu, 26 Jan 2012 10:36:03 +0000 (11:36 +0100)]
oracle plugin: Fix use of the OCIErrorGet() function.

Change-Id: I9899b98517fe0c239bffcf7a75681560029aa2ba

12 years agoMerge pull request #12 from ChrisLundquist/as/mongodb
Florian Forster [Wed, 25 Jan 2012 19:55:24 +0000 (11:55 -0800)]
Merge pull request #12 from ChrisLundquist/as/mongodb

Write MongoDB plugin: New plugin to write statistics to MongoDB, a NoSQL database using JSON documents.

12 years agowrite_mongodb plugin: Fix a format-string error.
Florian Forster [Wed, 25 Jan 2012 10:51:13 +0000 (11:51 +0100)]
write_mongodb plugin: Fix a format-string error.

Change-Id: Ia18cfa8ea7ef8536957c0807112620d2e0e2a976

12 years agowrite_mongodb plugin: Fix the use of {CPP,LD}FLAGS.
Florian Forster [Wed, 25 Jan 2012 10:47:37 +0000 (11:47 +0100)]
write_mongodb plugin: Fix the use of {CPP,LD}FLAGS.

Change-Id: Ieb8467d3c1d0fac819864ff873594432170289d3

12 years agowrite_mongodb plugin: Update copyright header.
Florian Forster [Wed, 25 Jan 2012 10:24:28 +0000 (11:24 +0100)]
write_mongodb plugin: Update copyright header.

Change-Id: Ie939a7f3df1db9fc2aa3493028e3b3d74cdaeb61

12 years agoremove more commented out code
Chris Lundquist [Tue, 24 Jan 2012 19:57:06 +0000 (11:57 -0800)]
remove more commented out code

12 years agoWe have to convert CDTime to seconds since epoch
Chris Lundquist [Fri, 20 Jan 2012 22:29:31 +0000 (14:29 -0800)]
We have to convert CDTime to seconds since epoch

12 years agoremove commented out code
Chris Lundquist [Mon, 16 Jan 2012 17:44:37 +0000 (09:44 -0800)]
remove commented out code

12 years agoOk it is posting to the local server
Chris Lundquist [Tue, 17 Jan 2012 05:10:46 +0000 (21:10 -0800)]
Ok it is posting to the local server

12 years agoadded more debugging. cleaned up commented lines
Chris Lundquist [Tue, 17 Jan 2012 00:13:13 +0000 (16:13 -0800)]
added more debugging. cleaned up commented lines

12 years agocompiles cleanly. libmongoc doesn't have an install target, will try to commit one...
Chris Lundquist [Fri, 13 Jan 2012 22:33:29 +0000 (14:33 -0800)]
compiles cleanly. libmongoc doesn't have an install target, will try to commit one there instead of having to hack the directory stucture to please ./configure.

12 years agoconfigure.in: Improve check for libmongoc (aka. mongo-c-driver)
Florian Forster [Sat, 6 Nov 2010 10:53:42 +0000 (11:53 +0100)]
configure.in: Improve check for libmongoc (aka. mongo-c-driver)

12 years agowrite_mongodb plugin: Rename the "write_mongo" plugin.
Florian Forster [Wed, 3 Nov 2010 14:19:26 +0000 (15:19 +0100)]
write_mongodb plugin: Rename the "write_mongo" plugin.

12 years agowrite_mongo plugin: Build fixes.
Florian Forster [Wed, 3 Nov 2010 14:13:28 +0000 (15:13 +0100)]
write_mongo plugin: Build fixes.

Enable the "write_mongo" plugin when the library is available. Move the
"MONGO_HAVE_STDINT" define into the .c file. Avoid the poisoned "strcpy".

12 years agoFix plugin and type instance field name, also free bson object buffer
Akkarit Sangpetch [Sat, 2 Oct 2010 15:49:43 +0000 (11:49 -0400)]
Fix plugin and type instance field name, also free bson object buffer

12 years agoAdd write_mongo plugin support for mongodb output (based on write_redis)
Akkarit Sangpetch [Wed, 3 Nov 2010 13:01:11 +0000 (14:01 +0100)]
Add write_mongo plugin support for mongodb output (based on write_redis)

12 years agoconfigure.in: Check for libmongoc.
Ryan Cox [Wed, 3 Nov 2010 13:04:09 +0000 (14:04 +0100)]
configure.in: Check for libmongoc.

12 years agocommon: check_create_dir(): Support symlinks as well.
Jonathan Nieder [Mon, 9 Jan 2012 18:01:50 +0000 (19:01 +0100)]
common: check_create_dir(): Support symlinks as well.

Previously, the following situation would cause an endless look (as reported
by Michael Prokop in Debian bug #619123): the (CSV or RRD) datadir is a
symlink pointing to a non-existent target.

With this patch applied, check_create_dir() fails with "<file> exists but is
not a directory".

Signed-off-by: Sebastian Harl <sh@tokkee.org>
12 years agobuild system, ipvs plugin: Check for linux/ip_vs.h as well.
Sebastian Harl [Mon, 9 Jan 2012 10:16:19 +0000 (11:16 +0100)]
build system, ipvs plugin: Check for linux/ip_vs.h as well.

Also, try to find ip_vs.h without using KERNEL_CFLAGS at first. The Linux
kernel headers should not be used directly -- in current kernel versions this
generates warnings leading to build failures because of -Werror.

12 years agoMerge branch 'collectd-5.0'
Florian Forster [Sat, 21 Jan 2012 17:26:17 +0000 (18:26 +0100)]
Merge branch 'collectd-5.0'

12 years agoMerge branch 'collectd-4.10' into collectd-5.0 collectd-5.0.2
Florian Forster [Sat, 21 Jan 2012 17:25:37 +0000 (18:25 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0

Change-Id: I8fea9338ac6490b2a76530a58c6bd36ec17d021a

12 years agoUpdate ChangeLog. collectd-4.10.5
Florian Forster [Sat, 21 Jan 2012 17:24:45 +0000 (18:24 +0100)]
Update ChangeLog.

Change-Id: I7361ea08e1695b2928463150df36d385aa51299c

12 years agooracle plugin: Fix a memory leak.
Florian Forster [Sat, 21 Jan 2012 17:21:46 +0000 (18:21 +0100)]
oracle plugin: Fix a memory leak.

Parameters must be freed using OCIDescriptorFree. D'oh!

Thanks to Rena Vetterling for helping me hunt down this problem!

Change-Id: Ic374ae13085c8d2afbdf9a3c0ceef92b485e7723

12 years agooracle plugin: Improve the error printing function.
Florian Forster [Sat, 21 Jan 2012 17:01:24 +0000 (18:01 +0100)]
oracle plugin: Improve the error printing function.

Change-Id: Ie52c80bd4a686b403037c97383176adf3e701419

12 years agoBump version to 5.0.2; Update ChangeLog.
Florian Forster [Sat, 21 Jan 2012 13:01:34 +0000 (14:01 +0100)]
Bump version to 5.0.2; Update ChangeLog.

Change-Id: I8e564e51d9e9f3dc847811fd0d51fbf0079c20ba

12 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Sat, 21 Jan 2012 12:07:50 +0000 (13:07 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
ChangeLog
src/df.c
src/plugin.h
version-gen.sh

Change-Id: Id7a31088cdb3371534d5c1e6a690464f3343543d

12 years agoBump version to 4.10.5; Update ChangeLog.
Florian Forster [Sat, 21 Jan 2012 12:04:28 +0000 (13:04 +0100)]
Bump version to 4.10.5; Update ChangeLog.

Change-Id: I900278064970e0c2d2bf471f4f80c7672aa8211f

12 years agodf: Set negative free space values to zero.
Toni Ylenius [Fri, 6 Jan 2012 16:13:56 +0000 (18:13 +0200)]
df: Set negative free space values to zero.

Some file systems (eg. UFS) may report negative free spave values.
Previously this caused underflow, but now it is prevented by setting
negative values to zero.

Change-Id: I821adb8a6d7a40dcbd6c65ab3541fbcd714f8aba

Conflicts:

src/df.c

12 years agonetwork plugin: Use the new plugin_dispatch_values_secure().
Florian Forster [Wed, 23 Nov 2011 13:40:58 +0000 (14:40 +0100)]
network plugin: Use the new plugin_dispatch_values_secure().

Change-Id: I2cc65a36366c6c714cd79c2905879bce313efe31

12 years agosrc/plugin.[ch]: Add plugin_dispatch_values_secure().
Florian Forster [Wed, 23 Nov 2011 13:28:27 +0000 (14:28 +0100)]
src/plugin.[ch]: Add plugin_dispatch_values_secure().

Change-Id: I1f7403b2e82edd099f0168d0a0735cd18f8ce05a

12 years agosrc/meta_data.[ch]: Add meta_data_clone().
Florian Forster [Wed, 23 Nov 2011 13:28:01 +0000 (14:28 +0100)]
src/meta_data.[ch]: Add meta_data_clone().

Change-Id: I8449e27c908cbe75ea4ea3b8dd4df556f9aec9e7

12 years agoMerge "Fix case when availrmem < freemem" into collectd-4.10
Florian Forster [Sat, 21 Jan 2012 10:14:53 +0000 (11:14 +0100)]
Merge "Fix case when availrmem < freemem" into collectd-4.10

12 years agoFix case when availrmem < freemem
Fabien Wernli [Fri, 9 Dec 2011 15:30:30 +0000 (16:30 +0100)]
Fix case when availrmem < freemem

Change-Id: I03b188afeb2357e7b8c426bd0c6daff06fda2c4f

Conflicts:

src/memory.c

12 years agoMerge pull request #16 from pyr/master
Florian Forster [Wed, 18 Jan 2012 15:17:47 +0000 (07:17 -0800)]
Merge pull request #16 from pyr/master

GenericJMX plugin: Allow attribute to call operations.

12 years agorespect provided format
Pierre-Yves Ritschard [Wed, 18 Jan 2012 15:05:27 +0000 (16:05 +0100)]
respect provided format

12 years agoas per octo's request, provide details on nulls
Pierre-Yves Ritschard [Wed, 18 Jan 2012 15:02:52 +0000 (16:02 +0100)]
as per octo's request, provide details on nulls

12 years agoAllow `Attribute` to query an MBean operation
Pierre-Yves Ritschard [Wed, 18 Jan 2012 12:57:11 +0000 (13:57 +0100)]
Allow `Attribute` to query an MBean operation

MBeans provide two entities to the outside world:

* Attributes
* Operations

The former is a simple key/value lookup, while the latter
triggers a method call and yields the result.

Operations have signatures, they can be fed an array of
parameters. For now, calls are triggered assuming
there are no parameters. Later a separate keyword
`Operation` can be introduced, taking a list of
`Parameter` directives specifying type and values
to feed to the MBean operation.

12 years agoMerge pull request #14 from insom/master
Florian Forster [Wed, 18 Jan 2012 11:08:14 +0000 (03:08 -0800)]
Merge pull request #14 from insom/master

Add persistent 'OKAY' notifications.

12 years agoMerge pull request #13 from insom/improved-migration
Florian Forster [Wed, 18 Jan 2012 11:01:04 +0000 (03:01 -0800)]
Merge pull request #13 from insom/improved-migration

Migration: Ensure destination directories exist when moving RRDs

12 years agopython: Fixed memory leaks during dispatch.
Sven Trenkel [Tue, 17 Jan 2012 01:56:03 +0000 (01:56 +0000)]
python: Fixed memory leaks during dispatch.

12 years agoAdded "PersistOK" option to threshold to send notifications, even for OKAYs.
Aaron Brady [Wed, 2 Mar 2011 23:10:26 +0000 (23:10 +0000)]
Added "PersistOK" option to threshold to send notifications, even for OKAYs.

12 years agoMigration: Ensure destination directories exist when moving RRDs
Aaron Brady [Sun, 15 Jan 2012 13:16:37 +0000 (13:16 +0000)]
Migration: Ensure destination directories exist when moving RRDs

If you have not run collectd 5 before, then when type instances
are migrated to plugin instances the destination directories
may not already exist. For example:

mv "./test/df/df-mnt-dlna.rrd" "./test/df-mnt-dlna/df.rrd"

This one-liner does a mkdir -p of the destination before
attempting to move the file.

12 years agoUpdated the redhat spec so 5.0.1 would build.
Jason Stelzer [Thu, 5 Jan 2012 14:45:53 +0000 (09:45 -0500)]
Updated the redhat spec so 5.0.1 would build.

Change-Id: I3f4f8e520b0be0226cd0ff5e3da5ff5dd090065c

12 years agosrc/common.c: parse_value: Be more verbose about parsing problems.
Florian Forster [Mon, 19 Dec 2011 14:17:39 +0000 (15:17 +0100)]
src/common.c: parse_value: Be more verbose about parsing problems.

Change-Id: I784ec4ee9a1e89a82fdc9da54ed1fafd3d9c3e57

12 years agocollectd-perl(5): Fix example Perl script.
Florian Forster [Wed, 14 Dec 2011 12:02:16 +0000 (13:02 +0100)]
collectd-perl(5): Fix example Perl script.

Thanks to Sergey for catching this!

Change-Id: I4bbb609079734cd54d68f77681ea742b4eb83239

12 years agoThis improves solaris memory plugin granularity.
Fabien Wernli [Tue, 25 Oct 2011 13:15:16 +0000 (15:15 +0200)]
This improves solaris memory plugin granularity.

Locked memory is now only tracking non-kernel locked memory.
We add kernel and unusable memory.
Source: http://www.brendangregg.com/K9Toolkit/swapinfo

Change-Id: I4f4d281e991068dc845d8c3615d285fc2a3296c8

12 years agouse 64bit counters if available
Fabien Wernli [Thu, 27 Oct 2011 15:14:06 +0000 (17:14 +0200)]
use 64bit counters if available

12 years agoMerge "Fix file:// not working as return code is 0 and not 200, as fixed beforehand...
Florian Forster [Fri, 25 Nov 2011 09:48:22 +0000 (10:48 +0100)]
Merge "Fix file:// not working as return code is 0 and not 200, as fixed beforehand in curl_json. Remove mention of http in documention as file also works now (and ftp most likely too)" into collectd-4.10

12 years agoFix file:// not working as return code is 0 and not 200, as fixed
Fabien Wernli [Fri, 4 Nov 2011 10:25:59 +0000 (11:25 +0100)]
Fix file:// not working as return code is 0 and not 200, as fixed
beforehand in curl_json.
Remove mention of http in documention as file also works now (and ftp most likely too)

Change-Id: Iccb35e6b8c831f555dc5bbd17fa8d04672e13eb3

12 years agoMerge "interface plugin: Fix for bogus interfaces under Solaris." into collectd-4.10
Florian Forster [Thu, 24 Nov 2011 14:43:21 +0000 (15:43 +0100)]
Merge "interface plugin: Fix for bogus interfaces under Solaris." into collectd-4.10

12 years agoMerge "irq plugin: Use the standard ignorelist for filtering interrupts."
Florian Forster [Thu, 24 Nov 2011 13:41:54 +0000 (14:41 +0100)]
Merge "irq plugin: Use the standard ignorelist for filtering interrupts."

13 years agoChangeLog: Remove blank line. collectd-5.0.1
Florian Forster [Fri, 14 Oct 2011 20:42:26 +0000 (22:42 +0200)]
ChangeLog: Remove blank line.

Change-Id: Ief9cabb148d75b79e0764d629c571ee9dc3d7d3b

13 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Fri, 14 Oct 2011 20:42:09 +0000 (22:42 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
ChangeLog

Change-Id: I65f02dbcad46460f18f356bc8d32eb15a7a352c2

13 years agoChangeLog: Add thanks to Peter Green. collectd-4.10.4
Florian Forster [Fri, 14 Oct 2011 20:41:21 +0000 (22:41 +0200)]
ChangeLog: Add thanks to Peter Green.

Change-Id: Ie392f7dfc7d637c92e286b0bf6d5d32877f70f76

13 years agoBump version to 5.0.1; Update ChangeLog.
Florian Forster [Fri, 7 Oct 2011 15:36:10 +0000 (17:36 +0200)]
Bump version to 5.0.1; Update ChangeLog.

Change-Id: I01466d5fb5c0d5c08a48d7c7e7a81239960a2d3c

13 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Fri, 7 Oct 2011 15:27:06 +0000 (17:27 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
ChangeLog
src/collectd.conf.in
src/curl_json.c
version-gen.sh

Change-Id: I313c0d3c73d47481baa0a3b38bcdf508f1d4f8d8

13 years agoBump version to 4.10.4; Update ChangeLog.
Florian Forster [Fri, 7 Oct 2011 15:21:57 +0000 (17:21 +0200)]
Bump version to 4.10.4; Update ChangeLog.

Change-Id: Ie23cf45f929c52e94e968c7129d24aca7a287dd5

13 years agoAMQP plugin: My kingdom for a few semicolons
Scott Lyons [Mon, 5 Sep 2011 21:04:25 +0000 (17:04 -0400)]
AMQP plugin: My kingdom for a few semicolons

Change-Id: I08621fd2381e064f1006728162c22cfd12c48cc6

13 years agointerface plugin: Fix for bogus interfaces under Solaris.
Eddy Geez [Sat, 3 Sep 2011 13:10:21 +0000 (09:10 -0400)]
interface plugin: Fix for bogus interfaces under Solaris.

Under newer versions of Solaris, the method for finding network interfaces
results in 'collectd' gathering statistics on an interface called 'mac', along
with 16 interfaces named 'wrsmd0' through 'wrsmd15' (which are for WCI Remote
Shared Memory). The 'mac' interface is especially problematic because it
occurs multiple times, which results in warnings from rrdtool about insertions
with the same timestamp.

Change-Id: I1ae070ecbc820da25c0f0ad457aba80213339fd2
Signed-off-by: Florian Forster <octo@collectd.org>
13 years agocollectd.conf.in: Use the "Globals" option for perl and python.
Florian Forster [Fri, 2 Sep 2011 22:41:05 +0000 (18:41 -0400)]
collectd.conf.in: Use the "Globals" option for perl and python.

Change-Id: Icaccaab601b91bc829c4da94c5344e0d766735bd

13 years agoAdd RPM .spec file and startup script for AIX
Aurelien Reynaud [Thu, 14 Oct 2010 19:18:47 +0000 (21:18 +0200)]
Add RPM .spec file and startup script for AIX

Change-Id: Ic6187891e2014d84f8b2926df1c8b2012f26923f
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@collectd.org>
13 years agoMerge "curl_json plugin: Be more clever building the type instance." into collectd...
Florian Forster [Fri, 2 Sep 2011 22:48:47 +0000 (00:48 +0200)]
Merge "curl_json plugin: Be more clever building the type instance." into collectd-4.10

13 years agoirq plugin: Use the standard ignorelist for filtering interrupts.
Florian Forster [Fri, 2 Sep 2011 01:40:24 +0000 (21:40 -0400)]
irq plugin: Use the standard ignorelist for filtering interrupts.

Change-Id: I7d15318c3c1d519d5e7bc715566a9b298f087bcc

13 years agoMerge branch 'collectd-5.0'
Florian Forster [Fri, 2 Sep 2011 01:34:00 +0000 (21:34 -0400)]
Merge branch 'collectd-5.0'

13 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Fri, 2 Sep 2011 01:28:05 +0000 (21:28 -0400)]
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
src/irq.c

Change-Id: Ie6c78234f07cc5b7bac7e6914813e9545ce1b1af

13 years agoirq plugin: Implement collection of non-numeric interrupts.
Bostjan Skufca [Fri, 2 Sep 2011 00:35:38 +0000 (20:35 -0400)]
irq plugin: Implement collection of non-numeric interrupts.

Hi all!

I've created a patch that enables collectd to collect all irqs present in
/proc/interrupts, with numeric and string names (NMI, LOC, RES, etc).

Two notices:
a) Unfortunately I was unable to build collectd from git repo (build.sh
   failures), therefore I created this patch for latest stable release: 4.10.1
b) I am fairly unexperienced in C programming, so please inform me gently of my
   mistakes:) But I am already using a patched version and it works fine.

Any feedback on code quality or recommendations are welcome.

Change-Id: Ia17bd953921051dfe53e838b76672adbef9e73c3
Signed-off-by: Florian Forster <octo@collectd.org>
13 years agoprocesses plugin: Fixed handling of ProcessMatch regexes containing spaces.
Sebastian Harl [Wed, 24 Aug 2011 16:26:12 +0000 (18:26 +0200)]
processes plugin: Fixed handling of ProcessMatch regexes containing spaces.

Previously, something like 'ProcessMatch name "My Regex"' would have been
interpreted as three values. This was caused by using the old, non-complex
config interface which joins all config values using a space and passing the
resulting string to the plugin. The processes plugin used to use strsplit() to
re-gain a list of all values, obviously ignoring any quoting that might exist.

This has been fixed by using the complex config interface, which passes all
values as an array of strings and thus honoring the quoting handled by
liboconfig.

13 years agoMerge "exec plugin: Fixed incorrect typecast of 64-bit timestamp to unsigned int...
Florian Forster [Sat, 27 Aug 2011 19:48:12 +0000 (21:48 +0200)]
Merge "exec plugin: Fixed incorrect typecast of 64-bit timestamp to unsigned int (collectd-5.0)" into collectd-5.0