collectd.git
6 years agocore: Introduced daemon_log() for messages prefixed with plugin name
Pavel Rochnyack [Wed, 20 Jun 2018 03:49:46 +0000 (10:49 +0700)]
core: Introduced daemon_log() for messages prefixed with plugin name

6 years agobind plugin: Switched to use of cf_util_get_boolean() and cf_util_get_string()
Pavel Rochnyack [Sat, 16 Jun 2018 05:10:11 +0000 (12:10 +0700)]
bind plugin: Switched to use of cf_util_get_boolean() and cf_util_get_string()

6 years agoconfigfile.c: Use plugin name from plugin context in error reporting
Pavel Rochnyack [Sat, 16 Jun 2018 05:01:50 +0000 (12:01 +0700)]
configfile.c: Use plugin name from plugin context in error reporting

This commit also removes 'plugin: ' prefix from `plugin_log()`.

6 years agoUpdated codestyle
Pavel Rochnyack [Sat, 16 Jun 2018 04:07:22 +0000 (11:07 +0700)]
Updated codestyle

6 years agosrc/daemon/plugin.[ch]: Add the plugin name to the context.
Florian Forster [Tue, 4 Oct 2016 18:48:17 +0000 (20:48 +0200)]
src/daemon/plugin.[ch]: Add the plugin name to the context.

Issue: #1949

6 years agoredis plugin: Fix memleak
Pavel Rochnyack [Tue, 19 Jun 2018 16:19:34 +0000 (23:19 +0700)]
redis plugin: Fix memleak

6 years agoReset LDFLAGS before testing for strtok_r
Ruben Kerkhof [Tue, 19 Jun 2018 15:15:19 +0000 (17:15 +0200)]
Reset LDFLAGS before testing for strtok_r

They may contain all kinds of things that make the test fail.
See #2823 for details

6 years agoAuto-Merge pull request #2826 from rpv-tomsk/collectd-master
collectd bot [Tue, 19 Jun 2018 11:57:21 +0000 (13:57 +0200)]
Auto-Merge pull request #2826 from rpv-tomsk/collectd-master

Automatically merged due to "Automerge" label

6 years agoMerge pull request #2819 from rpv-tomsk/snmp-fix-2291-1
Pavel Rochnyak [Tue, 19 Jun 2018 10:52:48 +0000 (17:52 +0700)]
Merge pull request #2819 from rpv-tomsk/snmp-fix-2291-1

snmp plugin: HostOID, FilterOID and other options added

6 years agosnmp_agent: Try to fix tests
Pavel Rochnyack [Tue, 19 Jun 2018 08:43:05 +0000 (15:43 +0700)]
snmp_agent: Try to fix tests

This adressed to fix Solaris 10 builds.

Closes: #2814

6 years agosnmp_agent: Try to fix tests
Pavel Rochnyack [Tue, 19 Jun 2018 08:25:06 +0000 (15:25 +0700)]
snmp_agent: Try to fix tests

This adressed to fix Solaris 10 builds.

Closes: #2814

6 years agosnmp_agent: Remove structure initialization
Pavel Rochnyack [Tue, 19 Jun 2018 08:08:54 +0000 (15:08 +0700)]
snmp_agent: Remove structure initialization

This adressed to fix Solaris 10 builds.

Closes: #2814

6 years agoredis plugin: Added option ReportCpuUsage for reported CPU consumption
Pavel Rochnyack [Tue, 19 Jun 2018 04:41:42 +0000 (11:41 +0700)]
redis plugin: Added option ReportCpuUsage for reported CPU consumption

6 years agosnmp_agent: Replace strndup() with internal implementation
Pavel Rochnyack [Tue, 19 Jun 2018 04:11:09 +0000 (11:11 +0700)]
snmp_agent: Replace strndup() with internal implementation

This adressed to fix Solaris 10 builds.

Closes: #2814

6 years agoredis plugin: Simplified commands statistics parser
Pavel Rochnyack [Mon, 18 Jun 2018 14:34:41 +0000 (21:34 +0700)]
redis plugin: Simplified commands statistics parser

6 years agoredis plugin: Added commands statistics reporting
Pavel Rochnyack [Mon, 18 Jun 2018 13:49:29 +0000 (20:49 +0700)]
redis plugin: Added commands statistics reporting

