network plugin: Simplify config handling.
Remove network_config_set_{boolean,string} and replace them with
cf_util_get_{boolean,string}. The other, more specialized, config handling
functions were also simplified.
Remove network_config_set_{boolean,string} and replace them with
cf_util_get_{boolean,string}. The other, more specialized, config handling
functions were also simplified.
Merge remote-tracking branch 'github/pr/1085'
use counter type for Innodb_buffer_pool_pages_flushed
Merge branch 'collectd-5.5'
Merge branch 'collectd-5.4' into collectd-5.5
Conflicts:
src/write_redis.c
Conflicts:
src/write_redis.c
Revert "contrib/redhat/collectd.spec: added bison and flex"
This reverts commit 38203b1c8d8a8e5e567d7f6783dd8b88a2487070.
A misunderstanding about which tarball to use with the RPM specfile led
us here. See #1079 for the whole conversation.
This reverts commit 38203b1c8d8a8e5e567d7f6783dd8b88a2487070.
A misunderstanding about which tarball to use with the RPM specfile led
us here. See #1079 for the whole conversation.
configure: turbostat: check for MSR_PKG_C10_RESIDENCY symbol
Older versions of `asm/msr-index.h` don't have all the symbol needed to
build the turbostat plugin. Checking for MSR_PKG_C10_RESIDENCY seems to
guarantee we have a recent enough `asm/msr-index.h`.
Fixes #1075
Older versions of `asm/msr-index.h` don't have all the symbol needed to
build the turbostat plugin. Checking for MSR_PKG_C10_RESIDENCY seems to
guarantee we have a recent enough `asm/msr-index.h`.
Fixes #1075
collectd.conf.pod: update libyajl URL
Fixes #1081
Thanks to @msalmonse for pointing this out!
Fixes #1081
Thanks to @msalmonse for pointing this out!
Fix a libtool warning
libtool: warning: '-version-info/-version-number' is ignored for
convenience libraries
libtool: warning: '-version-info/-version-number' is ignored for
convenience libraries
Merge remote-tracking branch 'github/pr/1065' into collectd-5.5
Merge branch 'collectd-5.5'
contrib/redhat/collectd.spec: added bison and flex
Current .spec does not work due to missing bison and flex dependencies.
This fix lets install bison and flex into the build environment as well as
define YACC and YFLAGS environment variables.
Current .spec does not work due to missing bison and flex dependencies.
This fix lets install bison and flex into the build environment as well as
define YACC and YFLAGS environment variables.
write_redis plugin: Check the return value of format_values().
write_redis: Increase parsability by using format_values from common.h
write_redis: Increase parsability of multi-valued keys by insterting delimiting characters
configure.ac: Move all checks for "struct ip6_ext" into one place.
Fixes: #348
Fixes: #348
Automatically add -DSOLARIS2=8 if required for ip6_ext
Fixes: #348
Fixes: #348
processes plugin: Initialize the cswitch_{in,}vol fields.
Merge branch 'collectd-5.5'
Makefile.am: Link tests with required libraries, too.
"make check" fails on Solaris because libraries are missing:
CCLD test_common
Undefined first referenced
symbol in file
kc ./.libs/libcommon.a(common.o)
kstat_data_lookup ./.libs/libcommon.a(common.o)
kstat_lookup ./.libs/libcommon.a(common.o)
kstat_read ./.libs/libcommon.a(common.o)
getaddrinfo ./.libs/libcommon.a(common.o)
freeaddrinfo ./.libs/libcommon.a(common.o)
gai_strerror ./.libs/libcommon.a(common.o)
ld: fatal: symbol referencing errors. No output written to test_common
collect2: error: ld returned 1 exit status
"make check" fails on Solaris because libraries are missing:
CCLD test_common
Undefined first referenced
symbol in file
kc ./.libs/libcommon.a(common.o)
kstat_data_lookup ./.libs/libcommon.a(common.o)
kstat_lookup ./.libs/libcommon.a(common.o)
kstat_read ./.libs/libcommon.a(common.o)
getaddrinfo ./.libs/libcommon.a(common.o)
freeaddrinfo ./.libs/libcommon.a(common.o)
gai_strerror ./.libs/libcommon.a(common.o)
ld: fatal: symbol referencing errors. No output written to test_common
collect2: error: ld returned 1 exit status
configure.ac: Ask users to build 64-bit Solaris binaries.
By default, the compilers will build 32-bit binaries on Solaris. This is
sub-optimal for us, for example reading /proc entries for 64-bit
processes doesn't work when collectd is 32-bit.
Fixes: #1077
By default, the compilers will build 32-bit binaries on Solaris. This is
sub-optimal for us, for example reading /proc entries for 64-bit
processes doesn't work when collectd is 32-bit.
Fixes: #1077
zone plugin: Fix strerror -> sstrerror.
zone plugin: Minor code cleanups.
zone plugin: Undefine _FILE_OFFSET_BITS when building on 32bit hosts.
Fixes: #1077
Fixes: #1077
Merge branch 'collectd-5.5'
Merge branch 'collectd-5.4' into collectd-5.5
dns plugin: Check for "struct ip6_ext".
Solaris appears to declare the struct, but only when The Right defines
are specified at compile time. As a quick and dirty fix, only build with
IPv6 support when the struct is usable.
Fixes: #348
Solaris appears to declare the struct, but only when The Right defines
are specified at compile time. As a quick and dirty fix, only build with
IPv6 support when the struct is usable.
Fixes: #348
smart: KNF
Update smart.c
Are you sure this doesn't memory-leak?
(I didn't have time to run valgrind but is it possible that this command is missing?)
Are you sure this doesn't memory-leak?
(I didn't have time to run valgrind but is it possible that this command is missing?)
smart: KNF
Merge pull request #1076 from schuellerf/master
Update smart.c
Update smart.c
Update smart.c
Are you sure this doesn't memory-leak?
(I didn't have time to run valgrind but is it possible that this command is missing?)
Are you sure this doesn't memory-leak?
(I didn't have time to run valgrind but is it possible that this command is missing?)
vmem plugin: fix types for nr_dirtied and nr_written
tcpconns plugin: Fix memory leak.
"prev" was set to NULL and never updated, leading to "port_list_head" to
be set to an entry later in the list. This leaks memory because earlier
entries in the list are now unreachable.
Fixes: #1074
"prev" was set to NULL and never updated, leading to "port_list_head" to
be set to an entry later in the list. This leaks memory because earlier
entries in the list are now unreachable.
Fixes: #1074
tail plugin: initialize user_data_t
src/configfile.c: Set a plugin context when autoloading plugins.
Fixes: #1069
Fixes: #1069
src/daemon/configfile.c: Remove unnecessary "continue" statements.
Merge remote-tracking branch 'github/pr/1067'
plugin: not return -1 if plugin_flush_callback_name fails
Do not call plugin_unregister if the read registration fails.
plugin: fix white space.
plugin: remove cast type information from malloc.
plugin: move the code to create flush/name to plugin_flush_callback_name
apcups plugin: Implement the "PersistentConnection" option.
If set to false, close the connection after each interval. This lets
users chose this method if persistent connections pose a problem.
Fixes: #617
If set to false, close the connection after each interval. This lets
users chose this method if persistent connections pose a problem.
Fixes: #617
apcups plugin: Handle "END APC" lines correctly and stop reading.
Fixes: #617
Fixes: #617
apcups plugin: Fight code rot.
* Use the cleaner "complex" config and the cf_util_* functions.
* Rename "host" and "port" to "node" and "service".
Use cf_util_get_service() so users may specify services as string.
* Remove unused defines.
* Use the cleaner "complex" config and the cf_util_* functions.
* Rename "host" and "port" to "node" and "service".
Use cf_util_get_service() so users may specify services as string.
* Remove unused defines.
Support for call the flush callback at regular intervals using
the read plugin callback.
the read plugin callback.
varnish: update plugin_register_complex_read() to new default value
... just a follow up to cce136946b, in which one of the two
plugin_register_complex_read() calls got missed out.
... just a follow up to cce136946b, in which one of the two
plugin_register_complex_read() calls got missed out.
processes: revert re-introduction of ps_read_tasks
This commit partially revert 30eeeee996124de666f907877f8196e5580101ed
which solved incorrectly the merge conflict
Signed-off-by: Arthur Gautier <baloo@gandi.net>
This commit partially revert 30eeeee996124de666f907877f8196e5580101ed
which solved incorrectly the merge conflict
Signed-off-by: Arthur Gautier <baloo@gandi.net>
src/daemon/plugin.[ch]: Use cdtime_t for the interval argument of "register complex read".
All plugins converted to "struct timespec", just so that
plugin_register_complex_read() would convert back to cdtime_t again. This patch
removed this crazyness; the new "determine automatically" value is zero (used
to be NULL).
All plugins converted to "struct timespec", just so that
plugin_register_complex_read() would convert back to cdtime_t again. This patch
removed this crazyness; the new "determine automatically" value is zero (used
to be NULL).
Merge remote-tracking branch 'github/pr/1036'
Conflicts:
src/processes.c
Conflicts:
src/processes.c
Merge branch 'pr/1033'
processes plugin: Read number of threads from /proc/$pid/stat as a fallback.
Should reading the number of threads from /prod/$pid/status fail, use the
number provided by /prod/$pid/stat as a fallback. If that fails, too, use 1.
As discussed with @manuelluis in #1033.
Should reading the number of threads from /prod/$pid/status fail, use the
number provided by /prod/$pid/stat as a fallback. If that fails, too, use 1.
As discussed with @manuelluis in #1033.
statsd plugin: Dispatch NaN when no timer event was recorded.
This makes timing events appear faster when writing to RRD files.
Fixes: #1038, #1049
This makes timing events appear faster when writing to RRD files.
Fixes: #1038, #1049
Fix VERSION->PACKAGE_VERSION and PACKAGE->PACKAGE_NAME so they're always defined
Fix header condition
The dependency is either UTMPX or UTMP or Statgrab. The inclusion above hasn't statgrab.h in the elif-chain, that means compilation fails when only libstatgrab is available. The line can safely be taken out as the same condition is checked in #L120.
The dependency is either UTMPX or UTMP or Statgrab. The inclusion above hasn't statgrab.h in the elif-chain, that means compilation fails when only libstatgrab is available. The line can safely be taken out as the same condition is checked in #L120.
disk plugin: Coding style changes.
I also reorganized the code to try to keep the CFReleases and
IOObjectReleases a little more manageable.
Signed-off-by: Florian Forster <octo@collectd.org>
I also reorganized the code to try to keep the CFReleases and
IOObjectReleases a little more manageable.
Signed-off-by: Florian Forster <octo@collectd.org>
disk plugin: Fix compatibility for Mac OS X 10.10.
Here’s a fixed version of the disk plugin that makes it work under Mac
OSX 10.10, and hopefully previous releases. The original version was
looking for the disk name in one dictionary, but it was actually in
another. I suspect at some point, Apple moved the disk name property,
but I don’t have any previous releases to check.
I changed the code to look for the disk name in both dictionaries, so
hopefully it’s backward compatible.
Signed-off-by: Florian Forster <octo@collectd.org>
Here’s a fixed version of the disk plugin that makes it work under Mac
OSX 10.10, and hopefully previous releases. The original version was
looking for the disk name in one dictionary, but it was actually in
another. I suspect at some point, Apple moved the disk name property,
but I don’t have any previous releases to check.
I changed the code to look for the disk name in both dictionaries, so
hopefully it’s backward compatible.
Signed-off-by: Florian Forster <octo@collectd.org>
Remove old systemd unit
collectd.service superseded by systemd.collectd.service
collectd.service superseded by systemd.collectd.service
Merge remote-tracking branch 'github/pr/1056'
tail_csv plugin: Print warning and continue when metric is not found.
Previously, when multiple metrics were specified on one "Collect" line and one
didn't exist, all *following* metrics would be ignored. This patch changes this
to continue in this case and configure as many metrics as possible.
Previously, when multiple metrics were specified on one "Collect" line and one
didn't exist, all *following* metrics would be ignored. This patch changes this
to continue in this case and configure as many metrics as possible.
Plugin network: add support for the timeout argument in the flush callback
Plugin tail_csv: the manual says that you can use multiple times the
Collect option but the code expecs t"Collect n1 n2 n3 n4", fix
to allow to put the option Collect multiple times.
Collect option but the code expecs t"Collect n1 n2 n3 n4", fix
to allow to put the option Collect multiple times.
Plugin tail_csv: if TimeFrom is not specified in config file
the default value for time_from is -1 and the type of fileds_num
is size_t, so the comparsion of signed and unsigned not work as espected
the default value for time_from is -1 and the type of fileds_num
is size_t, so the comparsion of signed and unsigned not work as espected
processes: change type to contextswitch and types to derive_t
processes: use cf_util_get_boolean for get "CollectContextSwitch"
processes: delete added white spaces
processes: rename ps_ctx_switch to report_ctx_switch
processes: remove function ps_read_tasks
Processes: fix types in ps_read_status, change to unsigned long.
Processes: in ps_read_status fix check to skip lines
if it doesn't start with "Vm" and it doesn't start "Threads".
if it doesn't start with "Vm" and it doesn't start "Threads".
stats plugin: Fix reference of undeclared symbol.
Issue: #997
Issue: #997
statsd plugin: Free latency counter and AVL trees.
latency counters (used by TIMER metrics) and AVL trees (used by SET metrics)
were not freed when cleaning up unused metrics. This resulted in leaked memory.
Fixes: #997
latency counters (used by TIMER metrics) and AVL trees (used by SET metrics)
were not freed when cleaning up unused metrics. This resulted in leaked memory.
Fixes: #997
cpu plugin: Correct number of expected CPU states on Mac OS X.
This appears to be a regression introduced in f14ab935. Thanks to Robert Viduya
for reporting the bug.
Signed-off-by: Florian Forster <octo@collectd.org>
This appears to be a regression introduced in f14ab935. Thanks to Robert Viduya
for reporting the bug.
Signed-off-by: Florian Forster <octo@collectd.org>
zone: add mentions to README and AUTHORS files
RPM specfile: handle new zone plugin
Merge remote-tracking branch 'origin/collectd-5.3' into collectd-5.4
Merge remote-tracking branch 'github/pr/1054'
Make flow more obvious
Add myself
No busy looping around open()
Use sizeof() instead of duplicating the variable length
Handle case when zone_scandir() returns NULL
Return -1 in zone_read on error
Get pagesize only once during initialization
Handle case when zone_find_stats() returns NULL
Use ZONENAME_MAX and handle errors returned by getzonenamebyid()
Prefix all warnings and error messages with plugin name
Use (void *) in c_avl_create()
Use type 'percent' instead of 'zone_cpu'
update changelog + bump release dates
Build system: Fix linking with libheap.la and depend on testing.h.
collectd-tg tried to link with libheap.a (instead of ….la), which
doesn't exist. testing.h was not mentioned by any target, leading to it
being missing form the tarballs.
collectd-tg tried to link with libheap.a (instead of ….la), which
doesn't exist. testing.h was not mentioned by any target, leading to it
being missing form the tarballs.
Build system: Build tested units as libraries.
This simplifies the build rules for the tests, aka. check programs.
* test_foo.c have been renamed to foo_test.c.
* foo_test.c now reside right next to foo.c and foo.h.
* Build and refer to .la files, rather than depending on .c files from
other directories.
Fixes: #1042
This simplifies the build rules for the tests, aka. check programs.
* test_foo.c have been renamed to foo_test.c.
* foo_test.c now reside right next to foo.c and foo.h.
* Build and refer to .la files, rather than depending on .c files from
other directories.
Fixes: #1042
write_redis: Replaced method for checking for a NULL value for the redis connection
write_redis: Log error message from redis command failures
write_redis: improve checking the redis connection
Filterchain: if we don't find a writer, output the available writers to syslog.
bindings/java/Makefile.am: Add "uninstall-local" target.
Otherwise "make distcheck" will complain about leftover files.
Otherwise "make distcheck" will complain about leftover files.