utils_db_query (postgresql/dbi/oracle plugins): Documented PluginInstanceFrom option
postgresql plugin: Improve documentation about Result blocks
utils_db_query (postgresql/dbi/oracle plugins): Add PluginInstanceFrom option
Merge branch 'collectd-5.5'
Merge branch 'collectd-5.4' into collectd-5.5
Conflicts:
src/Makefile.am
Conflicts:
src/Makefile.am
rrdtool plugin: fix thread-safety detection
librrd 1.6.0 is now threadsafe and librrd_th is gone.
Since there doesn't seem to be a way to detect that librrd
is threadsafe, use pkg-config to check for 1.6.0 or newer instead.
The logic is now as follows:
Check for librrd >= 1.6.0 with pkg-config
If not found, look for rrd_update_r in librrd_th.
If not found, look for rrd_update in librrd and assume librrd is not
thread safe.
(cherry picked from commit ef43260cd901847220c2a9de400579ff903ca13e)
Conflicts:
src/Makefile.am
librrd 1.6.0 is now threadsafe and librrd_th is gone.
Since there doesn't seem to be a way to detect that librrd
is threadsafe, use pkg-config to check for 1.6.0 or newer instead.
The logic is now as follows:
Check for librrd >= 1.6.0 with pkg-config
If not found, look for rrd_update_r in librrd_th.
If not found, look for rrd_update in librrd and assume librrd is not
thread safe.
(cherry picked from commit ef43260cd901847220c2a9de400579ff903ca13e)
Conflicts:
src/Makefile.am
rrdtool check: stop linking in libm
(cherry picked from commit 32c0ce39f786c56e9d13f3615253a7ae55b578e6)
(cherry picked from commit 32c0ce39f786c56e9d13f3615253a7ae55b578e6)
rrdtool check: no need to save CPPFLAGS
There's no need to save CPPFLAGS when we're just
checking a library.
(cherry picked from commit f7e09269879b74e61324de9178503221b2df9136)
There's no need to save CPPFLAGS when we're just
checking a library.
(cherry picked from commit f7e09269879b74e61324de9178503221b2df9136)
rrdtool check: no need to save LDFLAGS
There's no need to save LDFLAGS when we're just
checking a header.
(cherry picked from commit 38068ecc7922ace29bb6af3f8ee5568c3fe96c08)
There's no need to save LDFLAGS when we're just
checking a header.
(cherry picked from commit 38068ecc7922ace29bb6af3f8ee5568c3fe96c08)
Merge pull request #1308 from mfournier/openldap-persistent-connection
Openldap: persistent connection + sane default timeout
Openldap: persistent connection + sane default timeout
Merge pull request #1686 from rubenk/zfs-arc
Zfs arc
Zfs arc
apcups: define default server timeout as a constant
Merge remote-tracking branch 'origin/pr/1701'
build system: rename riemann-c to libriemann-client
... to make this consistent with the other plugins
... to make this consistent with the other plugins
statsd plugin: Fix deadlock on plugin shutdown (Issue #1703)
apcups plugin: Change "PersistentConnection" option default value depending on poll Interval.
Revert "apcups plugin: Handle "END APC" lines correctly and stop reading."
This reverts commit fb075e15e3400afdb691b88f1e1a4a38578aaba9.
This reverts commit fb075e15e3400afdb691b88f1e1a4a38578aaba9.
Merge pull request #1695 from collectd/feature/fix-keyless-kafka-produce
write_kafka: reliability when no key provided
write_kafka: reliability when no key provided
src/daemon/plugin.h: Define DATA_MAX_NAME_LEN conditionally.
Issue: #1690
Issue: #1690
write_kafka: reliability when no key provided
Merge branch 'collectd-5.5'
More missing kstat usages
Merge branch 'collectd-5.5'
Add missing kstat definitions
Take out explicit definitions as they are already checked via enable_standards in configure.ac.
Fixes: #978
Fixes: #978
collectd-tg: Move _POSIX_C_SOURCE and friends to the Makefile.
Apparently defining this in the source files confuses Solaris' libc.
Thanks to @dago for looking into this.
Hopefully fixes: #978
Apparently defining this in the source files confuses Solaris' libc.
Thanks to @dago for looking into this.
Hopefully fixes: #978
Merge branch 'collectd-5.5'
processes: remove initialisation of unexisting variables
Partial revert of 1f0156c, which broke the build on Solaris and OpenBSD.
The context-switch reporting code is only part of master at the moment.
Fixes: #1674
Partial revert of 1f0156c, which broke the build on Solaris and OpenBSD.
The context-switch reporting code is only part of master at the moment.
Fixes: #1674
Modify the -T command line option so it watches for more errors. (#1642)
After this change, the following kinds of errors will cause collectd -T to
exit with an abnormal status:
- errors reading the config file
- errors reading types.db
- errors on plugin_init
- errors on plugin_shutdown
After this change, the following kinds of errors will cause collectd -T to
exit with an abnormal status:
- errors reading the config file
- errors reading types.db
- errors on plugin_init
- errors on plugin_shutdown
amqp plugin: prevent use after free
Found by scan-build:
amqp.c:1097:13: warning: Use of memory after it is freed
camqp_config_free (conf);
^~~~~~~~~~~~~~~~~~~~~~~~
Found by scan-build:
amqp.c:1097:13: warning: Use of memory after it is freed
camqp_config_free (conf);
^~~~~~~~~~~~~~~~~~~~~~~~
pf plugin: value stored in fd is never read
Found by scan-build:
pf.c:109:2: warning: Value stored to 'fd' is never read
fd = -1;
^ ~~
Found by scan-build:
pf.c:109:2: warning: Value stored to 'fd' is never read
fd = -1;
^ ~~
add format attribute to varargs functions
target_set: mark function as static
zfs_arc plugin: get more MRU/MFU stats
zfs_arc plugin: get more sizes of various caches
zfs_arc plugin: get the target size of the MRU
Also known as 'p'
Also known as 'p'
zfs_arc plugin: add memory_throttle_count stat
This tells you how often the ARC has been shrunk to release
memory for other processes.
This tells you how often the ARC has been shrunk to release
memory for other processes.
zfs_arc plugin: fix indentation
zfs_arc plugin: cleanup defines
RPM specfile: take new xencpu plugin in account
Merge pull request #1565 from rpv-tomsk/disk-plugin-ignorelist
* disk plugin: call ignorelist_match() once per device, not for each send metric
* disk plugin: call ignorelist_match() once per device, not for each send metric
* disk plugin: call ignorelist_match() once per device, not for each sent metric
Merge pull request #1546 from mfournier/processname_length_1284
processes: warn about process names above OS limit
processes: warn about process names above OS limit
Merge pull request #1557 from rpv-tomsk/master
* Collectd::Unixsock: Split messages sent by flush() to 1024 byte chunks to not overflow buffer in unixsock.c us_handle_client().
* Collectd::Unixsock: Split messages sent by flush() to 1024 byte chunks to not overflow buffer in unixsock.c us_handle_client().
Merge pull request #1564 from rpv-tomsk/disk-plugin
disk plugin: send disk_merged,disk_io_time,pending_operations only when real data exists for device
disk plugin: send disk_merged,disk_io_time,pending_operations only when real data exists for device
AC_CONFIG_SRCDIR needs to point to a unique file
AC_CONFIG_SRCDIR is a bit of a misnomer, in that it should
point to a unique file in the top source directory, not to
the directory itself.
AC_CONFIG_SRCDIR is a bit of a misnomer, in that it should
point to a unique file in the top source directory, not to
the directory itself.
rrdtool plugin: fix thread-safety detection
librrd 1.6.0 is now threadsafe and librrd_th is gone.
Since there doesn't seem to be a way to detect that librrd
is threadsafe, use pkg-config to check for 1.6.0 or newer instead.
The logic is now as follows:
Check for librrd >= 1.6.0 with pkg-config
If not found, look for rrd_update_r in librrd_th.
If not found, look for rrd_update in librrd and assume librrd is not
thread safe.
librrd 1.6.0 is now threadsafe and librrd_th is gone.
Since there doesn't seem to be a way to detect that librrd
is threadsafe, use pkg-config to check for 1.6.0 or newer instead.
The logic is now as follows:
Check for librrd >= 1.6.0 with pkg-config
If not found, look for rrd_update_r in librrd_th.
If not found, look for rrd_update in librrd and assume librrd is not
thread safe.
HAVE_THREADSAFE_LIBRRD is either defined or not
rrdtool check: stop linking in libm
rrdtool check: no need to save CPPFLAGS
There's no need to save CPPFLAGS when we're just
checking a library.
There's no need to save CPPFLAGS when we're just
checking a library.
rrdtool check: no need to save LDFLAGS
There's no need to save LDFLAGS when we're just
checking a header.
There's no need to save LDFLAGS when we're just
checking a header.
liboconfig: enable dependency tracking
Nowadays there's no reason not too.
Also remove the foreign option, since we set that as default
in configure.ac already.
Nowadays there's no reason not too.
Also remove the foreign option, since we set that as default
in configure.ac already.
sfree: don't check for NULL before calling free
free(NULL) is safe to call
free(NULL) is safe to call
Merge branch 'cppcheck'
bind plugin: space after realloc
amqp: plug leak on realloc failure
realloc: remove unnecessary casts of return value
match_value: condition is always true
[src/match_value.c:338]: (style) Condition 'value_matches==0' is always true
[src/match_value.c:338]: (style) Condition 'value_matches==0' is always true
apache plugin: len is unsigned
[src/apache.c:140]: (style) Checking if unsigned variable 'len' is less than zero.
[src/apache.c:140]: (style) Checking if unsigned variable 'len' is less than zero.
ascent plugin: len is unsigned
[src/ascent.c:157]: (style) Checking if unsigned variable 'len' is less than zero.
[src/ascent.c:157]: (style) Checking if unsigned variable 'len' is less than zero.
battery plugin: remove assignment with no effect
[src/battery.c:361] -> [src/battery.c:372]: (performance) Variable 'capacity_charged' is reassigned a value before the old one has been used.
[src/battery.c:361] -> [src/battery.c:372]: (performance) Variable 'capacity_charged' is reassigned a value before the old one has been used.
bind plugin: len is unsigned
[src/bind.c:280]: (style) Checking if unsigned variable 'len' is less than zero.
[src/bind.c:280]: (style) Checking if unsigned variable 'len' is less than zero.
curl plugin: prev can't be NULL here
[src/curl.c:548] -> [src/curl.c:546]: (warning) Either the condition 'prev!=0' is redundant or there is possible null pointer dereference: prev.
[src/curl.c:548] -> [src/curl.c:546]: (warning) Either the condition 'prev!=0' is redundant or there is possible null pointer dereference: prev.
curl plugin: len is unsigned
[src/curl.c:98]: (style) Checking if unsigned variable 'len' is less than zero.
[src/curl.c:98]: (style) Checking if unsigned variable 'len' is less than zero.
curl_json plugin: len is unsigned
[src/curl_json.c:119]: (style) Checking if unsigned variable 'len' is less than zero.
[src/curl_json.c:119]: (style) Checking if unsigned variable 'len' is less than zero.
curl_xml plugin: remove useless assigment
list has local storage class
[src/curl_xml.c:173]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?
list has local storage class
[src/curl_xml.c:173]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?
curl_xml plugin: len is unsigned
[src/curl_xml.c:117]: (style) Checking if unsigned variable 'len' is less than zero.
[src/curl_xml.c:117]: (style) Checking if unsigned variable 'len' is less than zero.
collectd.c: dirlen is unsigned
[src/daemon/collectd.c:199]: (style) Checking if unsigned variable 'dirlen' is less than zero.
[src/daemon/collectd.c:199]: (style) Checking if unsigned variable 'dirlen' is less than zero.
common.c: fields_num is unsigned
[src/daemon/common.c:338]: (style) Checking if unsigned variable 'fields_num' is less than zero.
[src/daemon/common.c:338]: (style) Checking if unsigned variable 'fields_num' is less than zero.
common_test.c: sfree always sets ptr to NULL
[src/daemon/common_test.c:93]: (style) Condition 'ptr==0' is always true
[src/daemon/common_test.c:93]: (style) Condition 'ptr==0' is always true
plugin.c: fix potential null pointer dereference
[src/daemon/plugin.c:2095] -> [src/daemon/plugin.c:2091]: (warning) Either the condition 'vl==0' is redundant or there is possible null pointer dereference: vl.
[src/daemon/plugin.c:2095] -> [src/daemon/plugin.c:2091]: (warning) Either the condition 'vl==0' is redundant or there is possible null pointer dereference: vl.
utils_ignorelist.c: remove useless assignment
[src/daemon/utils_ignorelist.c:238]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?
[src/daemon/utils_ignorelist.c:238]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?
dbi plugin: remove assignment with no effect
[src/dbi.c:513] -> [src/dbi.c:518]: (performance) Variable 'res' is reassigned a value before the old one has been used.
[src/dbi.c:513] -> [src/dbi.c:518]: (performance) Variable 'res' is reassigned a value before the old one has been used.
liboconfig/oconfig.c: remove unneeded assigment
[src/liboconfig/oconfig.c:224]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?
[src/liboconfig/oconfig.c:224]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?
memcachec plugin: prev can't be NULL here
[src/memcachec.c:392] -> [src/memcachec.c:390]: (warning) Either the condition 'prev!=0' is redundant or there is possible null pointer dereference: prev.
[src/memcachec.c:392] -> [src/memcachec.c:390]: (warning) Either the condition 'prev!=0' is redundant or there is possible null pointer dereference: prev.
openvpn plugin: plug leak on realloc failure
[src/openvpn.c:715]: (error) Common realloc mistake: 'vpn_list' nulled but not freed upon failure
[src/openvpn.c:715]: (error) Common realloc mistake: 'vpn_list' nulled but not freed upon failure
openvpn plugin: use sizeof(*pointer) instead of sizeof(type)
openvpn plugin: remove unnecessary cast
memcached plugin: remove assignment with no effect
[src/memcached.c:176] -> [src/memcached.c:180]: (performance) Variable 'fd' is reassigned a value before the old one has been used.
[src/memcached.c:176] -> [src/memcached.c:180]: (performance) Variable 'fd' is reassigned a value before the old one has been used.
network plugin: output_len is unsigned
[src/network.c:937]: (style) Checking if unsigned variable 'output_len' is less than zero.
[src/network.c:937]: (style) Checking if unsigned variable 'output_len' is less than zero.
perl plugin: remove assignments with no effect
[src/perl.c:2079] -> [src/perl.c:2082]: (performance) Variable 't' is reassigned a value before the old one has been used.
[src/perl.c:2079] -> [src/perl.c:2082]: (performance) Variable 't' is reassigned a value before the old one has been used.
processes plugin: check boundary first
[src/processes.c:1042]: (style) Array index 'name_start_pos' is used before limits check.
[src/processes.c:1042]: (style) Array index 'name_start_pos' is used before limits check.
snmp plugin: initialize res sooner
snmp plugin: remove statement with no effect
res has local scope, and we return immediately after.
res has local scope, and we return immediately after.
snmp plugin: res can't be NULL here
[src/snmp.c:1761] -> [src/snmp.c:1777]: (warning) Either the condition 'res!=0' is redundant or there is possible null pointer dereference: res.
[src/snmp.c:1761] -> [src/snmp.c:1777]: (warning) Either the condition 'res!=0' is redundant or there is possible null pointer dereference: res.
threshold.c: remove assignment with no effect.
[src/threshold.c:81] -> [src/threshold.c:87]: (performance) Variable 'th_ptr' is reassigned a value before the old one has been used.
[src/threshold.c:81] -> [src/threshold.c:87]: (performance) Variable 'th_ptr' is reassigned a value before the old one has been used.
utils_db_query.c: plug leak on error
utils_db_query.c: remove unnecessary cast
network plugin: fd_num is unsigned
[src/network.c:2314]: (style) Checking if unsigned variable 'fd_num' is less than zero.
[src/network.c:2314]: (style) Checking if unsigned variable 'fd_num' is less than zero.
nginx plugin: len is unsigned
[src/nginx.c:74]: (style) Checking if unsigned variable 'len' is less than zero.
[src/nginx.c:74]: (style) Checking if unsigned variable 'len' is less than zero.
olsrd plugin: buffer_len is unsigned
[src/olsrd.c:666]: (style) Checking if unsigned variable 'buffer_len' is less than zero.
[src/olsrd.c:666]: (style) Checking if unsigned variable 'buffer_len' is less than zero.
processes plugin: ps->num_lwp is unsigned long
[src/processes.c:1095]: (style) Checking if unsigned variable 'num_lwp' is less than zero.
[src/processes.c:1095]: (style) Checking if unsigned variable 'num_lwp' is less than zero.
processes plugin: len is unsigned
[src/processes.c:1219]: (style) Checking if unsigned variable 'len' is less than zero.
[src/processes.c:1219]: (style) Checking if unsigned variable 'len' is less than zero.
utils_db_query.c: r->instances_num is unsigned
[src/utils_db_query.c:237]: (style) Checking if unsigned variable 'instances_num' is less than zero.
[src/utils_db_query.c:237]: (style) Checking if unsigned variable 'instances_num' is less than zero.
utils_format_json.c: offset is unsigned
[src/utils_format_json.c:300]: (style) Checking if unsigned variable 'offset' is less than zero.
[src/utils_format_json.c:300]: (style) Checking if unsigned variable 'offset' is less than zero.
rrdcreate.c: ds_num is unsigned
[src/utils_rrdcreate.c:358]: (style) Checking if unsigned variable 'ds_num' is less than zero.
[src/utils_rrdcreate.c:358]: (style) Checking if unsigned variable 'ds_num' is less than zero.
write_graphite: send_buf_fill is unsigned
[src/write_graphite.c:183]: (style) Checking if unsigned variable 'send_buf_fill' is less than zero.
[src/write_graphite.c:183]: (style) Checking if unsigned variable 'send_buf_fill' is less than zero.
write_http plugin: send_buffer_fill is unsigned
write_tsdb plugin: send_buf_fill can't be < 0
[src/write_tsdb.c:145]: (style) Checking if unsigned variable 'send_buf_fill' is less than zero.
[src/write_tsdb.c:145]: (style) Checking if unsigned variable 'send_buf_fill' is less than zero.
zone plugin: plug leak on error
[src/zone.c:124]: (error) Memory leak: ret
[src/zone.c:124]: (error) Memory leak: ret