6 years agoredis plugin: report CPU usage
Pavel Rochnyack [Mon, 18 Jun 2018 11:03:51 +0000 (18:03 +0700)]
redis plugin: report CPU usage

6 years agoredis plugin: Reworked to use plugin_register_complex_read()
Pavel Rochnyack [Sun, 17 Jun 2018 13:49:35 +0000 (20:49 +0700)]
redis plugin: Reworked to use plugin_register_complex_read()

6 years agoredis plugin: Implemented persistent connections
Pavel Rochnyack [Sun, 17 Jun 2018 12:37:48 +0000 (19:37 +0700)]
redis plugin: Implemented persistent connections

6 years agowrite_redis plugin: Fixed bug of Timeout option
Pavel Rochnyack [Sun, 17 Jun 2018 12:09:21 +0000 (19:09 +0700)]
write_redis plugin: Fixed bug of Timeout option

Documentation states what Timeout is set in milliseconds.
Code was fixed to match documentation.

6 years agoredis plugin: Report query errors
Pavel Rochnyack [Sun, 17 Jun 2018 10:22:10 +0000 (17:22 +0700)]
redis plugin: Report query errors

6 years agoredis plugin: Update documentation
Pavel Rochnyack [Sun, 17 Jun 2018 10:09:11 +0000 (17:09 +0700)]
redis plugin: Update documentation

6 years agoredis plugin: Change text of some error messages
Pavel Rochnyack [Sun, 17 Jun 2018 10:08:49 +0000 (17:08 +0700)]
redis plugin: Change text of some error messages

6 years agoredis plugin: Check for / report connection errors
Pavel Rochnyack [Sun, 17 Jun 2018 09:10:54 +0000 (16:10 +0700)]
redis plugin: Check for / report connection errors

6 years agoredis plugin: Fixed bug of Timeout option
Pavel Rochnyack [Sun, 17 Jun 2018 08:51:33 +0000 (15:51 +0700)]
redis plugin: Fixed bug of Timeout option

Documentation states what Timeout is set in milliseconds.
Code was fixed to match documentation.

6 years agoAuto-Merge pull request #2825 from rpv-tomsk/collectd-master
collectd bot [Sun, 17 Jun 2018 07:34:05 +0000 (09:34 +0200)]
Auto-Merge pull request #2825 from rpv-tomsk/collectd-master

Automatically merged due to "Automerge" label

6 years agorrdtool plugin: Added more error reporting
Pavel Rochnyack [Sun, 17 Jun 2018 06:30:24 +0000 (13:30 +0700)]
rrdtool plugin: Added more error reporting

Issue: #2823

6 years agoAuto-Merge pull request #2822 from rpv-tomsk/issue-976
collectd bot [Sat, 16 Jun 2018 08:37:32 +0000 (10:37 +0200)]
Auto-Merge pull request #2822 from rpv-tomsk/issue-976

Automatically merged due to "Automerge" label

6 years agontpd plugin: Added new refclock_names
Pavel Rochnyack [Sat, 16 Jun 2018 07:41:46 +0000 (14:41 +0700)]
ntpd plugin: Added new refclock_names

6 years agontpd plugin: Don't treat normal peers as refclocks.
Pavel Rochnyack [Sat, 16 Jun 2018 07:35:18 +0000 (14:35 +0700)]
ntpd plugin: Don't treat normal peers as refclocks.

Don't try to interpret the srcadr field as a refclock
identifier unless it actually is a refclock identifier.
Now Collectd logs all stats for peers rather than skipping
delay for most of them and offset for a few.

Closes: #976

6 years agosnmp plugin: Updated documentation for 'Ignore' option
Pavel Rochnyack [Fri, 15 Jun 2018 11:46:55 +0000 (18:46 +0700)]
snmp plugin: Updated documentation for 'Ignore' option

6 years agosnmp plugin: polished a code
Pavel Rochnyack [Fri, 15 Jun 2018 11:38:33 +0000 (18:38 +0700)]
snmp plugin: polished a code

6 years agosnmp plugin: Removed newly-added 'suffix skipped' notice
Pavel Rochnyack [Fri, 15 Jun 2018 11:11:17 +0000 (18:11 +0700)]
snmp plugin: Removed newly-added 'suffix skipped' notice

