Fix link with perfstat
AIX suport in contextswitch plugin.
sequence_number is only used in linux.
Generate a compilation error.
Signed-off-by: Florian Forster <octo@collectd.org>
Generate a compilation error.
Signed-off-by: Florian Forster <octo@collectd.org>
ARG_MAX on Solaris is *very* large, 2 MB. Allocating that much on the
stack (local variable) overflows the thread stack and crashes the
process in weird and interesting ways.
"int i" is a useless variable and breaks the build with -Werror.
Signed-off-by: Florian Forster <octo@collectd.org>
stack (local variable) overflows the thread stack and crashes the
process in weird and interesting ways.
"int i" is a useless variable and breaks the build with -Werror.
Signed-off-by: Florian Forster <octo@collectd.org>
processes plugin: Coding style and whitespace changes.
processes plugin: Use stack memory when reading the command line.
Also remove the call to the non-threadsafe strtok(3) call and fix the
size passed to sstrncpy().
Also remove the call to the non-threadsafe strtok(3) call and fix the
size passed to sstrncpy().
processes plugin: Call ps_submit_fork_rate() from read_fork_rate().
This avoids the "return ULONG_MAX" hack to signal a problem.
This avoids the "return ULONG_MAX" hack to signal a problem.
Buffer and memory allocation related bug fixes and changes
Replaced "free" with "sfree" for memory deallocation.
Added memset(...) to initialized newly allocated memory
Removed buffer "termination".
Replaced "free" with "sfree" for memory deallocation.
Added memset(...) to initialized newly allocated memory
Removed buffer "termination".
Added support for the Solaris OS processes
Added support for process information on the Solaris OS. The information comes mainly from
/proc/PID/status, /proc/PID/psinfo , /proc/PID/usage and kstat
Added a few "solaris" specific process states as well
Added support for process information on the Solaris OS. The information comes mainly from
/proc/PID/status, /proc/PID/psinfo , /proc/PID/usage and kstat
Added a few "solaris" specific process states as well
Merge branch 'collectd-5.1'
Merge branch 'collectd-5.0' into collectd-5.1
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
src/utils_db_query.c
src/zfs_arc.c
Conflicts:
src/utils_db_query.c
src/zfs_arc.c
Fix for Solaris when setting ip-opt multicast-loop (must be a char, not int).
General logging additions for tracking down the problem.
Signed-off-by: Florian Forster <octo@collectd.org>
General logging additions for tracking down the problem.
Signed-off-by: Florian Forster <octo@collectd.org>
Multithreading fix: localize unneeded global variable
ethstat plugin: Initialize realloc'ated memory.
The last element in "interfaces" is not guaranteed to be zeroed, resulting in a
segfault when cf_util_get_string() tries to free the "pointer".
Thanks to Mark T. Voelker for reporting and analyzing this bug!
This should fix Github issue #133.
The last element in "interfaces" is not guaranteed to be zeroed, resulting in a
segfault when cf_util_get_string() tries to free the "pointer".
Thanks to Mark T. Voelker for reporting and analyzing this bug!
This should fix Github issue #133.
ethstat plugin: Fix off-by-one error.
This hopefully fixes Github issue #135.
This hopefully fixes Github issue #135.
libs varnish & varnishcompat are NOT needed. "pkg-config --libs varnishapi" output only libvarnishapi as well
Signed-off-by: Florian Forster <octo@collectd.org>
Signed-off-by: Florian Forster <octo@collectd.org>
bindings/Makefile: perl: Use INSTALL_BASE rather than PREFIX.
Some versions of Perl / ExtUtils::MakeMaker will else abort with an error
message explaining INSTALL_BASE and PREFIX may not be used both. However, I
don't know where the other definition comes from.
Signed-off-by: Florian Forster <octo@collectd.org>
Some versions of Perl / ExtUtils::MakeMaker will else abort with an error
message explaining INSTALL_BASE and PREFIX may not be used both. However, I
don't know where the other definition comes from.
Signed-off-by: Florian Forster <octo@collectd.org>
configure: Don't add -liptc to the global LIBS setting.
AC_SEARCH_LIBS() would do that, so save and restore LIBS when calling that
macro.
Signed-off-by: Florian Forster <octo@collectd.org>
AC_SEARCH_LIBS() would do that, so save and restore LIBS when calling that
macro.
Signed-off-by: Florian Forster <octo@collectd.org>
configure: Use AC_INCLUDES_DEFAULT when checking any libkvm stuff.
kvm.h requires sys/types.h to be included. Using AC_INCLUDES_DEFAULT will
hopefully make sure that we're save for a bit ;-)
Signed-off-by: Florian Forster <octo@collectd.org>
kvm.h requires sys/types.h to be included. Using AC_INCLUDES_DEFAULT will
hopefully make sure that we're save for a bit ;-)
Signed-off-by: Florian Forster <octo@collectd.org>
curl_xml plugin: Mark read-only strings as const.
fix Host config being ignored
Change-Id: I8a109818d8a821e2f3e0660fbb6ba1843279fcc2
Signed-off-by: Florian Forster <octo@collectd.org>
Change-Id: I8a109818d8a821e2f3e0660fbb6ba1843279fcc2
Signed-off-by: Florian Forster <octo@collectd.org>
apcups plugin: Retry sending the "status" command.
If that fails more than twice in the first 10 iterations, gracefully shut
down the socket in all future iterations.
This should fix Github issue #15.
If that fails more than twice in the first 10 iterations, gracefully shut
down the socket in all future iterations.
This should fix Github issue #15.
apcups plugin: Add function net_shutdown().
apcups plugin: Make sure the socket is closed on errors.
src/utils_db_query.c: Use the right field when checking for size.
swap plugin: Add the "ReportBytes" option.
When enabled, swap I/O is reported in bytes, not pages. Only valid for Linux.
This should fix Github issue #10.
When enabled, swap I/O is reported in bytes, not pages. Only valid for Linux.
This should fix Github issue #10.
Revert "swap plugin: Add the "ReportBytes" option."
This reverts commit 25fd1667c186eb871a4b66f9866d6446e41f1bc2.
This reverts commit 25fd1667c186eb871a4b66f9866d6446e41f1bc2.
swap plugin: Add the "ReportBytes" option.
When enabled, swap I/O is reported in bytes, not pages. Only valid for Linux.
This should fix Github issue #10.
When enabled, swap I/O is reported in bytes, not pages. Only valid for Linux.
This should fix Github issue #10.
exec plugin: Really remove STDERR from the select() set.
select(2) is actually using a variable called "copy", which we didn't set in
this case.
Fixes Github issue #12. Thanks to Tetsuya Kawaguchi for reporting this problem.
select(2) is actually using a variable called "copy", which we didn't set in
this case.
Fixes Github issue #12. Thanks to Tetsuya Kawaguchi for reporting this problem.
configure.in: Make sure sa_familiy_t is defined when checking rtnl_dump_filter().
netlink plugin: Check for the number of arguments to 'rtnl_dump_filter'.
In recent versions of iproute2, 'rtnl_dump_filter' expects three rather than
five arguments.
This should fix Github issue #7.
Signed-off-by: Florian Forster <octo@collectd.org>
In recent versions of iproute2, 'rtnl_dump_filter' expects three rather than
five arguments.
This should fix Github issue #7.
Signed-off-by: Florian Forster <octo@collectd.org>
Fixed collectd's unixsock read interrupted by SIGCHLD's.
Signed-off-by: Florian Forster <octo@collectd.org>
Signed-off-by: Florian Forster <octo@collectd.org>
Fixed various collectd memory leaks.
Once I understood what's going on I tried to keep the changes to a minimum.
Signed-off-by: Florian Forster <octo@collectd.org>
Once I understood what's going on I tried to keep the changes to a minimum.
Signed-off-by: Florian Forster <octo@collectd.org>
Merge branch 'ff/kstat' into collectd-4.10
Set license info line to ”GPLv2 or newer”
Recently I had a request to change the licensing of this file to
use it in a GPLv3 application. This change would make it easier,
while retaining GPLv2 to make the license still match the one in
collectd.
Signed-off-by: Florian Forster <octo@collectd.org>
Recently I had a request to change the licensing of this file to
use it in a GPLv3 application. This change would make it easier,
while retaining GPLv2 to make the license still match the one in
collectd.
Signed-off-by: Florian Forster <octo@collectd.org>
Merge branch 'collectd-5.1'
Merge branch 'collectd-5.0' into collectd-5.1
Conflicts:
src/swap.c
Conflicts:
src/swap.c
Merge branch 'collectd-4.10' into collectd-5.0
corrected high-resolution time conversions after code review
Signed-off-by: Florian Forster <octo@collectd.org>
Signed-off-by: Florian Forster <octo@collectd.org>
Updated Adrian Perez' 2009 Python network proto classes
Signed-off-by: Florian Forster <octo@collectd.org>
Signed-off-by: Florian Forster <octo@collectd.org>
snmp plugin: Fix error message printed by the "Shift" option.
I noticed a small error in snmp.c in collectd-5.1.0 (might be
elsewhere). The warning message in csnmp_config_add_data_shift says
"Scale config option" instead of "Shift" config option:
[…]
Signed-off-by: Florian Forster <octo@collectd.org>
I noticed a small error in snmp.c in collectd-5.1.0 (might be
elsewhere). The warning message in csnmp_config_add_data_shift says
"Scale config option" instead of "Shift" config option:
[…]
Signed-off-by: Florian Forster <octo@collectd.org>
df plugin: when checking / do it just once
Newer system symlink /etc/mtab to /proc/mounts which makes root
filesystem seem mounted twice, once as type rootfs and once for the
real device.
When / is selected for df plugin, skip the rootfs mount-point as
real root is usually mounted right on top of it.
Not skipping it causes rrdtool to complain about two updates for the
same timestamp, the first entry for rootfs passes but rrdtool complains
when stats for the second occurrence for real filesystem is being
considered.
Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Florian Forster <octo@collectd.org>
Newer system symlink /etc/mtab to /proc/mounts which makes root
filesystem seem mounted twice, once as type rootfs and once for the
real device.
When / is selected for df plugin, skip the rootfs mount-point as
real root is usually mounted right on top of it.
Not skipping it causes rrdtool to complain about two updates for the
same timestamp, the first entry for rootfs passes but rrdtool complains
when stats for the second occurrence for real filesystem is being
considered.
Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Florian Forster <octo@collectd.org>
snmp plugin: Check for SNMP_ENDOFMIBVIEW.
Some implementations of SNMP will send a special "variable" when you're
leaving the requested subtree with type "endOfMibView" aka.
"SNMP_ENDOFMIBVIEW". Examples of such implementations are Citrix
Netscalers and IBM's General Parallel File System (GPFS). Reading past
this special variable will result in weird values being returned.
This adds an appropriate check to csnmp_check_res_left_subtree().
Thanks to "Mark" for reporting this issue and clarifying.
Some implementations of SNMP will send a special "variable" when you're
leaving the requested subtree with type "endOfMibView" aka.
"SNMP_ENDOFMIBVIEW". Examples of such implementations are Citrix
Netscalers and IBM's General Parallel File System (GPFS). Reading past
this special variable will result in weird values being returned.
This adds an appropriate check to csnmp_check_res_left_subtree().
Thanks to "Mark" for reporting this issue and clarifying.
src/common.c: Add missing semicolon.
src/common.c: get_kstat_value: Check the arguments and return error codes.
Rather than asserting that an argument is not NULL, check this condition
and return an error code.
This should fix Github issue #71.
Rather than asserting that an argument is not NULL, check this condition
and return an error code.
This should fix Github issue #71.
src/Makefile.am: Unconditionally link collectd with libm.
Under FreeBSD, running src/utils_format_json.c fails because isfinite()
cannot be resolved. The GNU manpages for isnan() and isfinite() also
advise users to link with libm and AIX has had the library being linked
in for a while. Since it's such a basic library it seems easier to just
link with it unconditionally.
Fixes Github issue #122.
Under FreeBSD, running src/utils_format_json.c fails because isfinite()
cannot be resolved. The GNU manpages for isnan() and isfinite() also
advise users to link with libm and AIX has had the library being linked
in for a while. Since it's such a basic library it seems easier to just
link with it unconditionally.
Fixes Github issue #122.
Merge pull request #124 from tokkee/bj/build
Fix some build issues on AIX using automake <= 1.9 and gcc 4.7.1.
Fix some build issues on AIX using automake <= 1.9 and gcc 4.7.1.
Add missing return statements
Fix gcc warn/error: no return statement in function returning non-void [-Werror=return-type]
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Fix gcc warn/error: no return statement in function returning non-void [-Werror=return-type]
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Automake 1.9 compatibility: don't use $(builddir)
Automake <= 1.9 don't define $(builddir) which is always defined to
'.' anyway.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Automake <= 1.9 don't define $(builddir) which is always defined to
'.' anyway.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
src/collectd.conf.in: Update memcached config block.
memcached plugin: Fix some error messages.
memcached plugin: Fix backwards compatibility.
Don't use the instance name in the identifier when we're using the legacy
configuration mode.
Don't use the instance name in the identifier when we're using the legacy
configuration mode.
memcached plugin: Reorder functions to avoid prototype.
memcached plugin: Refactor the memcached_query_daemon() function.
The connecting code has been broken out in separate functions and the
writing and reading from the socket no longer uses poll(2),
non-blocking I/O and a custom built retry logic. Instead block on I/O and
let the read-thread-pool do its thing.
The connecting code has been broken out in separate functions and the
writing and reading from the socket no longer uses poll(2),
non-blocking I/O and a custom built retry logic. Instead block on I/O and
let the read-thread-pool do its thing.
memcached plugin: Fix backwards compatibility.
Register a default callback in the init() phase if no configuration is
provided for the plugin. This way doing just "LoadPlugin memcached" will
result in the old behavior i.e. localhost being queried.
Register a default callback in the init() phase if no configuration is
provided for the plugin. This way doing just "LoadPlugin memcached" will
result in the old behavior i.e. localhost being queried.
memcached plugin: Fix the default behavior, i.e. use the documented host and port.
collectd.conf(5): Document the memcached plugin.
The Instance blocks and Socket option were missing.
The Instance blocks and Socket option were missing.
memcached plugin: Specify read-group name when registering callbacks.
memcached plugin: Rename config callback (add prefix).
memcached plugin: Replace config_set_string() with cf_util_get_string().
multiple memcached instances, v2
memcached plugin : added support for multiple instances
Merge branch 'sh/collectd-5.1' into collectd-5.1
Merge branch 'ms/tcpconns'
tcpconns plugin: Only chose between netlink / proc on the first iteration.
Rather than going for netlink each iteration and fall back to /proc, try
this on the first iteration only and stick with the result afterwards.
Also contains some improvements to the error handling / reporting.
Rather than going for netlink each iteration and fall back to /proc, try
this on the first iteration only and stick with the result afterwards.
Also contains some improvements to the error handling / reporting.
Added the instance name to varnish API
Fixed issue collectd#110
Signed-off-by: Florian Forster <octo@collectd.org>
Fixed issue collectd#110
Signed-off-by: Florian Forster <octo@collectd.org>
little style changes (code review)
src/utils_format_json.c: Remove unused arguments.
write_graphite: Use the broken out "format_graphite" module.
This was broken out for use in the AMQP plugin. De-duplicate the code by
using it from write_graphite as well.
This was broken out for use in the AMQP plugin. De-duplicate the code by
using it from write_graphite as well.
AUTHORS: Add Thomas Meson.
Add Florian Forster to the list of copyright holders and authors of
utils_format_graphite.c, since its based on his code.
Add Florian Forster to the list of copyright holders and authors of
utils_format_graphite.c, since its based on his code.
amqp plugin: add support for Graphite output
This commit implements "Graphite format" for AMQP Plugin.
The AMQP plugin will be able to directly output a valid
Graphite metric format (<metric name> <value> <timestamp>\n).
This is very useful when the Graphite server is directly reading
from an AMQP broker. You can then avoid having a proxy somewhere
doing the conversion between PUTVAL or JSON metrics into Graphite
format.
Signed-off-by: Florian Forster <octo@collectd.org>
This commit implements "Graphite format" for AMQP Plugin.
The AMQP plugin will be able to directly output a valid
Graphite metric format (<metric name> <value> <timestamp>\n).
This is very useful when the Graphite server is directly reading
from an AMQP broker. You can then avoid having a proxy somewhere
doing the conversion between PUTVAL or JSON metrics into Graphite
format.
Signed-off-by: Florian Forster <octo@collectd.org>
Merge pull request #109 from tokkee/sh/collectd-5.0
configure: Define _REENTRANT when compiling on Solaris.
LGTM
configure: Define _REENTRANT when compiling on Solaris.
LGTM
Fix to make write_mongodb work with any version of mongo-c-driver
tcpconns/linux: Use netlink instead of parsing /proc/net/tcp{,6}
configure: Define _REENTRANT when compiling on Solaris.
On Wed, Mar 16, 2011 at 10:35:07AM +0100, Mathijs Möhlmann wrote:
> I'm using collectd 4.10.2 on Solaris 10 (gcc 3.4.6). Sometimes when I
> start with a clean rrd directory or add a host the .rrd file (rrdtools
> plugin) don't get created and I get the following message:
>
> collectd[2996]: [ID 702911 daemon.error] stat(/usr/local/var/lib/collectd/rrd/asterix/load/load.rrd) failed: Bad file number
This patch fixes this.
Signed-off-by: Sebastian Harl <sh@teamix.net>
On Wed, Mar 16, 2011 at 10:35:07AM +0100, Mathijs Möhlmann wrote:
> I'm using collectd 4.10.2 on Solaris 10 (gcc 3.4.6). Sometimes when I
> start with a clean rrd directory or add a host the .rrd file (rrdtools
> plugin) don't get created and I get the following message:
>
> collectd[2996]: [ID 702911 daemon.error] stat(/usr/local/var/lib/collectd/rrd/asterix/load/load.rrd) failed: Bad file number
This patch fixes this.
Signed-off-by: Sebastian Harl <sh@teamix.net>
configure, utils_dns: Check for and use netinet/ip_compat.h.
This is required on Solaris in order to get the ip6_ext struct.
This is required on Solaris in order to get the ip6_ext struct.
mysql plugin: Use the database instance name for identifying read callbacks.
The database instance is specified as argument to the <Database> block.
Without this fix, we cannot specify two database blocks without the
(optional!) 'Database' option as this would result in registering two read
callbacks with the name 'mysql'.
Thanks to Johan Bergström for reporting this on IRC!
The database instance is specified as argument to the <Database> block.
Without this fix, we cannot specify two database blocks without the
(optional!) 'Database' option as this would result in registering two read
callbacks with the name 'mysql'.
Thanks to Johan Bergström for reporting this on IRC!
contrib/migrate-4-5.px: Added missing end quotes in a call to rrd_filter.px.
Fix bad definition of UDP src port in DNS plugin.
Fix bad definition of UDP src port in DNS plugin.
collectd.conf(5): Document the "Password" option.
redis plugin: Coding style fixes.
redis plugin: Add authentication support.
Correct compilation on FreeBSD, set HOST_NAME_MAX to _POSIX_HOST_NAME_MAX if isn't defined
src/utils_format_json.c: Various fixes for the meta data code.
* Moved to a separate function.
* Escape string values.
* Fix format string for [u]int64_t.
* Emit the JSON literals «true» and «false» rather than «0» and «1».
* Make certain keys are always freed.
* Move the meta data information into a separate map.
* Moved to a separate function.
* Escape string values.
* Fix format string for [u]int64_t.
* Emit the JSON literals «true» and «false» rather than «0» and «1».
* Make certain keys are always freed.
* Move the meta data information into a separate map.
annotate meta data to json objects
Run through any metadata and annotate them to json objects when they are
created.
Run through any metadata and annotate them to json objects when they are
created.
contrib/migrate-4-5.px: Break up "df" RRD files into multiple files.
collectd.conf(5): Improve description of the configuration syntax.
Merge pull request #97 from tokkee/sh/swap
swap plugin: Don't report an error if there is no swap space on Linux.
swap plugin: Don't report an error if there is no swap space on Linux.
swap plugin: Don't report an error if there is no swap space on Linux.
… rather, simply record zeros in that case. Swap may be switched on and off at
arbitrary times and/or might be added at "later" times. Thus, storing zero in
case the swap plugin is enabled sounds like the best approach to me.
… rather, simply record zeros in that case. Swap may be switched on and off at
arbitrary times and/or might be added at "later" times. Thus, storing zero in
case the swap plugin is enabled sounds like the best approach to me.
Merge pull request #96 from mstap/master
add collectd systemd service file
add collectd systemd service file
describe collectd.service in contrib/README
Add collectd systemd unit file
Fix for config file parsing ("memcachec plugin: Option `Server' not allowed here.")
Fix out-of-bound index in rrdtool.c
Fix a reference to argv[1] that is (always?)
outside the bounds of the argv array. It happens
during a log statement that seems to want
to actually refer to the rrd filename.
Fix a reference to argv[1] that is (always?)
outside the bounds of the argv array. It happens
during a log statement that seems to want
to actually refer to the rrd filename.
oracle plugin: Add database name and query name (if applicable) to error messages.
oracle plugin: Report the "connect id" when OCILogon() fails.
collection3: Use {instance} in Df's grpah title.
{type_instance} didn't work when used with other plugins than "df", e.g.
the example configuration of the Oracle plugin uses this.
{type_instance} didn't work when used with other plugins than "df", e.g.
the example configuration of the Oracle plugin uses this.
oracle plugin: Replace the o_config_set_string() function.