Florian Forster [Sun, 14 May 2017 06:24:51 +0000 (08:24 +0200)]
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.
Ruben Kerkhof [Sat, 13 May 2017 12:41:48 +0000 (14:41 +0200)]
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.
Pshyk, SerhiyX [Fri, 12 May 2017 11:39:16 +0000 (12:39 +0100)]
intel_pmu: formatting by clang-format
Signed-off-by: Serhiy Pshyk <serhiyx.pshyk@intel.com>
Pshyk, SerhiyX [Wed, 10 May 2017 12:29:05 +0000 (13:29 +0100)]
intel_pmu: Implement performance monitoring plugin
The intel_pmu plugin collects information about system performance
counters using kernel Linux perf interface.
Signed-off-by: Serhiy Pshyk <serhiyx.pshyk@intel.com>
Florian Forster [Fri, 12 May 2017 13:19:43 +0000 (15:19 +0200)]
Merge branch 'collectd-5.7'
Florian Forster [Fri, 12 May 2017 13:17:13 +0000 (15:17 +0200)]
Merge pull request #2275 from octo/ff/prometheus
write_prometheus plugin: Fix incorrect use of realloc().
Florian Forster [Fri, 12 May 2017 13:16:50 +0000 (15:16 +0200)]
Merge pull request #2274 from octo/ff/putval
src/utils_cmd_putval.c: Fix multi-value PUTVAL.
Florian Forster [Fri, 12 May 2017 10:08:55 +0000 (12:08 +0200)]
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[].
Florian Forster [Fri, 12 May 2017 11:05:37 +0000 (13:05 +0200)]
write_prometheus plugin: Fix incorrect use of realloc().
Calling realloc(ptr, 0) is undefined. Call free() explicitly.
Florian Forster [Fri, 12 May 2017 06:05:47 +0000 (08:05 +0200)]
configure.ac: Remove empty else-block from AC_CHECK_LIB.
Fixes: #2272
Florian Forster [Fri, 12 May 2017 09:18:52 +0000 (11:18 +0200)]
Merge branch 'collectd-5.7'
Florian Forster [Fri, 12 May 2017 09:16:43 +0000 (11:16 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7
Florian Forster [Sun, 7 May 2017 18:34:09 +0000 (20:34 +0200)]
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
Ed Ravin [Sat, 6 May 2017 02:53:59 +0000 (22:53 -0400)]
fix BIND timezone parsing issue
Florian Forster [Sun, 7 May 2017 10:06:47 +0000 (12:06 +0200)]
collectd.conf(5): Add section documenting the ignorelist functionality.
Fixes: #2267
Florian Forster [Sat, 6 May 2017 05:51:37 +0000 (07:51 +0200)]
Merge pull request #2265 from velotraveler/master
fix BIND timezone parsing issue
Ed Ravin [Sat, 6 May 2017 02:53:59 +0000 (22:53 -0400)]
fix BIND timezone parsing issue
Florian Forster [Fri, 5 May 2017 13:34:58 +0000 (15:34 +0200)]
libcollectdclient: Include "collectd/types.h" instead of "collectd/client.h".
Florian Forster [Fri, 5 May 2017 13:17:16 +0000 (15:17 +0200)]
libcollectdclient: Use IPV6_JOIN_GROUP instead of IPV6_ADD_MEMBERSHIP.
IPV6_JOIN_GROUP appears to be more portable.
Florian Forster [Fri, 5 May 2017 12:48:21 +0000 (14:48 +0200)]
Merge pull request #2260 from bufadu/evol_redis
redis: adding support for keys count per database
bufadu [Fri, 5 May 2017 12:43:44 +0000 (14:43 +0200)]
redis: fix parser and comments
Florian Forster [Fri, 5 May 2017 12:11:44 +0000 (14:11 +0200)]
libcollectdclient: Include <netinet/in.h>.
We need to include this for a variety of symbols on FreeBSD.
bufadu [Fri, 5 May 2017 10:38:31 +0000 (12:38 +0200)]
redis: fixing maintainer requests
Ruben Kerkhof [Thu, 4 May 2017 12:45:50 +0000 (14:45 +0200)]
systemd.collectd.service: fix a typo
Florian Forster [Thu, 4 May 2017 07:30:25 +0000 (09:30 +0200)]
libcollectdclient: Fix BSD support.
FreeBSD needs <sys/endian.h> instead of <endian.h>.
bufadu [Wed, 3 May 2017 15:42:11 +0000 (17:42 +0200)]
redis: removing sprintf() calls
Tahhan, Maryam [Fri, 14 Apr 2017 11:41:00 +0000 (12:41 +0100)]
mcelog: code review updates
* Comparing variables with NULL explicilty instead of !var
* Removed unnecessary casts
Change-Id: I50a1691c42842c81ff71c2e91a8fb292524dc945
Signed-off-by: Tahhan, Maryam <maryam.tahhan@intel.com>
Tahhan, Maryam [Sun, 26 Feb 2017 13:48:56 +0000 (13:48 +0000)]
mcelog: only send notifications for new errors
Update the mcelog plugin to only distpatch notifications for memory corrected
and uncorrected errors when the value changes for each dimm.
Change-Id: I29ee6b8519e273bd0ef47eed1a0084d3b6d7cef0
Signed-off-by: Tahhan, Maryam <maryam.tahhan@intel.com>
Tahhan, Maryam [Wed, 22 Feb 2017 18:43:56 +0000 (18:43 +0000)]
mcelog: different notifications for memory errors
For mcelog's unix socked data source (default /var/run/mcelog-client), mcelog
plugin generates collectd notifications that merge both corrected and
uncorrected memory error info. This is incorrect behaviour. Separate
notifications should be created for each category and also severity should be
differentiated. This patch fixes this.
Change-Id: Ie9eb1dd6bbc7bbbdd9fc72f1f2e7c395031b3d51
Signed-off-by: Tahhan, Maryam <maryam.tahhan@intel.com>
bufadu [Wed, 3 May 2017 12:49:24 +0000 (14:49 +0200)]
redis: adding support for key count per database
Florian Forster [Wed, 3 May 2017 09:45:42 +0000 (11:45 +0200)]
libcollectdclient: Use GCRY_THREAD_OPTION_PTHREAD_IMPL with older gcrypt versions only.
Copied from src/network.c
Florian Forster [Tue, 2 May 2017 11:14:36 +0000 (13:14 +0200)]
libcollectdclient: Remove TODO.
No, we should not, because memory allocation is more annoying in C.
Florian Forster [Tue, 2 May 2017 09:23:05 +0000 (11:23 +0200)]
libcollectdclient: Improve documentation of lcc_listener_t.conn.
Florian Forster [Tue, 2 May 2017 09:22:23 +0000 (11:22 +0200)]
libcollectdclient: Replace TODOs with (hopefully) useful comments.
Florian Forster [Tue, 2 May 2017 09:21:48 +0000 (11:21 +0200)]
libcollectdclient: Write only metrics with the requested security level.
Florian Forster [Tue, 2 May 2017 09:08:37 +0000 (11:08 +0200)]
libcollectdclient: Add LCC_NETWORK_BUFFER_SIZE.
Florian Forster [Tue, 2 May 2017 08:52:58 +0000 (10:52 +0200)]
libcollectdclient: Add lcc_network_parse_options_t to lcc_listener_t.
This avoids listing the same fields twice.
Florian Forster [Tue, 2 May 2017 08:49:12 +0000 (10:49 +0200)]
libcollectdclient: Introduce a "parser" callback.
This will allow the network plugin to enqueue received network packets and
parse them using a thread pool.
Florian Forster [Tue, 2 May 2017 08:27:49 +0000 (10:27 +0200)]
libcollectdclient: Install the "collectd/types.h" header.
Florian Forster [Tue, 2 May 2017 08:26:40 +0000 (10:26 +0200)]
libcollectdclient: Fix off-by-one error when reading the username.
The allocated buffer includes a null byte, but the network packet doesn't.
That means we were reading one byte too many from the buffer, overwriting
the terminating null byte in the buffer.
Ruben Kerkhof [Wed, 19 Apr 2017 12:34:09 +0000 (14:34 +0200)]
Merge pull request #2255 from clemensg/sensors_support_current
sensors: support current values
Clemens Gruber [Tue, 18 Apr 2017 16:45:22 +0000 (18:45 +0200)]
sensors: support current values
Add support for current sensor data collection.
Signed-off-by: Clemens Gruber <clemensgru@gmail.com>
Ruben Kerkhof [Tue, 18 Apr 2017 14:31:08 +0000 (16:31 +0200)]
Merge pull request #2252 from jaroug/kairosdb_ttl_support
Kairosdb ttl support
jaroug [Tue, 18 Apr 2017 14:28:26 +0000 (16:28 +0200)]
fix spelling
Ruben Kerkhof [Tue, 18 Apr 2017 08:34:18 +0000 (10:34 +0200)]
Merge pull request #2253 from LionelCons/master
data-sets are in fact supported (issues#2244)
jaroug [Tue, 18 Apr 2017 08:11:12 +0000 (10:11 +0200)]
correct spelling
Lionel Cons [Tue, 18 Apr 2017 06:24:45 +0000 (08:24 +0200)]
data-sets are in fact supported (issues#2244)
jaroug [Fri, 14 Apr 2017 15:13:15 +0000 (17:13 +0200)]
replace spaces by tabs
jaroug [Fri, 14 Apr 2017 15:01:57 +0000 (17:01 +0200)]
Add support for the new TTL parameter - kairosdb only
jaroug [Fri, 14 Apr 2017 15:01:25 +0000 (17:01 +0200)]
add documentation on the new TTL parameter
Ruben Kerkhof [Fri, 14 Apr 2017 12:34:20 +0000 (14:34 +0200)]
Merge branch 'collectd-5.7'
Ruben Kerkhof [Fri, 14 Apr 2017 12:32:01 +0000 (14:32 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7
Florian Forster [Thu, 13 Apr 2017 12:19:14 +0000 (14:19 +0200)]
libcollectdclient: Separate module for lcc_network_parse().
Florian Forster [Thu, 13 Apr 2017 07:12:49 +0000 (09:12 +0200)]
libcollectdclient: Implement parsing of signed and encrypted network data.
Florian Forster [Mon, 10 Apr 2017 07:18:48 +0000 (09:18 +0200)]
libcollectdclient: Implement server code.
The implementation is intentionally similar to the Golang implementation.
Security features (signing, encryption) are still missing.
Florian Forster [Thu, 13 Apr 2017 10:06:20 +0000 (12:06 +0200)]
libcollectdclient: Include headers with the "collectd/" path prefix.
Ruben Kerkhof [Tue, 11 Apr 2017 14:57:57 +0000 (16:57 +0200)]
Tree-wide: remove last remnants of sizeof(char)
sizeof(char) is 1 by definition.
Ruben Kerkhof [Mon, 10 Apr 2017 08:27:31 +0000 (10:27 +0200)]
Merge pull request #2168 from maryamtahhan/feat_libvirt_upstream
virt: add support for new metrics
Florian Forster [Mon, 10 Apr 2017 07:28:37 +0000 (09:28 +0200)]
libcollectdclient: Move type definitions into their own header.
The "types.h" header is included by "client.h", so existing code does not
need to be updated.
Saikrishna Arcot [Sun, 9 Apr 2017 15:40:15 +0000 (08:40 -0700)]
Update mongodb write code to use latest API (Fixes: #492) (#2236)
Update mongodb write code to use latest API (Fixes: #492)
Florian Forster [Wed, 5 Apr 2017 09:54:10 +0000 (11:54 +0200)]
Remove utils_ignorelist.[ch] from daemon; link plugins directly.
The collectd daemon isn't using the "ignorelist" functionality itself --
it was only linked in to provide it to loaded plugins. Since the code is
under the GPL, this interfers with our intend of having an MIT licensed
daemon.
This patch changes the build system to link plugins with the ignorelist
directly instead of expecting the symbols to be in the daemon.
Pavel Rochnyack [Mon, 3 Apr 2017 05:57:09 +0000 (11:57 +0600)]
network plugin: Fix endless loop DOS in parse_packet()
When correct 'Signature part' is received by Collectd, configured without
AuthFile option, condition for endless loop occurs due to missing increase
of pointer to next unprocessed part.
This is a forward-port of #2233.
Fixes: CVE-2017-7401
Closes: #2174
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Wed, 29 Mar 2017 15:29:55 +0000 (17:29 +0200)]
Merge pull request #2051 from dsilakov/virt_list_domains
virt plugin: get domains using virConnectListAllDomains
Ruben Kerkhof [Wed, 29 Mar 2017 13:41:39 +0000 (15:41 +0200)]
Merge pull request #1989 from rpv-tomsk/processes
processes plugin: Code cleanup + add per-process open files count
Pavel Rochnyack [Wed, 29 Mar 2017 12:12:59 +0000 (18:12 +0600)]
processes plugin: collect per-process open files count on Linux
Closes: #836
Pavel Rochnyack [Wed, 29 Mar 2017 12:06:06 +0000 (18:06 +0600)]
processes plugin: Update all counters via ps_update_counter()
Fix counting when matched processes are started and terminated often.
Pavel Rochnyack [Wed, 29 Mar 2017 12:04:06 +0000 (18:04 +0600)]
processes plugin: Code cleanup
Ruben Kerkhof [Sun, 26 Mar 2017 13:36:09 +0000 (15:36 +0200)]
Merge pull request #2199 from jaroug/support_attributes_kairosdb
Add support for 'Attribute' option on KAIROSDB output format
Ruben Kerkhof [Sun, 26 Mar 2017 13:33:53 +0000 (15:33 +0200)]
Merge pull request #2223 from maryamtahhan/intel_rdt_core_id_fix
intel_rdt: fix validation of configured core id values
Ruben Kerkhof [Sun, 26 Mar 2017 13:32:41 +0000 (15:32 +0200)]
Merge pull request #2225 from maryamtahhan/dpdstat_portmask_fix
dpdkstat: Enable all ports by default.
Korynkevych, RomanX [Thu, 16 Mar 2017 17:21:31 +0000 (17:21 +0000)]
snmp_agent: generate table OID based on instance as a key in case index is not specfified.
Based on the SNMP rules when table column is represented as a key
of string type, key should be used while generating OID for each row.
When index is not specified, then it's assumed that instance value is
the key for the specified table.
Change-Id: I9f3fbd9aa018bc9037bd3202e2ed107a302fe1b3
Signed-off-by: Korynkevych, RomanX <romanx.korynkevych@intel.com>
Taras Chornyi [Wed, 22 Mar 2017 10:54:31 +0000 (10:54 +0000)]
dpdkstat: Enable all ports by default.
If "EnabledPortMask" option is not set
all DPDK ports will be monitored.
Signed-off-by: Taras Chornyi <tarasx.chornyi@intel.com>
spshykX [Tue, 21 Mar 2017 10:13:55 +0000 (10:13 +0000)]
intel_rdt: fix validation of configured core id values
Change-Id: Ia009635c93e1cecd9852326b01c62fc6d2b090b5
Signed-off-by: Serhiy Pshyk <serhiyx.pshyk@intel.com>
Ruben Kerkhof [Tue, 14 Mar 2017 11:58:12 +0000 (12:58 +0100)]
Merge pull request #2215 from maryamtahhan/dpdkstats_upstream
dpdkstat: doc updated with initialization time notice
Krzysztof Matczak [Sat, 11 Mar 2017 14:59:17 +0000 (14:59 +0000)]
dpdkstat: doc updated with initialization time notice
Change-Id: Ia13c35e4112e74990896edb597d39c1f8ab14b6e
Signed-off-by: Krzysztof Matczak <krzysztofx.matczak@intel.com>
Ruben Kerkhof [Fri, 10 Mar 2017 14:36:09 +0000 (15:36 +0100)]
Merge pull request #2210 from rpv-tomsk/processes-fix-init
processes plugin: Fix broken compilation on AIX
Ruben Kerkhof [Fri, 10 Mar 2017 14:35:35 +0000 (15:35 +0100)]
Merge pull request #2213 from maryamtahhan/ovs_enable_platforms
ovs: enable only supported platforms (#2203)
Mytnyk, VolodymyrX [Tue, 7 Mar 2017 12:30:31 +0000 (12:30 +0000)]
ovs: enable only supported platforms
fixes GitHub issue #2203
Change-Id: I4d19b38b776f6b98fa3e4eb42e11b92dee7f8399
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Ruben Kerkhof [Fri, 10 Mar 2017 13:18:57 +0000 (14:18 +0100)]
Merge pull request #2211 from maryamtahhan/feat_ovs_events_change_defaults
ovs_events: change configuration option defaults
Ruben Kerkhof [Fri, 10 Mar 2017 13:17:58 +0000 (14:17 +0100)]
Merge pull request #2212 from maryamtahhan/ovs_events_scan_build
ovs_events: fixes issue #2205
Przemyslaw Szczerbik [Tue, 13 Dec 2016 10:50:01 +0000 (10:50 +0000)]
virt: add support for new metrics
Add support for new libvirt metrics:
- Performance monitoring events
- Domain state & reason
- Percentage CPU usage
- CPU pinning (affinity)
- Disk errors
- File system info
- Job stats
Change-Id: I233fb18653d218c7e906a157743606c6818f9feb
Signed-off-by: Przemyslaw Szczerbik <przemyslawx.szczerbik@intel.com>
Mytnyk, VolodymyrX [Mon, 6 Mar 2017 16:52:10 +0000 (16:52 +0000)]
ovs_events: fix scan-build warnings #2205
src/utils_ovs.c:366:20: warning: Access to field 'type' results in a dereference of a null pointer (loaded from variable 'jval')
(int)(jval)->type);
^~~~~~~~~~~~
...
Change-Id: Ic856d21f2121f920bdd2043c69620555bb3d1cb8
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Mytnyk, VolodymyrX [Wed, 1 Mar 2017 11:06:45 +0000 (11:06 +0000)]
ovs_events: change configuration option defaults
Right now, the plugin dispatches values by default and doesn't send
any notification messages. The expected behaviour of the event plugin
is to send notification by default. So, changed default value of
SendNotification & DispatchValues options to opposite.
Change-Id: I908799da1b2e75d2089765769ce56af00246c440
Signed-off-by: Mytnyk, VolodymyrX <volodymyrx.mytnyk@intel.com>
Pavel Rochnyack [Thu, 9 Mar 2017 17:57:41 +0000 (23:57 +0600)]
processes plugin: Fix broken compilation on AIX
After a
bb0000acfc57e230fc1c26099bc7acb913680f1a an extra pse.cpu_system
statement was left in the AIX / elif HAVE_PROCINFO_H section, which caused
the compilation to fail.
Fixes: #1981
Ruben Kerkhof [Tue, 7 Mar 2017 11:25:17 +0000 (12:25 +0100)]
Merge pull request #2207 from maryamtahhan/fix_for_2201
ovs_stats: Increase devname buffer
Taras Chornyi [Mon, 6 Mar 2017 16:52:49 +0000 (16:52 +0000)]
Increase devname buffer buffer to ensure that snprintf output
would not be truncated before the last format character
Signed-off-by: Taras Chornyi <tarasx.chornyi@intel.com>
Ruben Kerkhof [Sun, 5 Mar 2017 19:52:26 +0000 (20:52 +0100)]
collectd.spec: move new plugins to subpackages
Ruben Kerkhof [Sun, 5 Mar 2017 18:54:40 +0000 (19:54 +0100)]
collectd.spec: add ovs_stats plugin
Ruben Kerkhof [Sun, 5 Mar 2017 17:43:15 +0000 (18:43 +0100)]
virt plugin: fix build warning
CC src/virt_la-virt.lo
src/virt.c:417:37: warning: comparison of integers of different signs: 'int' and 'unsigned long' [-Wsign-compare]
if ((tag_index < 0) || (tag_index >= STATIC_ARRAY_SIZE(tags))) {
~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
Ruben Kerkhof [Sun, 5 Mar 2017 17:36:02 +0000 (18:36 +0100)]
Merge branch 'collectd-5.7'
Conflicts:
contrib/redhat/collectd.spec
Ruben Kerkhof [Sun, 5 Mar 2017 17:34:37 +0000 (18:34 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7
Conflicts:
contrib/redhat/collectd.spec
Ruben Kerkhof [Sun, 5 Mar 2017 17:30:23 +0000 (18:30 +0100)]
collectd.spec: Don't enable XFS support on RHEL6
It is missing for i386.
If there's strong interest in having support for xfs in the df plugin in
RHEL6 we can do some macro magic to only BuildRequire xfsprogs-devel if
were not on rhel6 i386, but this was the easiest fix and unblocks our
package builds.
Ruben Kerkhof [Sun, 5 Mar 2017 17:25:24 +0000 (18:25 +0100)]
spec: Don't enable XFS support on RHEL6
It is missing for i386.
Ruben Kerkhof [Sun, 5 Mar 2017 17:18:43 +0000 (18:18 +0100)]
Add dpkdevents plugin to spec file
Ruben Kerkhof [Sun, 5 Mar 2017 17:02:30 +0000 (18:02 +0100)]
utils_cmd_flush.c: fix another build warning
src/utils_cmd_flush.c:140:11: warning: declaration shadows a local variable [-Wshadow]
int status;
^
src/utils_cmd_flush.c:114:7: note: previous declaration is here
int status;
^
Ruben Kerkhof [Sun, 5 Mar 2017 16:51:09 +0000 (17:51 +0100)]
utils_cmd_flush.c: fix build warning
CC src/utils_cmd_flush.lo
src/utils_cmd_flush.c:139:12: warning: declaration shadows a local variable [-Wshadow]
char buffer[1024];
^
src/utils_cmd_flush.c:108:47: note: previous declaration is here
cmd_status_t cmd_handle_flush(FILE *fh, char *buffer) {
^
Ruben Kerkhof [Sun, 5 Mar 2017 16:45:54 +0000 (17:45 +0100)]
ovs_stats plugin: fix some more build warnings
CC src/ovs_stats_la-ovs_stats.lo
src/ovs_stats.c:158:8: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
static const iface_counter ovs_stats_counter_name_to_type(const char *counter) {
^~~~~~
src/ovs_stats.c:356:29: warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [-Wsign-compare]
for (int i = 0; i < ports_num; i++)
~ ^ ~~~~~~~~~
src/ovs_stats.c:401:23: warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [-Wsign-compare]
for (int i = 0; i < YAJL_GET_OBJECT(bridges)->len; i++) {
~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ovs_stats.c:415:23: warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [-Wsign-compare]
for (int i = 0; i < YAJL_GET_OBJECT(bridges)->len; i++) {
~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ovs_stats.c:501:23: warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [-Wsign-compare]
for (int i = 0; i < YAJL_GET_OBJECT(ports)->len; i++) {
~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ovs_stats.c:524:23: warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [-Wsign-compare]
for (int i = 0; i < YAJL_GET_OBJECT(ports)->len; i++) {
~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ovs_stats.c:538:23: warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [-Wsign-compare]
for (int i = 0; i < YAJL_GET_ARRAY(stats)->len; i++) {
~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ovs_stats.c:558:23: warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [-Wsign-compare]
for (int i = 0; i < YAJL_GET_ARRAY(ext_ids)->len; i++) {
~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ovs_stats.c:684:23: warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [-Wsign-compare]
for (int i = 0; i < YAJL_GET_OBJECT(ports)->len; i++)
~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
9 warnings generated.
Ruben Kerkhof [Sun, 5 Mar 2017 16:42:28 +0000 (17:42 +0100)]
ovs_stats plugin: fix build warning
src/ovs_stats.c:158:8: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
static const iface_counter ovs_stats_counter_name_to_type(const char *counter) {
^~~~~~
Ruben Kerkhof [Sun, 5 Mar 2017 16:21:11 +0000 (17:21 +0100)]
Merge branch 'collectd-5.7'
Conflicts:
configure.ac
Ruben Kerkhof [Sun, 5 Mar 2017 16:14:53 +0000 (17:14 +0100)]
Merge branch 'collectd-5.6' into collectd-5.7