6 years agosnmp plugin: FilterOID option implementation
Pavel Rochnyack [Fri, 15 Jun 2018 10:31:07 +0000 (17:31 +0700)]
snmp plugin: FilterOID option implementation

Added new options `FilterOID`, `FilterValues` and `FilterIgnoreSelected`.
These allows to ignore parts of the MIB by its values.

Closes: #2637

6 years agosnmp plugin: HostOID option implementation
Pavel Rochnyack [Fri, 15 Jun 2018 09:35:09 +0000 (16:35 +0700)]
snmp plugin: HostOID option implementation

+ Allow to use `TypeInstanceOID` and `PluginInstanceOID` together.
+ Added `TypeInstancePrefix`, `PluginInstancePrefix` and `HostPrefix` options.
* Option `InstancePrefix` marked as deprecated.
+ Added documentation for new feature.

Closes: #174

6 years agosnmp plugin: Replace reserved chars in hostname value
Pavel Rochnyack [Fri, 15 Jun 2018 05:05:58 +0000 (12:05 +0700)]
snmp plugin: Replace reserved chars in hostname value

6 years agosnmp plugin: added NOTICE when suffix (row of values) is skipped
Pavel Rochnyack [Thu, 14 Jun 2018 15:57:14 +0000 (22:57 +0700)]
snmp plugin: added NOTICE when suffix (row of values) is skipped

6 years agosnmp plugin: Implemented HostnameOID option
Pavel Rochnyack [Thu, 14 Jun 2018 15:25:10 +0000 (22:25 +0700)]
snmp plugin: Implemented HostnameOID option

6 years agosnmp plugin: Refactored filling cells of table
Pavel Rochnyack [Thu, 14 Jun 2018 14:46:01 +0000 (21:46 +0700)]
snmp plugin: Refactored filling cells of table

This also fixes a bug when `Ignore` option was ignored for numeric Instance OIDS.

6 years agosnmp plugin: Rename types and fields to more common names
Pavel Rochnyack [Thu, 14 Jun 2018 14:11:01 +0000 (21:11 +0700)]
snmp plugin: Rename types and fields to more common names

6 years agosnmp plugin: codestyle
Pavel Rochnyack [Thu, 14 Jun 2018 13:56:34 +0000 (20:56 +0700)]
snmp plugin: codestyle

6 years agosnmp plugin: Pass variable to csnmp_instance_list_add()
Pavel Rochnyack [Thu, 14 Jun 2018 13:31:08 +0000 (20:31 +0700)]
snmp plugin: Pass variable to csnmp_instance_list_add()

Instead of scanning `res->variables` use directly-passed variable.

6 years agosnmp plugin: Added types into list of requested snmp OIDS
Pavel Rochnyack [Thu, 14 Jun 2018 13:14:56 +0000 (20:14 +0700)]
snmp plugin: Added types into list of requested snmp OIDS

Issue: #174

6 years agoMerge pull request #2817 from rpv-tomsk/snmp-fix-2291-1
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

6 years agosnmp 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

6 years agodocs: Fix typo
Pavel Rochnyack [Wed, 13 Jun 2018 03:38:23 +0000 (10:38 +0700)]
docs: Fix typo

6 years agosnmp plugin: Allow to set plugin value in reported metrics
Pavel Rochnyack [Tue, 12 Jun 2018 16:07:45 +0000 (23:07 +0700)]
snmp plugin: Allow to set plugin value in reported metrics

6 years agoAuto-Merge pull request #2813 from rpv-tomsk/master
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

6 years agoconfig parser: Improved error reporting on global options
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.

6 years agoperl plugin: Restore missing include of "collectd.h"
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.

6 years agoMerge pull request #2702 from elfiesmelfie/feat_snmp_agent
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

6 years agoSNMP Agent plugin: Fix minor issues
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>
6 years agoMerge pull request #2804 from rubenk/remove-poison
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

6 years agoMerge pull request #2808 from elfiesmelfie/fix_virt_shadow_warning
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

6 years agoSNMP Agent plugin: Fix compability with netsnmp library version < 5.4.5
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>
6 years agoRefactor collectd binary to separate Unix-specific code.
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.

