Pavel Rochnyak [Thu, 14 Jun 2018 03:29:51 +0000 (10:29 +0700)]
Merge pull request #2817 from rpv-tomsk/snmp-fix-2291-1
snmp plugin: Implemented new configuration options
Pavel Rochnyack [Wed, 13 Jun 2018 11:12:05 +0000 (18:12 +0700)]
snmp plugin: Implemented new configuration options
Added new options `PluginInstance`, `TypeInstance`, `TypeInstanceOID` and `PluginInstanceOID`.
These allows flexible configuration of reported metrics.
Existing `Instance` option marked as deprecated.
Closes: #2636
Pavel Rochnyack [Wed, 13 Jun 2018 03:38:23 +0000 (10:38 +0700)]
docs: Fix typo
Pavel Rochnyack [Tue, 12 Jun 2018 16:07:45 +0000 (23:07 +0700)]
snmp plugin: Allow to set plugin value in reported metrics
collectd bot [Sat, 9 Jun 2018 16:20:41 +0000 (18:20 +0200)]
Auto-Merge pull request #2813 from rpv-tomsk/master
Automatically merged due to "Automerge" label
Pavel Rochnyack [Sat, 9 Jun 2018 15:18:11 +0000 (22:18 +0700)]
config parser: Improved error reporting on global options
Some functions could return error code without any messages.
Pavel Rochnyack [Sat, 9 Jun 2018 11:30:29 +0000 (18:30 +0700)]
perl plugin: Restore missing include of "collectd.h"
Restore include which was removed in
fa36b45bfafec663e49639d40f4671e018e7ee10 (#2769).
This adressed to solve compilation issue on Solaris platform.
Ruben Kerkhof [Fri, 8 Jun 2018 16:24:19 +0000 (18:24 +0200)]
Merge pull request #2702 from elfiesmelfie/feat_snmp_agent
snmp_agent: new features
Mozejko, MarcinX [Thu, 7 Jun 2018 12:51:52 +0000 (13:51 +0100)]
SNMP Agent plugin: Fix minor issues
Change-Id: I5437f7d7d9abbbb0b466ed836475b35bba42fadb
Signed-off-by: Mozejko, MarcinX <marcinx.mozejko@intel.com>
Ruben Kerkhof [Thu, 7 Jun 2018 10:13:08 +0000 (12:13 +0200)]
Merge pull request #2804 from rubenk/remove-poison
Stop poisoning function in debug mode
Ruben Kerkhof [Thu, 7 Jun 2018 08:22:24 +0000 (10:22 +0200)]
Merge pull request #2808 from elfiesmelfie/fix_virt_shadow_warning
src/virt.c: Fix one 'shadow type' warning
Mozejko, MarcinX [Mon, 4 Jun 2018 14:13:35 +0000 (15:13 +0100)]
SNMP Agent plugin: Fix compability with netsnmp library version < 5.4.5
Fix valgrind issues in snmp_agent_test.c.
Remove unused variable from snmp_agent.c.
Change-Id: I201a39743af3b59827acada9b24a15672d97436a
Signed-off-by: Mozejko, MarcinX <marcinx.mozejko@intel.com>
Sean Campbell [Wed, 6 Jun 2018 14:04:53 +0000 (10:04 -0400)]
Refactor collectd binary to separate Unix-specific code.
Move OS-specific code from collectd.c into cmd.c.
This makes it easier to use the non-Linux-specific code when we port to Windows.
Antoine Naud [Fri, 25 May 2018 14:42:51 +0000 (15:42 +0100)]
src/virt.c: Fix one -Wshadow type warning
This commit fixes:
src/virt.c:1827:76: warning: declaration shadows a variable in the global scope
[-Wshadow]
static int domain_lifecycle_event_cb(__attribute__((unused)) virConnectPtr conn,
^
src/virt.c:471:22: note: previous declaration is here
static virConnectPtr conn;
Change-Id: I5303f834c5f13802909f8bd03afba0f4a23934d4
Signed-off-by: Antoine Naud <antoinex.naud@intel.com>
Mozejko, MarcinX [Tue, 27 Feb 2018 09:54:13 +0000 (09:54 +0000)]
SNMP Agent plugin: Fix - not every OID is unregistered from snmp table
Problem occures when a metric has more than one OID assigned. Then,
during the table unregistration, plugin thinks that there are some OIDs
left in the table and keeps index keys also registered. It's because
plugin registers all the OIDs for the particular metric, but unregisters only
the first one which is wrong.
Change-Id: I6daae1ceeebf30b98f22075940b29936ee3d110d
Signed-off-by: Mozejko, MarcinX <marcinx.mozejko@intel.com>
Mozejko, MarcinX [Thu, 25 Jan 2018 10:26:31 +0000 (10:26 +0000)]
SNMP Agent plugin: Fix klockwork issues
Change-Id: I2a451f1cd0426dbdeec878d584bbb51dce00c10a
Signed-off-by: Mozejko, MarcinX <marcinx.mozejko@intel.com>
Mozejko, MarcinX [Wed, 20 Dec 2017 13:28:48 +0000 (13:28 +0000)]
SNMP Agent plugin: Redesign way of registering OIDs
Now every metric is registered individually, so when any of them is removed
from collectd cache it is also unregistered from SNMP.
Change-Id: I3548bd9b7f9a5fb574bc34e300175e4cab63b0b4
Signed-off-by: Mozejko, MarcinX <marcinx.mozejko@intel.com>
Mozejko, MarcinX [Wed, 20 Dec 2017 13:19:36 +0000 (13:19 +0000)]
SNMP Agent plugin:
Support for complicated data definitions
Add unit tests for functions:
snmp_agent_oid_to_string()
snmp_agent_prep_index_list()
snmp_agent_fill_index_list()
snmp_agent_config_index_key_source()
snmp_agent_config_index_key_regex()
snmp_agent_config_index_key()
snmp_agent_format_name()
snmp_agent_parse_index_key()
snmp_agent_create_token()
snmp_agent_delete_token()
snmp_agent_get_token()
snmp_agent_tokenize()
snmp_agent_build_name()
Change-Id: I31a8a5c771fa4c7d0122705fe79f021bc71c9904
Signed-off-by: Mozejko, MarcinX <marcinx.mozejko@intel.com>
Mozejko, MarcinX [Mon, 24 Jul 2017 13:32:18 +0000 (14:32 +0100)]
SNMP Agent plugin: Add multiple key index support
Change-Id: I825aa4c022b0ef41439cb83527be69f3f4445bbb
Signed-off-by: Mozejko, MarcinX <marcinx.mozejko@intel.com>
Mozejko, MarcinX [Thu, 29 Jun 2017 11:43:51 +0000 (12:43 +0100)]
SNMP Agent plugin:
1. Removed redundant code in scalar and table column config parsing.
2. Removed redundant code in snmp_agent_dump_data function.
3. Changed function names:
snmp_agent_config_data() -> snmp_agent_config_scalar()
snmp_agent_config_table_data() -> snmp_agent_config_table_column()
snmp_agent_dump_data() -> snmp_agent_dump_config()
4. Fix: error getting SizeOID
Change-Id: I17175218119bcab979daff02deef298a57c93465
Signed-off-by: Mozejko, MarcinX <marcinx.mozejko@intel.com>
Ruben Kerkhof [Sun, 3 Jun 2018 22:10:12 +0000 (00:10 +0200)]
Stop poisoning function in debug mode
This breaks when external headers use those functions.
Fixes #2769
Ruben Kerkhof [Sun, 3 Jun 2018 22:25:33 +0000 (00:25 +0200)]
processes plugin: const correctness
src/processes.c: In function ‘ps_submit_proc_list’:
src/processes.c:915:8: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
{"delay-cpu", ps->delay_cpu},
^~~~~~~~~~~
src/processes.c:916:8: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
{"delay-blkio", ps->delay_blkio},
^~~~~~~~~~~~~
src/processes.c:917:8: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
{"delay-swapin", ps->delay_swapin},
^~~~~~~~~~~~~~
src/processes.c:918:8: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
{"delay-freepages", ps->delay_freepages},
^~~~~~~~~~~~~~~~~
Ruben Kerkhof [Sun, 3 Jun 2018 22:21:52 +0000 (00:21 +0200)]
intel_rdt plugin: const correctness
CC src/intel_rdt_la-intel_rdt.lo
src/intel_rdt.c: In function ‘rdt_read’:
src/intel_rdt.c:407:39: warning: passing argument 2 of ‘rdt_submit_derive’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
rdt_submit_derive(cgroup->desc, "memory_bandwidth", "local",
^~~~~~~~~~~~~~~~~~
src/intel_rdt.c:339:51: note: expected ‘char *’ but argument is of type ‘const char *’
static void rdt_submit_derive(char *cgroup, char *type, char *type_instance,
~~~~~~^~~~
src/intel_rdt.c:407:59: warning: passing argument 3 of ‘rdt_submit_derive’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
rdt_submit_derive(cgroup->desc, "memory_bandwidth", "local",
^~~~~~~
src/intel_rdt.c:339:63: note: expected ‘char *’ but argument is of type ‘const char *’
static void rdt_submit_derive(char *cgroup, char *type, char *type_instance,
~~~~~~^~~~~~~~~~~~~
src/intel_rdt.c:409:39: warning: passing argument 2 of ‘rdt_submit_derive’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
rdt_submit_derive(cgroup->desc, "memory_bandwidth", "remote",
^~~~~~~~~~~~~~~~~~
src/intel_rdt.c:339:51: note: expected ‘char *’ but argument is of type ‘const char *’
static void rdt_submit_derive(char *cgroup, char *type, char *type_instance,
~~~~~~^~~~
src/intel_rdt.c:409:59: warning: passing argument 3 of ‘rdt_submit_derive’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
rdt_submit_derive(cgroup->desc, "memory_bandwidth", "remote",
^~~~~~~~
src/intel_rdt.c:339:63: note: expected ‘char *’ but argument is of type ‘const char *’
static void rdt_submit_derive(char *cgroup, char *type, char *type_instance,
~~~~~~^~~~~~~~~~~~~
Ruben Kerkhof [Sun, 3 Jun 2018 22:09:07 +0000 (00:09 +0200)]
ceph plugin: fix a few format specifiers
CC src/ceph_la-ceph.lo
In file included from ./src/daemon/common.h:33,
from src/ceph.c:31:
src/ceph.c: In function ‘cconn_handle_event’:
src/ceph.c:1161:11: warning: format ‘%d’ expects argument of type ‘int’, but argument 6 has type ‘ssize_t’ {aka ‘long int’} [-Wformat=]
DEBUG("ceph plugin: cconn_handle_event(name=%s,state=%d,amt=%d,ret=%d)",
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
io->d->name, io->state, io->amt, ret);
~~~
./src/daemon/plugin.h:396:42: note: in definition of macro ‘DEBUG’
#define DEBUG(...) plugin_log(LOG_DEBUG, __VA_ARGS__)
^~~~~~~~~~~
src/ceph.c:1183:11: warning: format ‘%d’ expects argument of type ‘int’, but argument 5 has type ‘ssize_t’ {aka ‘long int’} [-Wformat=]
DEBUG("ceph plugin: cconn_handle_event(name=%s,state=%d,ret=%d)",
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
io->d->name, io->state, ret);
~~~
./src/daemon/plugin.h:396:42: note: in definition of macro ‘DEBUG’
#define DEBUG(...) plugin_log(LOG_DEBUG, __VA_ARGS__)
^~~~~~~~~~~
src/ceph.c:1209:11: warning: format ‘%d’ expects argument of type ‘int’, but argument 5 has type ‘ssize_t’ {aka ‘long int’} [-Wformat=]
DEBUG("ceph plugin: cconn_handle_event(name=%s,state=%d,ret=%d)",
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
io->d->name, io->state, ret);
~~~
./src/daemon/plugin.h:396:42: note: in definition of macro ‘DEBUG’
#define DEBUG(...) plugin_log(LOG_DEBUG, __VA_ARGS__)
^~~~~~~~~~~
src/ceph.c:1230:11: warning: format ‘%d’ expects argument of type ‘int’, but argument 5 has type ‘ssize_t’ {aka ‘long int’} [-Wformat=]
DEBUG("ceph plugin: cconn_handle_event(name=%s,state=%d,ret=%d)",
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
io->d->name, io->state, ret);
~~~
./src/daemon/plugin.h:396:42: note: in definition of macro ‘DEBUG’
#define DEBUG(...) plugin_log(LOG_DEBUG, __VA_ARGS__)
^~~~~~~~~~~
Ruben Kerkhof [Fri, 1 Jun 2018 18:15:39 +0000 (20:15 +0200)]
snmp_agent plugin: fix a few conversion warnings
Ruben Kerkhof [Fri, 1 Jun 2018 18:12:02 +0000 (20:12 +0200)]
memcached plugin: fix implicit conversion warning
CC src/memcached.lo
src/memcached.c:478:20: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
int name_len = strlen(fields[1]);
~~~~~~~~ ^~~~~~~~~~~~~~~~~
1 warning generated.
Ruben Kerkhof [Fri, 1 Jun 2018 18:10:52 +0000 (20:10 +0200)]
java plugin: fix implicit conversion warning
src/java.c:1014:20: warning: implicit conversion loses integer precision: 'const size_t' (aka 'const unsigned long') to 'int' [-Wshorten-64-to-32]
values_num = ds->ds_num;
~ ~~~~^~~~~~
1 warning generated.
Ruben Kerkhof [Fri, 1 Jun 2018 18:10:09 +0000 (20:10 +0200)]
iptables plugin: fix implicit conversion warnings
CC src/iptables_la-iptables.lo
src/iptables.c:139:29: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
table_len = strlen(table) + 1;
~ ~~~~~~~~~~~~~~^~~
src/iptables.c:147:29: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
chain_len = strlen(chain) + 1;
~ ~~~~~~~~~~~~~~^~~
2 warnings generated.
Ruben Kerkhof [Fri, 1 Jun 2018 18:09:16 +0000 (20:09 +0200)]
email plugin: fix implicit conversion warning
src/email.c:275:13: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
len = strlen(line);
~ ^~~~~~~~~~~~
Ruben Kerkhof [Fri, 1 Jun 2018 18:07:21 +0000 (20:07 +0200)]
ceph plugin: fix implicit conversion warnings
CC src/ceph_la-ceph.lo
src/ceph.c:1160:14: warning: implicit conversion loses integer precision: 'ssize_t' (aka 'long') to 'int' [-Wshorten-64-to-32]
ret, write(io->asok, ((char *)&cmd) + io->amt, cmd_len - io->amt));
~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ceph.c:67:11: note: expanded from macro 'RETRY_ON_EINTR'
ret = expr; \
~ ^~~~
src/ceph.c:1181:25: warning: implicit conversion loses integer precision: 'ssize_t' (aka 'long') to 'int' [-Wshorten-64-to-32]
RETRY_ON_EINTR(ret, read(io->asok, ((char *)(&io->d->version)) + io->amt,
~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ceph.c:67:11: note: expanded from macro 'RETRY_ON_EINTR'
ret = expr; \
~ ^~~~
src/ceph.c:1207:25: warning: implicit conversion loses integer precision: 'ssize_t' (aka 'long') to 'int' [-Wshorten-64-to-32]
RETRY_ON_EINTR(ret, read(io->asok, ((char *)(&io->json_len)) + io->amt,
~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ceph.c:67:11: note: expanded from macro 'RETRY_ON_EINTR'
ret = expr; \
~ ^~~~
src/ceph.c:1229:20: warning: implicit conversion loses integer precision: 'ssize_t' (aka 'long') to 'int' [-Wshorten-64-to-32]
read(io->asok, io->json + io->amt, io->json_len - io->amt));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ceph.c:67:11: note: expanded from macro 'RETRY_ON_EINTR'
ret = expr; \
~ ^~~~
src/ceph.c:1299:29: warning: implicit conversion loses integer precision: 'long' to 'int' [-Wshorten-64-to-32]
int sec_diff = t1->tv_sec - t2->tv_sec;
~~~~~~~~ ~~~~~~~~~~~^~~~~~~~~~~~
src/ceph.c:1300:31: warning: implicit conversion loses integer precision: 'long' to 'int' [-Wshorten-64-to-32]
int usec_diff = t1->tv_usec - t2->tv_usec;
~~~~~~~~~ ~~~~~~~~~~~~^~~~~~~~~~~~~
6 warnings generated.
CCLD ceph.la
Ruben Kerkhof [Fri, 1 Jun 2018 17:15:46 +0000 (19:15 +0200)]
df plugin: fix implicit conversion warning
CC src/df.lo
src/df.c:231:15: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
len = strlen(disk_name);
~ ^~~~~~~~~~~~~~~~~
1 warning generated.
Ruben Kerkhof [Fri, 1 Jun 2018 17:06:34 +0000 (19:06 +0200)]
parser.y: minor cleanup
Ruben Kerkhof [Fri, 1 Jun 2018 17:02:06 +0000 (19:02 +0200)]
parser.y: fix implicit conversion warning
CC src/liboconfig/liboconfig_la-parser.lo
src/liboconfig/parser.y:273:8: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
len = strlen (ret);
~ ^~~~~~~~~~~~
1 warning generated.
Ruben Kerkhof [Fri, 1 Jun 2018 12:43:49 +0000 (14:43 +0200)]
csv plugin: fix implicit conversion warning
src/csv.c:193:17: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
int len = strlen(datadir);
~~~ ^~~~~~~~~~~~~~~
Ruben Kerkhof [Fri, 1 Jun 2018 12:29:51 +0000 (14:29 +0200)]
mysql plugin: fix implicit conversion warning
CC src/mysql_la-mysql.lo
src/mysql.c:366:19: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
int query_len = strlen(query);
~~~~~~~~~ ^~~~~~~~~~~~~
1 warning generated.
Ruben Kerkhof [Thu, 31 May 2018 15:14:44 +0000 (17:14 +0200)]
tcpconns plugin: fix implicit conversion warnings
CC src/tcpconns.lo
src/tcpconns.c:510:14: warning: implicit conversion loses integer precision: 'ssize_t' (aka 'long') to 'int' [-Wshorten-64-to-32]
status = recvmsg(fd, (void *)&msg, /* flags = */ 0);
~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/tcpconns.c:577:20: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
int buffer_len = strlen(buffer);
~~~~~~~~~~ ^~~~~~~~~~~~~~
2 warnings generated.
Ruben Kerkhof [Thu, 31 May 2018 14:52:35 +0000 (16:52 +0200)]
unixsock plugin: fix implicit conversion warning
CC src/unixsock.lo
src/unixsock.c:225:11: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
len = strlen(buffer);
~ ^~~~~~~~~~~~~~
1 warning generated.
Ruben Kerkhof [Thu, 31 May 2018 14:51:34 +0000 (16:51 +0200)]
uuid plugin: fix implicit conversion warning
CC src/uuid.lo
src/uuid.c:50:9: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
len = strlen(uuid);
~ ^~~~~~~~~~~~
1 warning generated.
Ruben Kerkhof [Thu, 31 May 2018 14:47:05 +0000 (16:47 +0200)]
scanner.l: modernize code a bit
Ruben Kerkhof [Thu, 31 May 2018 14:43:09 +0000 (16:43 +0200)]
scanner.l: use size_t for 2 variables
Ruben Kerkhof [Thu, 31 May 2018 14:40:08 +0000 (16:40 +0200)]
scanner.l: fix a few implicit conversion warnings
LEX src/liboconfig/scanner.c
CC src/liboconfig/liboconfig_la-scanner.lo
src/liboconfig/scanner.l:113:12: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
int len = strlen (yytext);
~~~ ^~~~~~~~~~~~~~~
src/liboconfig/scanner.l:129:12: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
int len = strlen (yytext);
~~~ ^~~~~~~~~~~~~~~
Ruben Kerkhof [Thu, 31 May 2018 14:35:38 +0000 (16:35 +0200)]
virt plugin: fix implicit conversion warning
src/virt.c:2656:41: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
n = strlen(domname) + strlen(devpath) + 2;
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
Ruben Kerkhof [Thu, 31 May 2018 14:08:55 +0000 (16:08 +0200)]
wireless plugin: fix implicit conversion warning
CC src/wireless.lo
src/wireless.c:106:29: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
len = strlen(fields[0]) - 1;
~ ~~~~~~~~~~~~~~~~~~^~~
1 warning generated.
Ruben Kerkhof [Thu, 31 May 2018 14:01:41 +0000 (16:01 +0200)]
Remove unused asubst function
Ruben Kerkhof [Thu, 31 May 2018 13:38:08 +0000 (15:38 +0200)]
utils_time.c: fix implicit conversion warning
CC src/daemon/collectd-utils_time.o
src/daemon/utils_time.c:153:14: warning: implicit conversion loses integer precision: 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32]
if ((len = strftime(pos, size_left, "%Y-%m-%dT%H:%M:%S", t_tm)) == 0)
~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
Ruben Kerkhof [Thu, 31 May 2018 13:29:08 +0000 (15:29 +0200)]
write_sensu plugin: fix implicit conversion
CC src/write_sensu.lo
src/write_sensu.c:312:13: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
int len = strlen(orig_name);
~~~ ^~~~~~~~~~~~~~~~~
1 warning generated.
Ruben Kerkhof [Thu, 31 May 2018 13:21:00 +0000 (15:21 +0200)]
utils_mount.c: fix implicit conversion
CC src/utils_mount.lo
src/utils_mount.c:710:7: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
l = strlen(keyword);
~ ^~~~~~~~~~~~~~~
1 warning generated.
Ruben Kerkhof [Thu, 31 May 2018 13:13:11 +0000 (15:13 +0200)]
dpdk: Ansify function prototype
Ruben Kerkhof [Thu, 31 May 2018 11:04:09 +0000 (13:04 +0200)]
Fix out of tree builds
Fixes #2653
Ruben Kerkhof [Thu, 31 May 2018 10:31:32 +0000 (12:31 +0200)]
collectd.c: modernize code a bit
Ruben Kerkhof [Thu, 31 May 2018 10:09:00 +0000 (12:09 +0200)]
Merge pull request #2802 from ajssmith/amqp1_dev2_branch
Fix potential memory leaks found via scan-build
Andrew Smith [Wed, 30 May 2018 16:59:48 +0000 (12:59 -0400)]
Fix potential memory leaks found in ci scan
Ruben Kerkhof [Wed, 30 May 2018 13:08:15 +0000 (15:08 +0200)]
ceph plugin: fix scan-build warnings
src/ceph.c:284:8: warning: Null pointer argument in call to string comparison function
(strcmp("filestore", state->stack[state->depth - 2]) == 0) &&
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/x86_64-linux-gnu/bits/string2.h:817:8: note: expanded from macro 'strcmp'
: __builtin_strcmp (s1, s2)))); })
^~~~~~~~~~~~~~~~~~~~~~~~~
src/ceph.c:285:8: warning: Null pointer argument in call to string comparison function
(strcmp("journal_wr_bytes", state->stack[state->depth - 1]) == 0) &&
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/x86_64-linux-gnu/bits/string2.h:817:8: note: expanded from macro 'strcmp'
: __builtin_strcmp (s1, s2)))); })
^~~~~~~~~~~~~~~~~~~~~~~~~
2 warnings generated.
Pavel Rochnyak [Wed, 30 May 2018 12:59:32 +0000 (19:59 +0700)]
Merge pull request #2796 from elfiesmelfie/feat_ipmi_SEL_ignore_list
ipmi plugin: Add SELSensor and SELIgnoreSelected config options.
Ruben Kerkhof [Wed, 30 May 2018 10:40:32 +0000 (12:40 +0200)]
Merge pull request #2801 from elfiesmelfie/fix_ovs_clang
utils_ovs: Avoid potential access of freed memory
Ruben Kerkhof [Tue, 29 May 2018 16:22:01 +0000 (18:22 +0200)]
intel_rdt: fix format specifier
Fixes build on F-26:
src/intel_rdt.c: In function 'rdt_dump_cgroups':
src/intel_rdt.c:34:20: error: format '%d' expects argument of type 'int', but argument 3 has type 'size_t {aka long unsigned int}' [-Werror=format=]
#define RDT_PLUGIN "intel_rdt"
^
./src/daemon/plugin.h:396:42: note: in definition of macro 'DEBUG'
#define DEBUG(...) plugin_log(LOG_DEBUG, __VA_ARGS__)
^~~~~~~~~~~
src/intel_rdt.c:79:11: note: in expansion of macro 'RDT_PLUGIN'
DEBUG(RDT_PLUGIN ": group[%d]:", i);
^~~~~~~~~~
src/intel_rdt.c:79:33: note: format string is defined here
DEBUG(RDT_PLUGIN ": group[%d]:", i);
~^
%ld
Ruben Kerkhof [Tue, 29 May 2018 14:36:44 +0000 (16:36 +0200)]
intel_rdt: fix a bunch of warnings
CC src/intel_rdt_la-intel_rdt.lo
src/intel_rdt.c: In function ‘rdt_is_core_id_valid’:
src/intel_rdt.c:163:21: warning: comparison of integer expressions of different signedness: ‘int’ and ‘unsigned int’ [-Wsign-compare]
for (int i = 0; i < g_rdt->pqos_cpu->num_cores; i++)
^
src/intel_rdt.c:164:17: warning: comparison of integer expressions of different signedness: ‘int’ and ‘unsigned int’ [-Wsign-compare]
if (core_id == g_rdt->pqos_cpu->cores[i].lcore)
^~
src/intel_rdt.c: In function ‘rdt_config_cgroups’:
src/intel_rdt.c:208:21: warning: comparison of integer expressions of different signedness: ‘int’ and ‘unsigned int’ [-Wsign-compare]
for (int i = 0; i < g_rdt->cap_mon->u.mon->num_events; i++)
^
src/intel_rdt.c: In function ‘rdt_read’:
src/intel_rdt.c:389:21: warning: comparison of integer expressions of different signedness: ‘int’ and ‘size_t’ {aka ‘long unsigned int’} [-Wsign-compare]
for (int i = 0; i < g_rdt->num_groups; i++) {
^
src/intel_rdt.c: In function ‘rdt_init’:
src/intel_rdt.c:428:21: warning: comparison of integer expressions of different signedness: ‘int’ and ‘size_t’ {aka ‘long unsigned int’} [-Wsign-compare]
for (int i = 0; i < g_rdt->num_groups; i++) {
^
src/intel_rdt.c: In function ‘rdt_shutdown’:
src/intel_rdt.c:451:21: warning: comparison of integer expressions of different signedness: ‘int’ and ‘size_t’ {aka ‘long unsigned int’} [-Wsign-compare]
for (int i = 0; i < g_rdt->num_groups; i++) {
^
CC src/intel_rdt_la-utils_config_cores.lo
src/utils_config_cores.c: In function ‘check_core_grouping’:
src/utils_config_cores.c:166:23: warning: comparison of integer expressions of different signedness: ‘long int’ and ‘size_t’ {aka ‘long unsigned int’} [-Wsign-compare]
if ((end - start) >= out_size) {
^~
CCLD intel_rdt.la
Ruben Kerkhof [Tue, 29 May 2018 13:57:00 +0000 (15:57 +0200)]
virt plugin: fix a few sign compare warnings
CC src/virt_la-virt.lo
src/virt.c: In function ‘domain_state_submit_notif’:
src/virt.c:1019:29: warning: comparison of integer expressions of different signedness: ‘int’ and ‘long unsigned int’ [-Wsign-compare]
if ((state < 0) || (state >= STATIC_ARRAY_SIZE(domain_states))) {
^~
src/virt.c:1027:31: warning: comparison of integer expressions of different signedness: ‘int’ and ‘long unsigned int’ [-Wsign-compare]
if ((reason < 0) || (reason >= STATIC_ARRAY_SIZE(domain_reasons[0]))) {
^~
src/virt.c: In function ‘fs_info_notify’:
src/virt.c:1612:21: warning: comparison of integer expressions of different signedness: ‘int’ and ‘size_t’ {aka ‘long unsigned int’} [-Wsign-compare]
for (int i = 0; i < fs_info->ndevAlias; ++i) {
^
src/virt.c:1587:25: warning: comparison of integer expressions of different signedness: ‘int’ and ‘long unsigned int’ [-Wsign-compare]
for (int _i = 0; _i < _size; ++_i) { \
^
src/virt.c:1619:3: note: in expansion of macro ‘NM_ADD_STR_ITEMS’
NM_ADD_STR_ITEMS(fs_str_items, STATIC_ARRAY_SIZE(fs_str_items));
^~~~~~~~~~~~~~~~
src/virt.c:1587:25: warning: comparison of integer expressions of different signedness: ‘int’ and ‘size_t’ {aka ‘long unsigned int’} [-Wsign-compare]
for (int _i = 0; _i < _size; ++_i) { \
^
src/virt.c:1622:3: note: in expansion of macro ‘NM_ADD_STR_ITEMS’
NM_ADD_STR_ITEMS(fs_dev_alias, fs_info->ndevAlias);
^~~~~~~~~~~~~~~~
CCLD virt.la
Ciara Loftus [Tue, 29 May 2018 13:46:31 +0000 (14:46 +0100)]
utils_ovs: Avoid potential access of freed memory
Fixes #2800
Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
Ruben Kerkhof [Tue, 29 May 2018 09:29:52 +0000 (11:29 +0200)]
dpdkevents plugin: fix sign compare warnings
src/dpdkevents.c: In function ‘dpdk_helper_link_status_get’:
src/dpdkevents.c:431:21: warning: comparison of integer expressions of different signedness: ‘int’ and ‘uint32_t’ {aka ‘unsigned int’} [-Wsign-compare]
for (int i = 0; i < ec->nb_ports; i++) {
^
src/dpdkevents.c: In function ‘dpdk_events_link_status_dispatch’:
src/dpdkevents.c:500:21: warning: comparison of integer expressions of different signedness: ‘int’ and ‘uint32_t’ {aka ‘unsigned int’} [-Wsign-compare]
for (int i = 0; i < ec->nb_ports; i++) {
^
Ruben Kerkhof [Tue, 29 May 2018 09:25:10 +0000 (11:25 +0200)]
ipmi plugin: fix sign compare warning
CC src/ipmi_la-ipmi.lo
src/ipmi.c: In function ‘sensor_unit_to_type’:
src/ipmi.c:360:21: warning: comparison of integer expressions of different signedness: ‘int’ and ‘long unsigned int’ [-Wsign-compare]
for (int i = 0; i < STATIC_ARRAY_SIZE(ipmi_db_type_map); i++)
^
Ruben Kerkhof [Tue, 29 May 2018 09:23:25 +0000 (11:23 +0200)]
amqp1 plugin: fix sign compare warning
CC src/amqp1_la-amqp1.lo
src/amqp1.c: In function ‘amqp1_send_out_messages’:
src/amqp1.c:138:29: warning: comparison of integer expressions of different signedness: ‘size_t’ {aka ‘long unsigned int’} and ‘int’ [-Wsign-compare]
if (DEQ_SIZE(to_send) == link_credit)
^~
Ruben Kerkhof [Tue, 29 May 2018 08:37:18 +0000 (10:37 +0200)]
turbostat plugin: free the right variable
scan-build: Using '/usr/bin/clang-6.0' for static analysis
make all-am
make[1]: Entering directory '/home/ruben/src/collectd'
CC src/turbostat.lo
src/turbostat.c:1292:5: warning: Argument to free() is the address of the global variable 'thread_delta', which is not memory allocated by malloc()
sfree(threads);
^~~~~~~~~~~~~~
./src/daemon/common.h:41:5: note: expanded from macro 'sfree'
free(ptr); \
^~~~~~~~~
src/turbostat.c:1299:5: warning: Argument to free() is the address of the global variable 'core_delta', which is not memory allocated by malloc()
sfree(cores);
^~~~~~~~~~~~
./src/daemon/common.h:41:5: note: expanded from macro 'sfree'
free(ptr); \
^~~~~~~~~
2 warnings generated.
CCLD turbostat.la
Ruben Kerkhof [Tue, 29 May 2018 08:29:14 +0000 (10:29 +0200)]
snmp plugin: fix scan-build warning
CC src/snmp_la-snmp.lo
src/snmp.c:592:5: warning: Value stored to 'status' is never read
status = 0;
^ ~
1 warning generated.
Pavel Rochnyack [Mon, 28 May 2018 14:03:02 +0000 (21:03 +0700)]
redis plugin: fix issue found by master aggregation tests
Pavel Rochnyack [Mon, 28 May 2018 14:00:04 +0000 (21:00 +0700)]
redis plugin: fix issue found by master aggregation tests
Pavel Rochnyack [Mon, 28 May 2018 11:52:27 +0000 (18:52 +0700)]
redis plugin: polished a bit
skob [Mon, 28 May 2018 11:47:48 +0000 (14:47 +0300)]
redis plugin: [new feature] ability to select database for query
Closes: #2790
Pavel Rochnyak [Sat, 26 May 2018 17:09:29 +0000 (00:09 +0700)]
Merge pull request #1705 from rpv-tomsk/oracle-memleak-fix
dbi/postgresql/oracle plugins: Fixes and improvements.
Ruben Kerkhof [Sat, 26 May 2018 15:12:41 +0000 (17:12 +0200)]
statsd plugin: Comparison is always true because status <= -1
Found by https://lgtm.com
Ruben Kerkhof [Thu, 24 May 2018 18:24:28 +0000 (20:24 +0200)]
Merge pull request #2797 from rubenk/amqp-cleanups
Amqp1 cleanups
Pavel Rochnyack [Thu, 24 May 2018 14:27:59 +0000 (21:27 +0700)]
Merge pull request #2729 from cekstam/add-scale-and-shift-to-modbus
Pavel Rochnyack [Thu, 24 May 2018 14:24:41 +0000 (21:24 +0700)]
modbus: polished code style
Pavel Rochnyak [Thu, 24 May 2018 14:13:10 +0000 (21:13 +0700)]
Merge pull request #2670 from antvick/feature/modbus_64bit
modbus: Add support for 64 bit vals and update docs
Ruben Kerkhof [Thu, 24 May 2018 12:03:02 +0000 (14:03 +0200)]
virt plugin: set bool to false, not 0
Ruben Kerkhof [Thu, 24 May 2018 11:59:18 +0000 (13:59 +0200)]
virt plugin: take mutex when setting member
Purely cosmetic here, but this should fix CID 185977.
Ruben Kerkhof [Thu, 24 May 2018 11:55:12 +0000 (13:55 +0200)]
amqp1 plugin: remove unneccesary cast
Ruben Kerkhof [Thu, 24 May 2018 11:47:59 +0000 (13:47 +0200)]
amqp1: clean it up a little
A few things changed during the time this plugin was pending review.
Update the code to adhere to these changes.
Ruben Kerkhof [Thu, 24 May 2018 11:27:51 +0000 (13:27 +0200)]
amqp1 plugin: use bool for boolean variable
event_thread_running is only ever 0 or 1 so use a bool
Ruben Kerkhof [Thu, 24 May 2018 11:26:16 +0000 (13:26 +0200)]
amqp1 plugin: no need to initialize statics
Ruben Kerkhof [Thu, 24 May 2018 09:06:55 +0000 (11:06 +0200)]
Merge pull request #2618 from ajssmith/amqp1_dev1_branch
Write amqp1 plugin
Pavel Rochnyack [Thu, 24 May 2018 05:35:43 +0000 (12:35 +0700)]
clang-format
Pavel Rochnyack [Wed, 11 May 2016 21:37:02 +0000 (03:37 +0600)]
utils_db_query: Removed excessive calls of udb_result_finish_result() and udb_query_finish_result().
Pavel Rochnyack [Wed, 11 May 2016 21:31:42 +0000 (03:31 +0600)]
utils_db_query: Added lost free().
Pavel Rochnyack [Wed, 11 May 2016 21:23:01 +0000 (03:23 +0600)]
plugin dbi: Added lost check for udb_query_prepare_result() return value.
Pavel Rochnyack [Wed, 11 May 2016 20:04:32 +0000 (02:04 +0600)]
oracle plugin: Add lost udb_query_finish_result().
Pavel Rochnyack [Wed, 23 May 2018 14:25:14 +0000 (21:25 +0700)]
Merge branch 'collectd-5.8' into master
Ruben Kerkhof [Wed, 23 May 2018 13:41:25 +0000 (15:41 +0200)]
processes plugin: fix build warning
src/processes.c:999:24: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare]
tpid) >= sizeof(filename)) {
~~~~~ ^ ~~~~~~~~~~~~~~~~
Ruben Kerkhof [Wed, 23 May 2018 13:39:23 +0000 (15:39 +0200)]
table plugin: fix build warning
src/table.c:399:11: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare]
if (r >= sizeof(vl.type_instance))
~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
Ruben Kerkhof [Wed, 23 May 2018 13:38:26 +0000 (15:38 +0200)]
netlink plugin: fix build warnings
src/netlink.c:546:13: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare]
if (r >= sizeof(type_instance)) {
~ ^ ~~~~~~~~~~~~~~~~~~~~~
src/netlink.c:585:13: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare]
if (r >= sizeof(type_instance)) {
~ ^ ~~~~~~~~~~~~~~~~~~~~~
collectd bot [Wed, 23 May 2018 11:10:03 +0000 (13:10 +0200)]
Auto-Merge pull request #2793 from rpv-tomsk/fix-5.8
Automatically merged due to "Automerge" label
Dagobert Michelsen [Wed, 21 Mar 2018 20:22:45 +0000 (21:22 +0100)]
Include kstat.h when available
Ruben Kerkhof [Wed, 16 May 2018 11:24:55 +0000 (13:24 +0200)]
Fix make distcheck on Mac OS
CC src/libcollectdclient/libcollectdclient_la-network_parse.lo
../../src/libcollectdclient/network_parse.c:49:10: fatal error: 'stdendian.h' file not found
^~~~~~~~~~~~~
1 error generated.
Fixes #2608
collectd bot [Wed, 23 May 2018 09:15:47 +0000 (11:15 +0200)]
Auto-Merge pull request #2792 from rpv-tomsk/fix-5.8
Automatically merged due to "Automerge" label
Pavel Rochnyack [Sun, 20 May 2018 16:24:25 +0000 (23:24 +0700)]
Added missing include of "collectd.h"
This adressed to solve compilation issue on Solaris platform:
./src/config.h:1526:0: error: "_FILE_OFFSET_BITS" redefined [-Werror]
Dagobert Michelsen [Thu, 3 May 2018 10:42:28 +0000 (12:42 +0200)]
Add endianness checks for AIX
collectd bot [Mon, 21 May 2018 06:32:58 +0000 (08:32 +0200)]
Auto-Merge pull request #2788 from rpv-tomsk/fix-5.8
Automatically merged due to "Automerge" label
Dagobert Michelsen [Thu, 5 Apr 2018 08:49:30 +0000 (10:49 +0200)]
Fix gcc issue on Mac byteorder
Dagobert Michelsen [Wed, 4 Apr 2018 12:34:15 +0000 (14:34 +0200)]
Fix conditional on byteorder to work on Solaris
Dagobert Michelsen [Wed, 21 Mar 2018 21:23:07 +0000 (22:23 +0100)]
Keep clang-format happy