collectd-perl(5): Don't actually use $interval_g in any examples.
collectd-perl(5): Mention that $interval_g should not be used.
perl plugin: Emit a warning when accessing $interval_g.
Rather, point to plugin_get_interval().
Rather, point to plugin_get_interval().
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 ;-)
Don't pass any pointers to interval_g around just in order to later
dereference them. There's just no reason to do so ;-)
Collectd.pm: Use plugin_get_interval() rather than $interval_g.
Collectd::Plugins::OpenVZ: Use plugin_get_interval() rather than $interval_g.
perl plugin: Export plugin_get_interval() to Perl plugins.
src/plugin.c: Report an error if ctx.interval is not set.
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 ...
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 ...
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.
Rather, let plugin_insert_read() wake up all the read threads.
This removes another usage of interval_g.
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.
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.
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.
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.
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).
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).
Don't use 'interval_g' in any plugins.
Rather, use plugin_get_interval () in order to honor any plugin specific
interval settings.
Rather, use plugin_get_interval () in order to honor any plugin specific
interval settings.
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.
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.
collectd.conf(5): Document the "LoadPlugin / Interval" option.
src/plugin.c: Document the use of "register_complex_read".
Also add assertions to make sure plugin_init_ctx() is used correctly.
Also add assertions to make sure plugin_init_ctx() is used correctly.
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.
This function is a wrapper around pthread_create() which copies the plugin
context to the new thread. Else, that information would be lost.
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!
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!
irq plugin: Coding style fixes.
Change-Id: Ibed2873a6862bf42ae701c4907805956ee4e07fa
Change-Id: Ibed2873a6862bf42ae701c4907805956ee4e07fa
Merge pull request #19 from bostjan/master
Pull request for fixes in irq plugin
Pull request for fixes in irq plugin
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
- 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
Merge remote-tracking branch 'snickl/snickl/1-modbus-fix-pkgconfig'
Merge pull request #18 from ChrisLundquist/cl/mongodb
free our bson record after the write as not to leak memory
free our bson record after the write as not to leak memory
free our bson record after the write as not to leak memory
Change modbus to libmodbus to fix pkgconfig
Merge branch 'collectd-5.0'
Merge branch 'collectd-4.10' into collectd-5.0
Merge remote-tracking branch 'tokkee/sh/collectd-5.0' into collectd-5.0
Minor doc fixes for the Python plugin.
Change-Id: I233d0ae4ec035c74811ef33aa119573066c9a3f6
Change-Id: I233d0ae4ec035c74811ef33aa119573066c9a3f6
Merge pull request #2 from trenkel/collectd-4.10
Even more fun than memory leaks: Memory corruption.
Even more fun than memory leaks: Memory corruption.
python: Fixed crash bug in case the plugin had more than one configuration block.
oracle plugin: Fix use of the OCIErrorGet() function.
Change-Id: I9899b98517fe0c239bffcf7a75681560029aa2ba
Change-Id: I9899b98517fe0c239bffcf7a75681560029aa2ba
Merge pull request #12 from ChrisLundquist/as/mongodb
Write MongoDB plugin: New plugin to write statistics to MongoDB, a NoSQL database using JSON documents.
Write MongoDB plugin: New plugin to write statistics to MongoDB, a NoSQL database using JSON documents.
write_mongodb plugin: Fix a format-string error.
Change-Id: Ia18cfa8ea7ef8536957c0807112620d2e0e2a976
Change-Id: Ia18cfa8ea7ef8536957c0807112620d2e0e2a976
write_mongodb plugin: Fix the use of {CPP,LD}FLAGS.
Change-Id: Ieb8467d3c1d0fac819864ff873594432170289d3
Change-Id: Ieb8467d3c1d0fac819864ff873594432170289d3
write_mongodb plugin: Update copyright header.
Change-Id: Ie939a7f3df1db9fc2aa3493028e3b3d74cdaeb61
Change-Id: Ie939a7f3df1db9fc2aa3493028e3b3d74cdaeb61
remove more commented out code
We have to convert CDTime to seconds since epoch
remove commented out code
Ok it is posting to the local server
added more debugging. cleaned up commented lines
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.
configure.in: Improve check for libmongoc (aka. mongo-c-driver)
write_mongodb plugin: Rename the "write_mongo" plugin.
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".
Enable the "write_mongo" plugin when the library is available. Move the
"MONGO_HAVE_STDINT" define into the .c file. Avoid the poisoned "strcpy".
Fix plugin and type instance field name, also free bson object buffer
Add write_mongo plugin support for mongodb output (based on write_redis)
configure.in: Check for libmongoc.
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>
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>
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.
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.
Merge branch 'collectd-5.0'
Merge branch 'collectd-4.10' into collectd-5.0
Change-Id: I8fea9338ac6490b2a76530a58c6bd36ec17d021a
Change-Id: I8fea9338ac6490b2a76530a58c6bd36ec17d021a
Update ChangeLog.
Change-Id: I7361ea08e1695b2928463150df36d385aa51299c
Change-Id: I7361ea08e1695b2928463150df36d385aa51299c
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
Parameters must be freed using OCIDescriptorFree. D'oh!
Thanks to Rena Vetterling for helping me hunt down this problem!
Change-Id: Ic374ae13085c8d2afbdf9a3c0ceef92b485e7723
oracle plugin: Improve the error printing function.
Change-Id: Ie52c80bd4a686b403037c97383176adf3e701419
Change-Id: Ie52c80bd4a686b403037c97383176adf3e701419
Bump version to 5.0.2; Update ChangeLog.
Change-Id: I8e564e51d9e9f3dc847811fd0d51fbf0079c20ba
Change-Id: I8e564e51d9e9f3dc847811fd0d51fbf0079c20ba
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
ChangeLog
src/df.c
src/plugin.h
version-gen.sh
Change-Id: Id7a31088cdb3371534d5c1e6a690464f3343543d
Conflicts:
ChangeLog
src/df.c
src/plugin.h
version-gen.sh
Change-Id: Id7a31088cdb3371534d5c1e6a690464f3343543d
Bump version to 4.10.5; Update ChangeLog.
Change-Id: I900278064970e0c2d2bf471f4f80c7672aa8211f
Change-Id: I900278064970e0c2d2bf471f4f80c7672aa8211f
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
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
network plugin: Use the new plugin_dispatch_values_secure().
Change-Id: I2cc65a36366c6c714cd79c2905879bce313efe31
Change-Id: I2cc65a36366c6c714cd79c2905879bce313efe31
src/plugin.[ch]: Add plugin_dispatch_values_secure().
Change-Id: I1f7403b2e82edd099f0168d0a0735cd18f8ce05a
Change-Id: I1f7403b2e82edd099f0168d0a0735cd18f8ce05a
src/meta_data.[ch]: Add meta_data_clone().
Change-Id: I8449e27c908cbe75ea4ea3b8dd4df556f9aec9e7
Change-Id: I8449e27c908cbe75ea4ea3b8dd4df556f9aec9e7
Merge "Fix case when availrmem < freemem" into collectd-4.10
Fix case when availrmem < freemem
Change-Id: I03b188afeb2357e7b8c426bd0c6daff06fda2c4f
Conflicts:
src/memory.c
Change-Id: I03b188afeb2357e7b8c426bd0c6daff06fda2c4f
Conflicts:
src/memory.c
Merge pull request #16 from pyr/master
GenericJMX plugin: Allow attribute to call operations.
GenericJMX plugin: Allow attribute to call operations.
respect provided format
as per octo's request, provide details on nulls
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.
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.
Merge pull request #14 from insom/master
Add persistent 'OKAY' notifications.
Add persistent 'OKAY' notifications.
Merge pull request #13 from insom/improved-migration
Migration: Ensure destination directories exist when moving RRDs
Migration: Ensure destination directories exist when moving RRDs
python: Fixed memory leaks during dispatch.
Added "PersistOK" option to threshold to send notifications, even for OKAYs.
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.
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.
Updated the redhat spec so 5.0.1 would build.
Change-Id: I3f4f8e520b0be0226cd0ff5e3da5ff5dd090065c
Change-Id: I3f4f8e520b0be0226cd0ff5e3da5ff5dd090065c
src/common.c: parse_value: Be more verbose about parsing problems.
Change-Id: I784ec4ee9a1e89a82fdc9da54ed1fafd3d9c3e57
Change-Id: I784ec4ee9a1e89a82fdc9da54ed1fafd3d9c3e57
collectd-perl(5): Fix example Perl script.
Thanks to Sergey for catching this!
Change-Id: I4bbb609079734cd54d68f77681ea742b4eb83239
Thanks to Sergey for catching this!
Change-Id: I4bbb609079734cd54d68f77681ea742b4eb83239
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
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
use 64bit counters if available
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
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
beforehand in curl_json.
Remove mention of http in documention as file also works now (and ftp most likely too)
Change-Id: Iccb35e6b8c831f555dc5bbd17fa8d04672e13eb3
Merge "interface plugin: Fix for bogus interfaces under Solaris." into collectd-4.10
Merge "irq plugin: Use the standard ignorelist for filtering interrupts."
ChangeLog: Remove blank line.
Change-Id: Ief9cabb148d75b79e0764d629c571ee9dc3d7d3b
Change-Id: Ief9cabb148d75b79e0764d629c571ee9dc3d7d3b
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
ChangeLog
Change-Id: I65f02dbcad46460f18f356bc8d32eb15a7a352c2
Conflicts:
ChangeLog
Change-Id: I65f02dbcad46460f18f356bc8d32eb15a7a352c2
ChangeLog: Add thanks to Peter Green.
Change-Id: Ie392f7dfc7d637c92e286b0bf6d5d32877f70f76
Change-Id: Ie392f7dfc7d637c92e286b0bf6d5d32877f70f76
Bump version to 5.0.1; Update ChangeLog.
Change-Id: I01466d5fb5c0d5c08a48d7c7e7a81239960a2d3c
Change-Id: I01466d5fb5c0d5c08a48d7c7e7a81239960a2d3c
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
Conflicts:
ChangeLog
src/collectd.conf.in
src/curl_json.c
version-gen.sh
Change-Id: I313c0d3c73d47481baa0a3b38bcdf508f1d4f8d8
Bump version to 4.10.4; Update ChangeLog.
Change-Id: Ie23cf45f929c52e94e968c7129d24aca7a287dd5
Change-Id: Ie23cf45f929c52e94e968c7129d24aca7a287dd5
AMQP plugin: My kingdom for a few semicolons
Change-Id: I08621fd2381e064f1006728162c22cfd12c48cc6
Change-Id: I08621fd2381e064f1006728162c22cfd12c48cc6
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>
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>
collectd.conf.in: Use the "Globals" option for perl and python.
Change-Id: Icaccaab601b91bc829c4da94c5344e0d766735bd
Change-Id: Icaccaab601b91bc829c4da94c5344e0d766735bd
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>
Change-Id: Ic6187891e2014d84f8b2926df1c8b2012f26923f
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@collectd.org>
Merge "curl_json plugin: Be more clever building the type instance." into collectd-4.10
irq plugin: Use the standard ignorelist for filtering interrupts.
Change-Id: I7d15318c3c1d519d5e7bc715566a9b298f087bcc
Change-Id: I7d15318c3c1d519d5e7bc715566a9b298f087bcc
Merge branch 'collectd-5.0'
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
src/irq.c
Change-Id: Ie6c78234f07cc5b7bac7e6914813e9545ce1b1af
Conflicts:
src/irq.c
Change-Id: Ie6c78234f07cc5b7bac7e6914813e9545ce1b1af
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>
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>
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.
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.
Merge "exec plugin: Fixed incorrect typecast of 64-bit timestamp to unsigned int (collectd-5.0)" into collectd-5.0