6 years agosrc/virt.c: Fix one -Wshadow type warning
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>
6 years agoSNMP Agent plugin: Fix - not every OID is unregistered from snmp table
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>
6 years agoSNMP Agent plugin: Fix klockwork issues
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>
6 years agoSNMP Agent plugin: Redesign way of registering OIDs
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>
6 years agoSNMP Agent plugin:
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>
6 years agoSNMP Agent plugin: Add multiple key index support
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>
6 years agoSNMP Agent plugin:
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>
6 years agoStop poisoning function in debug mode
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

6 years agoprocesses plugin: const correctness
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},
        ^~~~~~~~~~~~~~~~~

6 years agointel_rdt plugin: const correctness
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,
                                                         ~~~~~~^~~~~~~~~~~~~

6 years agoceph plugin: fix a few format specifiers
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__)
                                          ^~~~~~~~~~~

6 years agosnmp_agent plugin: fix a few conversion warnings
Ruben Kerkhof [Fri, 1 Jun 2018 18:15:39 +0000 (20:15 +0200)]
snmp_agent plugin: fix a few conversion warnings

6 years agomemcached plugin: fix implicit conversion warning
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.

6 years agojava plugin: fix implicit conversion warning
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.

6 years agoiptables plugin: fix implicit conversion warnings
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.

6 years agoemail plugin: fix implicit conversion warning
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);
          ~ ^~~~~~~~~~~~

6 years agoceph plugin: fix implicit conversion warnings
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

6 years agodf plugin: fix implicit conversion warning
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.

6 years agoparser.y: minor cleanup
Ruben Kerkhof [Fri, 1 Jun 2018 17:06:34 +0000 (19:06 +0200)]
parser.y: minor cleanup

6 years agoparser.y: fix implicit conversion warning
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.

6 years agocsv plugin: fix implicit conversion warning
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);
          ~~~   ^~~~~~~~~~~~~~~

6 years agomysql plugin: fix implicit conversion warning
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.

6 years agotcpconns plugin: fix implicit conversion warnings
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.

6 years agounixsock plugin: fix implicit conversion warning
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.

6 years agouuid plugin: fix implicit conversion warning
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.

6 years agoscanner.l: modernize code a bit
Ruben Kerkhof [Thu, 31 May 2018 14:47:05 +0000 (16:47 +0200)]
scanner.l: modernize code a bit

6 years agoscanner.l: use size_t for 2 variables
Ruben Kerkhof [Thu, 31 May 2018 14:43:09 +0000 (16:43 +0200)]
scanner.l: use size_t for 2 variables

6 years agoscanner.l: fix a few implicit conversion warnings
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);
            ~~~   ^~~~~~~~~~~~~~~

6 years agovirt plugin: fix implicit conversion warning
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;
    ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~

6 years agowireless plugin: fix implicit conversion warning
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.

6 years agoRemove unused asubst function
Ruben Kerkhof [Thu, 31 May 2018 14:01:41 +0000 (16:01 +0200)]
Remove unused asubst function

6 years agoutils_time.c: fix implicit conversion warning
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.

6 years agowrite_sensu plugin: fix implicit conversion
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.

6 years agoutils_mount.c: fix implicit conversion
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.

6 years agodpdk: Ansify function prototype
Ruben Kerkhof [Thu, 31 May 2018 13:13:11 +0000 (15:13 +0200)]
dpdk: Ansify function prototype

6 years agoFix out of tree builds
Ruben Kerkhof [Thu, 31 May 2018 11:04:09 +0000 (13:04 +0200)]
Fix out of tree builds

Fixes #2653

6 years agocollectd.c: modernize code a bit
Ruben Kerkhof [Thu, 31 May 2018 10:31:32 +0000 (12:31 +0200)]
collectd.c: modernize code a bit

6 years agoMerge pull request #2802 from ajssmith/amqp1_dev2_branch
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

6 years agoFix potential memory leaks found in ci scan
Andrew Smith [Wed, 30 May 2018 16:59:48 +0000 (12:59 -0400)]
Fix potential memory leaks found in ci scan

6 years agoceph plugin: fix scan-build warnings
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.

6 years agoMerge pull request #2796 from elfiesmelfie/feat_ipmi_SEL_ignore_list
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.

6 years agoMerge pull request #2801 from elfiesmelfie/fix_ovs_clang
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

6 years agointel_rdt: fix format specifier
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

6 years agointel_rdt: fix a bunch of warnings
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