redhat initscript: add timeout when stopping the daemon
This mitigates the risk of having 2 daemons running simultaneously
during a short period, on restart.
The debian package's initscript does the same thing, using the same
timeout value.
This mitigates the risk of having 2 daemons running simultaneously
during a short period, on restart.
The debian package's initscript does the same thing, using the same
timeout value.
curl_json: fix the array access implemented in f1e1e37e
In the avl-tree we store two different structs, cj_key_t for the value
we search, c_avl_tree_t for sub-nodes.
The old version does assume when it will find a key, and when a tree,
which doesn't have to be right in all cases.
Therefore we utilize the magic to revalidate this cast.
Being able to tell tree from key, we now can also implement array access
on the right most node of the tree-path.
In the avl-tree we store two different structs, cj_key_t for the value
we search, c_avl_tree_t for sub-nodes.
The old version does assume when it will find a key, and when a tree,
which doesn't have to be right in all cases.
Therefore we utilize the magic to revalidate this cast.
Being able to tell tree from key, we now can also implement array access
on the right most node of the tree-path.
statsd: clarify/simplify documentation & example
Added documentation for StatsD module per added functionality in issue #403.
Merge branch 'collectd-5.3' into collectd-5.4
src/common.c: Fix strstripnewline().
Because the length of the string was decremented too late, the function
would actually overwrite the trailing null byte instead of the newline.
Because the length of the string was decremented too late, the function
would actually overwrite the trailing null byte instead of the newline.
RPM specfile: enable lvm plugin on RHEL7
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
Conflicts:
contrib/redhat/collectd.spec
RPM specfile: enable netlink plugin on RHEL > 5
RPM specfile: fix bogus dates
modern rpmbuild versions appear to be more strict on this point.
modern rpmbuild versions appear to be more strict on this point.
RPM specfile: support for RHEL7
RPM specfile: remove define accidentally re-added when handling merge conflict
RPM specfile: remove macro accidentally re-added when handling merge conflict
RPM specfile: remove duplicate modbus block
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
src/curl.c
Conflicts:
src/curl.c
network plugin: Improve client connecting behavior.
This moves the socket creation logic so it's called from
networt_send_buffer_plain(). This allows us to recover after network
failures or when collectd was started before the network was available.
Fixes: #627
This moves the socket creation logic so it's called from
networt_send_buffer_plain(). This allows us to recover after network
failures or when collectd was started before the network was available.
Fixes: #627
src/utils_match.[ch]: Implement match_value_reset().
This is called from the curl and memcachec plugins. Previously, gauge
average, minimum and maximum values were calculated since the start of
the daemon, rather than per-interval. This is not the documented
functionality.
Fixes: #663
This is called from the curl and memcachec plugins. Previously, gauge
average, minimum and maximum values were calculated since the start of
the daemon, rather than per-interval. This is not the documented
functionality.
Fixes: #663
curl plugin: Use the utility functions for config handling.
Merge remote-tracking branch 'github/collectd-5.3' into collectd-5.3
src/meta_data.c: If the meta_data_t is empty, avoid calling malloc(0).
src/utils_format_json.c: Handle empty meta_data_t gracefully.
Previously, `meta != NULL` and `keys_num == 0` was possible and would
result in "{}", which is not valid JSON.
Fixes: 716
Previously, `meta != NULL` and `keys_num == 0` was possible and would
result in "{}", which is not valid JSON.
Fixes: 716
python plugin: Don't create empty meta_data_t objects.
Fixes: #716
Fixes: #716
src/utils_rrdcreate.c: Free "args".
Thanks to Yves Mettier for pointing this out!
Fixes: #661
Thanks to Yves Mettier for pointing this out!
Fixes: #661
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
Conflicts:
contrib/redhat/collectd.spec
RPM specfile: update changelog without incrementing release number
GenericJMXConfConnection: Remove unused imports.
java plugin: Make sure cjni_thread_detach() is called on all paths.
Each call to cjni_thread_attach() much be accompanied by
a call to cjni_thread_detach(). Some error handling cases were missing
the call, potentially locking the plugin up.
Each call to cjni_thread_attach() much be accompanied by
a call to cjni_thread_detach(). Some error handling cases were missing
the call, potentially locking the plugin up.
collectd.conf(5): Improve AutoLoadPlugin documentation.
Make it clear that plugins without a <Plugin /> block will still need a
LoadPlugin line.
References: #715
Make it clear that plugins without a <Plugin /> block will still need a
LoadPlugin line.
References: #715
collectd.conf(5): Improve documentation of LoadPlugin.
Mention AutoLoadPlugin in the relevant places. Add a <Plugin /> block
for the "df" plugin to make it easier to spot that it is preceded by a
<LoadPlugin /> *block*.
Fixes: #715
Mention AutoLoadPlugin in the relevant places. Add a <Plugin /> block
for the "df" plugin to make it easier to spot that it is preceded by a
<LoadPlugin /> *block*.
Fixes: #715
EL <6 provide perl-ExtUtils-Embed with base perl
Conflicts:
contrib/redhat/collectd.spec
Conflicts:
contrib/redhat/collectd.spec
Statsd: support samplerate field in timing metric types
Fixes "Unable to parse line" bug, often seen receiving stats from
OpenStack Swift. Should fix GH issue #461
Fixes "Unable to parse line" bug, often seen receiving stats from
OpenStack Swift. Should fix GH issue #461
collectd.conf: Fix default packet size of the network plugin.
Fixes: #710
Fixes: #710
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
Conflicts:
contrib/redhat/collectd.spec
Merge branch 'collectd-4.10' into collectd-5.3
curl_xml plugin: Fixed tautological pointer comparison error.
Fixes: http://bugs.debian.org/758481
Signed-off-by: Florian Forster <octo@collectd.org>
Fixes: http://bugs.debian.org/758481
Signed-off-by: Florian Forster <octo@collectd.org>
collectd.conf(5): add detail & example about multi-instance filterchain targets
snmp: free snmp_pdu struct allocated by snmp_pdu_create()
This should fix the leak reported in issue #610.
This should fix the leak reported in issue #610.
Merge pull request #540 from tokkee/configure
configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.
configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.
Merge pull request #689 from ymettier/ym/cd53_fix_tcpconns_inet_diag
Fix for 'linux/inet_diag.h: No such file or directory'
Fix for 'linux/inet_diag.h: No such file or directory'
RedHat RPM spec: add modbus plugin
... now that EPEL6 provides libmodbus
... now that EPEL6 provides libmodbus
Fix for 'linux/inet_diag.h: No such file or directory'
fix: use DOUBLE_TO_CDTIME_T() to match input type
... as strtod() returns a double not a time_t.
Follow-up to 7d1d59fb to match what ada80db25 does (currently in
master) and avoid a merge conflict.
... as strtod() returns a double not a time_t.
Follow-up to 7d1d59fb to match what ada80db25 does (currently in
master) and avoid a merge conflict.
mistake, SAVE_LIBS="$LIBS" is correct.
patch required to build oracle plugin, collectd-5.4.0 (#653)
Merge pull request #579 from mfournier/libiptc-ldflags
link iptables plugin against flags from pkg-config
link iptables plugin against flags from pkg-config
Merge pull request #677 from collectd/revert-630-F-METRICS-383-tsdb-writer-5.4
Revert "write_tsdb plugin"
Revert "write_tsdb plugin"
Revert "write_tsdb plugin"
Merge pull request #630 from llnw/F-METRICS-383-tsdb-writer-5.4
write_tsdb plugin
write_tsdb plugin
utils_vl_lookup: Fixed a race when creating user objects.
This could cause multiple aggregation instances to be created in the
aggregation plugin when first writing data to the plugin. This, in turn, led
to "value too old" warnings because subsequently all data was submitted twice.
Thanks to @faxm0dem for reporting this in GH #535.
This could cause multiple aggregation instances to be created in the
aggregation plugin when first writing data to the plugin. This, in turn, led
to "value too old" warnings because subsequently all data was submitted twice.
Thanks to @faxm0dem for reporting this in GH #535.
Plugin exec: change notification time to integer.
Acording to collectd-exec.5 NOTIFICATION DATA FORMAT: time is epoch, i. e. as seconds since 1970-01-01 00:00:00 UTC.
Acording to collectd-exec.5 NOTIFICATION DATA FORMAT: time is epoch, i. e. as seconds since 1970-01-01 00:00:00 UTC.
cmd PUTNOTIF time option: handle double values.
Conflicts:
src/utils_cmd_putnotif.c
Conflicts:
src/utils_cmd_putnotif.c
Plugin java: fix notification time conversion to cdtime_t.
Plugin threshold: time is not set in missing notifications.
Merge pull request #592 from mfournier/bug-582
curl_json: also allow long callback names.
curl_json: also allow long callback names.
manpage: document 2 missing options to amqp plugin section
add missing backticks which broke the build
write_riemann: coding style consistency
Make the style in line with 50d1b34d6 (from master) and avoid later
merge conflict.
Make the style in line with 50d1b34d6 (from master) and avoid later
merge conflict.
don't assume pkg-config is in PATH
Configparser: when we alocate an empty list, we also need to reset the counter; else we will trip over this later.
This fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750440
This fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750440
[METRICS-390] Make sure HostTags is initialized if not configured
[METRICS-390] Fix string handling for TSDB prefix and tags
[METRICS-390] Add tag writing from metadata using TSDB target_set patches
[METRICS-383] Add HostTags which adds tags for all metrics from this writer
Uncrustify write_tsdb
Add DeleteSocket option in synopsis of manpage
Signed-off-by: Florian Forster <octo@collectd.org>
Signed-off-by: Florian Forster <octo@collectd.org>
[METRICS-383] write_tsdb plugin
add brackets to the list of characters graphite chokes on
Graphite deals poorly with metric names containing quotes.
Sanitize graphite metrics with our own escaping function,
better suited for this use-case than the one in `utils_parse_option`
Sanitize graphite metrics with our own escaping function,
better suited for this use-case than the one in `utils_parse_option`
curl_json: also allow long callback names.
This is basically the same as 2f392819, which got applied to the
curl_xml plugin a few months ago.
Fixes #582.
This is basically the same as 2f392819, which got applied to the
curl_xml plugin a few months ago.
Fixes #582.
Fix check for htonll in configure.ac
fix for #477: Notification time gone wrong
Sub-second time handling was added in collectd 5.0.0. This adds support
for this to the target_notification plugin, which got missed out at the
time.
Sub-second time handling was added in collectd 5.0.0. This adds support
for this to the target_notification plugin, which got missed out at the
time.
Fix getargs declaration to compile in AIX7
AIX doesn't have MSG_DONTWAIT, define as MSG_NONBLOCK
Updated Color to match DataSources and DSName for single-series graphs.
Fix missed change from int to double for interval
indent wh_init() to be consistent with the rest of the file
Call curl_global_init() in _init of plugins using curl
Need to call curl_global_init() or curl_easy_init() during init
for plugins when we're still running single threaded. This
updates the remaining ones
Need to call curl_global_init() or curl_easy_init() during init
for plugins when we're still running single threaded. This
updates the remaining ones
link iptables plugin against flags from pkg-config
This solves issue #326 for ubuntu versions >= 13.10
This solves issue #326 for ubuntu versions >= 13.10
write_riemann plugin: Receive acknowledge message when using TCP.
Not receiving an acknowledge message when communicating with riemann over TCP
will cause the riemann instance to eventually hang for extended periods of time
because of resource exhaustion.
Took the time to reaorganize the riemann_send function to simplify locking.
Not receiving an acknowledge message when communicating with riemann over TCP
will cause the riemann instance to eventually hang for extended periods of time
because of resource exhaustion.
Took the time to reaorganize the riemann_send function to simplify locking.
lvm: Do not segfault when there are no VGs
configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.
Please free strings *after* printing them ;-)
Signed-off-by: Florian Forster <octo@collectd.org>
Signed-off-by: Florian Forster <octo@collectd.org>
Bump version to 5.4.1; Update ChangeLog.
Merge branch 'collectd-5.3' into collectd-5.4
Merge remote-tracking branch 'origin/collectd-4.10' into collectd-5.3
Merge remote-tracking branch 'origin/pr/490' into collectd-5.3
configure: Fixed linker options when checking for amqp_tcp_socket_new.
This fixes the check when using GCC's --as-needed which fails when options are
not specified in the right order. Libraries (-l options) have to be specified
after any source files. autoconf does the right thing when using $LIBS for
that case rather than $LDFLAGS.
This fixes the check when using GCC's --as-needed which fails when options are
not specified in the right order. Libraries (-l options) have to be specified
after any source files. autoconf does the right thing when using $LIBS for
that case rather than $LDFLAGS.
amqp plugin: Don't use C++ style comments.
Merge pull request #2 from mfournier/amqp-symbol_lookup
amqp: fix symbol lookup error with librabbitmq >= 0.4.0
amqp: fix symbol lookup error with librabbitmq >= 0.4.0
amqp: fix symbol lookup error with librabbitmq >= 0.4.0
amqp_socket_close() which we were using isn't exported anymore.
See https://github.com/alanxz/rabbitmq-c/commit/bdda7ab
amqp_destroy_connection() implicitly closes the socket, so we don't need
to bother about this if using librabbitmq >= 0.4.0
credits to @tokkee for figuring that out !
amqp_socket_close() which we were using isn't exported anymore.
See https://github.com/alanxz/rabbitmq-c/commit/bdda7ab
amqp_destroy_connection() implicitly closes the socket, so we don't need
to bother about this if using librabbitmq >= 0.4.0
credits to @tokkee for figuring that out !
network: comment libgcrypt initalization process
apache plugin: Call curl_global_init() from the init function.
This is a shot in the dark in trying to address #513. By calling this
from an init() callback, I hope to be initializing the curl and gcrypt
libraries before collectd becomes multi-threaded, avoiding the problems
described in the issue.
This is a shot in the dark in trying to address #513. By calling this
from an init() callback, I hope to be initializing the curl and gcrypt
libraries before collectd becomes multi-threaded, avoiding the problems
described in the issue.
10 years ago[network] set_thread_cbs so we initialize the right threading mode in gcry_check_version
[network] set_thread_cbs so we initialize the right threading mode in gcry_check_version
Signed-off-by: Florian Forster <octo@collectd.org>
Signed-off-by: Florian Forster <octo@collectd.org>
fix cgroups plugin name in example config
amqp plugin: Fixed compilation when using rabbitmq-c < 0.4.
Thanks to Marc Fournier for noticing!
Thanks to Marc Fournier for noticing!
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
src/zfs_arc.c
Conflicts:
src/zfs_arc.c
Merge branch 'collectd-4.10' into collectd-5.3
Revert "curl_xml.c: avoid using uninitalized variable in error message"
This reverts commit bbbf37d55a3959951604c4be482e9a705a0f86d9.
A different fix for this problem was commited to the collectd-5.4 branch
(8327ee64) and conflicts with this patch. Also, initializing url the
same way as 8327ee64 does it, to avoid a merge conflict.
This reverts commit bbbf37d55a3959951604c4be482e9a705a0f86d9.
A different fix for this problem was commited to the collectd-5.4 branch
(8327ee64) and conflicts with this patch. Also, initializing url the
same way as 8327ee64 does it, to avoid a merge conflict.
interface.c: FreeBSD-10 support
Quoting @trtrmitya in github issue #506 : "[...] it is broken on
FreeBSD-10, in which getifaddrs() returns not only link level stats for
a particular interface, but also entries for each IP configured on that
interface. As a result if_submit() is called several times for each
interface, which results in incorrect data being logged.
I am attaching a patch which fixes a problem on FreeBSD (9/10), but it
should work for every *BSD because [...] the getifaddrs implementation
first appeared in BSDi BSD/OS."
Many thanks to @trtrmitya for providing the patch !
Quoting @trtrmitya in github issue #506 : "[...] it is broken on
FreeBSD-10, in which getifaddrs() returns not only link level stats for
a particular interface, but also entries for each IP configured on that
interface. As a result if_submit() is called several times for each
interface, which results in incorrect data being logged.
I am attaching a patch which fixes a problem on FreeBSD (9/10), but it
should work for every *BSD because [...] the getifaddrs implementation
first appeared in BSDi BSD/OS."
Many thanks to @trtrmitya for providing the patch !