Add micro-seconds resolution in write_riemann
riemann-c-client 1.10.0 and higher supports micro-seconds time
resolution for Riemann events.
riemann-c-client 1.10.0 and higher supports micro-seconds time
resolution for Riemann events.
Merge branch 'collectd-5.7'
Conflicts:
src/intel_rdt.c
Conflicts:
src/intel_rdt.c
Merge pull request #2310 from octo/ff/intel_rdt
intel_rdt plugin: Remove unnecessary goto.
intel_rdt plugin: Remove unnecessary goto.
intel_rdt plugin: Remove unnecessary goto.
Merge branch 'collectd-5.7'
Merge branch 'collectd-5.6' into collectd-5.7
Bind plugin: plug a few leaks
Fixes: #2303
Fixes: #2303
Merge pull request #2307 from saiarcot895/mongo-mem-leak
Use bson_destroy instead of bson_free, and fix memleak issue.
Use bson_destroy instead of bson_free, and fix memleak issue.
Use bson_destroy instead of bson_free, and fix memleak issue.
Merge pull request #2304 from archii/fix-ipmi-docs-typo
Fix ipmi docs typo
Fix ipmi docs typo
Merge pull request #1 from archii/archii-fix-docs-typo-1
fix typo in collectd.conf.pod
fix typo in collectd.conf.pod
fix typo in collectd.conf.pod
python plugin: stop disabling strict aliasing
According to https://bugs.python.org/issue1718153, this has been fixed
in python 2.6, the oldest version we support.
According to https://bugs.python.org/issue1718153, this has been fixed
in python 2.6, the oldest version we support.
configure.ac: slightly tweak dpdk check
configure.ac: keep libs sorted
configure.ac: detect compiler vendor
I'll use this in followup patches to detect if the compiler supports
various warning flags. For example, a long standing issue is that older
version of the Sun studio compiler doesn't support -Werror.
I'll use this in followup patches to detect if the compiler supports
various warning flags. For example, a long standing issue is that older
version of the Sun studio compiler doesn't support -Werror.
configure.ac: no need for body for preproc test
configure.ac: use preprocessor to detect libpqos version
No need to run the program.
No need to run the program.
configure.ac: use preprocessor to detect dpdk version
The test doesn't run any code, so no need to compile it.
The test doesn't run any code, so no need to compile it.
configure.ac: replace AS_IF with normal test
AS_IF is slightly more portable, but slightly less readable.
AS_IF is slightly more portable, but slightly less readable.
configure.ac: replace last few tabs with spaces
configure.ac: fix libpqos detection style
snmp-agent: fix build on RHEL6
libnetsnmpagent.so from net-snmp 5.5 needs some symbols from libnetsnmphelpers.so,
but does not link against it on RHEL5.
Work around this by looking for one of those symbols in the helper lib,
and if found, link against it.
Later versions of net-snmp seem to have moved those symbols to
libnetsnmpagent.so, so it's not an issue there.
libnetsnmpagent.so from net-snmp 5.5 needs some symbols from libnetsnmphelpers.so,
but does not link against it on RHEL5.
Work around this by looking for one of those symbols in the helper lib,
and if found, link against it.
Later versions of net-snmp seem to have moved those symbols to
libnetsnmpagent.so, so it's not an issue there.
configure.ac: remove unneeded include
All files in AC_CONFIG_MACRO_DIR are included by default.
All files in AC_CONFIG_MACRO_DIR are included by default.
configure.ac: improve libnetsnmpagent detection
Turn it into a separate check, which also makes it possible to disable
it.
snmp_agent and snmp are separate plugins, and on at least Fedora are
packaged separately.
A beneficial side effect is that this reduces overlinking of snmp.so
with libnetsnmpagent.so
Turn it into a separate check, which also makes it possible to disable
it.
snmp_agent and snmp are separate plugins, and on at least Fedora are
packaged separately.
A beneficial side effect is that this reduces overlinking of snmp.so
with libnetsnmpagent.so
snmp-agent: check for the right header
We never include net-snmp/agent/agent_module_config.h
We never include net-snmp/agent/agent_module_config.h
configure.ac: fix style for snmpagent plugin
configure.ac: fix overquoting
format_graphite: Error if call to uc_get_rate fails to return a value.
This prevents a wrong value being sent to graphite for DERIVE types.
See #2209
Signed-off-by: Florian Forster <octo@collectd.org>
This prevents a wrong value being sent to graphite for DERIVE types.
See #2209
Signed-off-by: Florian Forster <octo@collectd.org>
snmp plugin: Avoid allocation of temporary buffers on the heap.
src/daemon/utils_cache.c: Add debug message for lookup of missing metrics.
Issue: #1234
Issue: #1234
src/daemon/utils_cache.c: Remove unnecessary cast.
(data_set_t).ds_num has been changed to be a size_t.
(data_set_t).ds_num has been changed to be a size_t.
Merge remote-tracking branch 'github/pr/2285'
Merge pull request #2290 from BrandonArp/snmp_agent_rpm
allow configuration of snmp_agent in rpm builds
allow configuration of snmp_agent in rpm builds
allow configuration of snmp_agent in rpm builds
Merge pull request #2287 from BrandonArp/fix_am_1_11
fix build on automake 1.11
fix build on automake 1.11
curl_json plugin: Work around a limitation in EPEL6's GCC.
Merge remote-tracking branch 'github/pr/2105'
Merge remote-tracking branch 'github/pr/2190'
chrony plugin: Re-run clang-format.
memcached plugin: Expand "del" to "delete" for clarity.
memcached plugin: Add delete_{hits,misses} metrics.
src/daemon/utils_cache.c: Read time *after* acquiring the lock.
Fixes: #1193
Fixes: #1193
fix build on automake 1.11
snmp_agent plugin: Don't export the g_agent variable.
snmp_agent plugin: Remove parenthesis around return values.
See also: #2277
See also: #2277
snmp_agent plugin: Format with clang-format.
Merge remote-tracking branch 'github/pr/2277'
amqp plugin: Enable the "ExchangeType" for publishers, too.
Fixes: #2286
Fixes: #2286
curl_json plugin: Refactor the way trees/keys are stored.
Previously, keys had a "magic" as their first member which was used to
differentiate between the two types when they were returned from the
binary search tree.
This patch creates a new struct, cj_tree_entry_t, which includes an enum
identifying which union member is valid.
Previously, keys had a "magic" as their first member which was used to
differentiate between the two types when they were returned from the
binary search tree.
This patch creates a new struct, cj_tree_entry_t, which includes an enum
identifying which union member is valid.
curl_json plugin: Expand unit tests.
This adds various tests involving arrays.
Issue: #2266
This adds various tests involving arrays.
Issue: #2266
Merge branch 'collectd-5.7'
Merge branch 'collectd-5.6' into collectd-5.7
curl_json plugin: Fix array index and key handling.
Previously, the "key" was loaded by calling cj_cb_map_key() from
cj_cb_inc_array_index(). That means that the key for the previous element
was loaded as the array index was updated for the next element, resulting
in an off-by-one error. Also the key was not unset in time, resulting in
two metrics with the same identifier being created.
This patch fixes this with the following changes:
* cj_advance_array() (nee cj_cb_inc_array_index()) now loads the key for
the new index position instead of the previous one.
* The initial "0" key is loaded from cj_cb_start_array().
* cj_advance_array() always updates the key. The "update_key" argument
has been removed.
* Refactoring: key loading has been moved out of cj_cb_map_key() and
into its own function, cj_load_key().
Unit tests are in a separate commit for easier cherry-picking.
Fixes: #2266
Previously, the "key" was loaded by calling cj_cb_map_key() from
cj_cb_inc_array_index(). That means that the key for the previous element
was loaded as the array index was updated for the next element, resulting
in an off-by-one error. Also the key was not unset in time, resulting in
two metrics with the same identifier being created.
This patch fixes this with the following changes:
* cj_advance_array() (nee cj_cb_inc_array_index()) now loads the key for
the new index position instead of the previous one.
* The initial "0" key is loaded from cj_cb_start_array().
* cj_advance_array() always updates the key. The "update_key" argument
has been removed.
* Refactoring: key loading has been moved out of cj_cb_map_key() and
into its own function, cj_load_key().
Unit tests are in a separate commit for easier cherry-picking.
Fixes: #2266
Merge pull request #2283 from octo/ff/valgrind
valgrind.FreeBSD.suppress: parse_value(): Always suppress the strlen(…
valgrind.FreeBSD.suppress: parse_value(): Always suppress the strlen(…
valgrind.FreeBSD.suppress: parse_value(): Always suppress the strlen() false positive.
Previously, this was only suppressed when called via parse_values()
(note the plural).
Fixes: #2282
Previously, this was only suppressed when called via parse_values()
(note the plural).
Fixes: #2282
curl_json plugin: Implement a unit test.
Issue: #2266
Issue: #2266
src/testing.h: Fix result of EXPECT_EQ_DOUBLE() when actual is NAN.
src/daemon/plugin_mock.c: Add stubs for additional functions.
curl_json plugin: Split cj_append_key() out of cj_config_add_key().
curl_json plugin: Use struct initializer.
curl_json plugin: Remove unused field from cj_t.
Merge pull request #2279 from octo/ff/virt
virt plugin: Replace virTypedParamsFree() with virTypedParamsClear() …
virt plugin: Replace virTypedParamsFree() with virTypedParamsClear() …
virt plugin: Replace virTypedParamsFree() with virTypedParamsClear() and sfree().
The parameters are allocated with calloc(), freeing them with a library
function is unintuitive at best. Also, the library functions appears to
be missing the appropriate function attribute to tell clang / GCC that
it will free the pointer, resulting in a false-positive scan-build
report.
The parameters are allocated with calloc(), freeing them with a library
function is unintuitive at best. Also, the library functions appears to
be missing the appropriate function attribute to tell clang / GCC that
it will free the pointer, resulting in a false-positive scan-build
report.
collectd.conf(5): Fix typo ("queries" vs. "queried").
By avoiding the word: "metrics" is bettern than "statistics".
By avoiding the word: "metrics" is bettern than "statistics".
Merge pull request #2278 from octo/ff/perl
perl plugin: Fix potential double-free.
perl plugin: Fix potential double-free.
perl plugin: Fix potential double-free.
The av2notification_meta() function updated it's parameter by doing
(*m) = malloc();
Afterwards, if an error occurred, it would call `free(*m);` and (potentially)
return, leaving an invalid pointer stored in `m`. The caller would then try to
free the returned pointer because it was non-NULL.
This patch fixes this by doing several code cleanups:
* The meta argument is not updated unnecessarily. Instead, a local variable
is allocated and used within the loop and only on success is the return
pointer updated.
* Introduce additional local variables instead of re-using the `tmp` variable
multiple times.
* Name the variable pointing to the end of the linked list appropriately
`tail` and remove one level of indirection. Reading code that is using
pointers to pointers is unnecessarily hard.
The av2notification_meta() function updated it's parameter by doing
(*m) = malloc();
Afterwards, if an error occurred, it would call `free(*m);` and (potentially)
return, leaving an invalid pointer stored in `m`. The caller would then try to
free the returned pointer because it was non-NULL.
This patch fixes this by doing several code cleanups:
* The meta argument is not updated unnecessarily. Instead, a local variable
is allocated and used within the loop and only on success is the return
pointer updated.
* Introduce additional local variables instead of re-using the `tmp` variable
multiple times.
* Name the variable pointing to the end of the linked list appropriately
`tail` and remove one level of indirection. Reading code that is using
pointers to pointers is unnecessarily hard.
Remove parentheses around return arguments
They don't do any harm but they are not really needed either.
Contributors are not used to following this style, and reviewers have to
keep pointing it out in reviews. This takes up valuable time for both
the contributor and the reviewer and distracts from the more important
issues.
I used the following Coccinelle patch:
@@
expression e;
@@
- return (e);
+ return e;
spatch is having trouble with some files so I have cleaned up the rest
with a few regexes.
They don't do any harm but they are not really needed either.
Contributors are not used to following this style, and reviewers have to
keep pointing it out in reviews. This takes up valuable time for both
the contributor and the reviewer and distracts from the more important
issues.
I used the following Coccinelle patch:
@@
expression e;
@@
- return (e);
+ return e;
spatch is having trouble with some files so I have cleaned up the rest
with a few regexes.
Merge branch 'collectd-5.7'
Merge pull request #2275 from octo/ff/prometheus
write_prometheus plugin: Fix incorrect use of realloc().
write_prometheus plugin: Fix incorrect use of realloc().
Merge pull request #2274 from octo/ff/putval
src/utils_cmd_putval.c: Fix multi-value PUTVAL.
src/utils_cmd_putval.c: Fix multi-value PUTVAL.
src/utils_cmd_putval.c: Fix multi-value PUTVAL.
vl.values was allocated outside of the loop and then copied into each
ret_putval->vl[]. This means that later values overwrote the values
stored in previous ret_putval->vl[].
vl.values was allocated outside of the loop and then copied into each
ret_putval->vl[]. This means that later values overwrote the values
stored in previous ret_putval->vl[].
write_prometheus plugin: Fix incorrect use of realloc().
Calling realloc(ptr, 0) is undefined. Call free() explicitly.
Calling realloc(ptr, 0) is undefined. Call free() explicitly.
configure.ac: Remove empty else-block from AC_CHECK_LIB.
Fixes: #2272
Fixes: #2272
Merge branch 'collectd-5.7'
Merge branch 'collectd-5.6' into collectd-5.7
bind plugin: Use timegm() to convert to time_t if available.
FreeBSD doesn't provide the "extern long timezone", presumably because
it's "only" an XSI extension, leading to a portability issue with the
previous approach.
timegm() is a non-standard function available in GNU's and BSD's libc
which is doing exactly what we need. The previous code is left as a
fallback.
Fixes: #1268
FreeBSD doesn't provide the "extern long timezone", presumably because
it's "only" an XSI extension, leading to a portability issue with the
previous approach.
timegm() is a non-standard function available in GNU's and BSD's libc
which is doing exactly what we need. The previous code is left as a
fallback.
Fixes: #1268
fix BIND timezone parsing issue
collectd.conf(5): Add section documenting the ignorelist functionality.
Fixes: #2267
Fixes: #2267
Merge pull request #2265 from velotraveler/master
fix BIND timezone parsing issue
fix BIND timezone parsing issue
fix BIND timezone parsing issue
Merge pull request #2260 from bufadu/evol_redis
redis: adding support for keys count per database
redis: adding support for keys count per database
redis: fix parser and comments
redis: fixing maintainer requests
systemd.collectd.service: fix a typo
redis: removing sprintf() calls
redis: adding support for key count per database
Merge pull request #2255 from clemensg/sensors_support_current
sensors: support current values
sensors: support current values
sensors: support current values
Add support for current sensor data collection.
Signed-off-by: Clemens Gruber <clemensgru@gmail.com>
Add support for current sensor data collection.
Signed-off-by: Clemens Gruber <clemensgru@gmail.com>
Merge pull request #2252 from jaroug/kairosdb_ttl_support
Kairosdb ttl support
Kairosdb ttl support
fix spelling
Merge pull request #2253 from LionelCons/master
data-sets are in fact supported (issues#2244)
data-sets are in fact supported (issues#2244)
correct spelling
data-sets are in fact supported (issues#2244)
replace spaces by tabs
Add support for the new TTL parameter - kairosdb only
add documentation on the new TTL parameter
Merge branch 'collectd-5.7'
Merge branch 'collectd-5.6' into collectd-5.7
Tree-wide: remove last remnants of sizeof(char)
sizeof(char) is 1 by definition.
sizeof(char) is 1 by definition.