collectd.git
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

6 years agovirt plugin: fix a few sign compare warnings
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

6 years agoutils_ovs: Avoid potential access of freed memory
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>
6 years agodpdkevents plugin: fix sign compare warnings
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++) {
                     ^

6 years agoipmi plugin: fix sign compare warning
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++)
                     ^

6 years agoamqp1 plugin: fix sign compare warning
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)
                             ^~

6 years agoturbostat plugin: free the right variable
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

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

6 years agoredis plugin: fix issue found by master aggregation tests
Pavel Rochnyack [Mon, 28 May 2018 14:03:02 +0000 (21:03 +0700)]
redis plugin: fix issue found by master aggregation tests

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

6 years agoredis plugin: polished a bit
Pavel Rochnyack [Mon, 28 May 2018 11:52:27 +0000 (18:52 +0700)]
redis plugin: polished a bit

6 years agoredis plugin: [new feature] ability to select database for query
skob [Mon, 28 May 2018 11:47:48 +0000 (14:47 +0300)]
redis plugin: [new feature] ability to select database for query

Closes: #2790

6 years agoMerge pull request #1705 from rpv-tomsk/oracle-memleak-fix
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.

6 years agostatsd plugin: Comparison is always true because status <= -1
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

6 years agoMerge pull request #2797 from rubenk/amqp-cleanups
Ruben Kerkhof [Thu, 24 May 2018 18:24:28 +0000 (20:24 +0200)]
Merge pull request #2797 from rubenk/amqp-cleanups

Amqp1 cleanups

6 years agoMerge pull request #2729 from cekstam/add-scale-and-shift-to-modbus
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

6 years agomodbus: polished code style
Pavel Rochnyack [Thu, 24 May 2018 14:24:41 +0000 (21:24 +0700)]
modbus: polished code style

6 years agoMerge pull request #2670 from antvick/feature/modbus_64bit
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

6 years agovirt plugin: set bool to false, not 0
Ruben Kerkhof [Thu, 24 May 2018 12:03:02 +0000 (14:03 +0200)]
virt plugin: set bool to false, not 0

6 years agovirt plugin: take mutex when setting member
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.

6 years agoamqp1 plugin: remove unneccesary cast
Ruben Kerkhof [Thu, 24 May 2018 11:55:12 +0000 (13:55 +0200)]
amqp1 plugin: remove unneccesary cast

6 years agoamqp1: clean it up a little
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.

6 years agoamqp1 plugin: use bool for boolean variable
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

6 years agoamqp1 plugin: no need to initialize statics
Ruben Kerkhof [Thu, 24 May 2018 11:26:16 +0000 (13:26 +0200)]
amqp1 plugin: no need to initialize statics

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

6 years agoclang-format
Pavel Rochnyack [Thu, 24 May 2018 05:35:43 +0000 (12:35 +0700)]
clang-format

6 years agoutils_db_query: Removed excessive calls of udb_result_finish_result() and udb_query_f...
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().

6 years agoutils_db_query: Added lost free().
Pavel Rochnyack [Wed, 11 May 2016 21:31:42 +0000 (03:31 +0600)]
utils_db_query: Added lost free().

6 years agoplugin dbi: Added lost check for udb_query_prepare_result() return value.
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.

6 years agooracle plugin: Add lost udb_query_finish_result().
Pavel Rochnyack [Wed, 11 May 2016 20:04:32 +0000 (02:04 +0600)]
oracle plugin: Add lost udb_query_finish_result().

6 years agoMerge branch 'collectd-5.8' into master
Pavel Rochnyack [Wed, 23 May 2018 14:25:14 +0000 (21:25 +0700)]
Merge branch 'collectd-5.8' into master

6 years agoprocesses plugin: fix build warning
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)) {
                 ~~~~~ ^  ~~~~~~~~~~~~~~~~

6 years agotable plugin: fix build warning
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.

6 years agonetlink plugin: fix build warnings
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)) {
          ~ ^  ~~~~~~~~~~~~~~~~~~~~~

6 years agoAuto-Merge pull request #2793 from rpv-tomsk/fix-5.8
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

6 years agoInclude kstat.h when available
Dagobert Michelsen [Wed, 21 Mar 2018 20:22:45 +0000 (21:22 +0100)]
Include kstat.h when available

6 years agoFix make distcheck on Mac OS
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

6 years agoAuto-Merge pull request #2792 from rpv-tomsk/fix-5.8
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

6 years agoAdded missing include of "collectd.h"
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]

6 years agoAdd endianness checks for AIX
Dagobert Michelsen [Thu, 3 May 2018 10:42:28 +0000 (12:42 +0200)]
Add endianness checks for AIX

6 years agoAuto-Merge pull request #2788 from rpv-tomsk/fix-5.8
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

6 years agoFix gcc issue on Mac byteorder
Dagobert Michelsen [Thu, 5 Apr 2018 08:49:30 +0000 (10:49 +0200)]
Fix gcc issue on Mac byteorder

6 years agoFix conditional on byteorder to work on Solaris
Dagobert Michelsen [Wed, 4 Apr 2018 12:34:15 +0000 (14:34 +0200)]
Fix conditional on byteorder to work on Solaris

6 years agoKeep clang-format happy
Dagobert Michelsen [Wed, 21 Mar 2018 21:23:07 +0000 (22:23 +0100)]
Keep clang-format happy

6 years agoAdd fallback for endianess conversion
Dagobert Michelsen [Wed, 21 Mar 2018 21:09:15 +0000 (22:09 +0100)]
Add fallback for endianess conversion

6 years agoAuto-Merge pull request #2787 from rpv-tomsk/fix-5.8
collectd bot [Mon, 21 May 2018 04:18:17 +0000 (06:18 +0200)]
Auto-Merge pull request #2787 from rpv-tomsk/fix-5.8

Automatically merged due to "Automerge" label

6 years agoAdded missing include of 'config.h'
Pavel Rochnyack [Mon, 21 May 2018 03:38:51 +0000 (10:38 +0700)]
Added missing include of 'config.h'

This adressed to solve compilation issue on Solaris platform:

In file included from src/libcollectdclient/network_parse.c:26:0,
                 from src/libcollectdclient/network_parse_test.c:32:
                 ./src/config.h:1517:0: error: "_FILE_OFFSET_BITS" redefined

6 years agoAuto-Merge pull request #2786 from rpv-tomsk/fix-5.8
collectd bot [Sun, 20 May 2018 20:22:12 +0000 (22:22 +0200)]
Auto-Merge pull request #2786 from rpv-tomsk/fix-5.8

Automatically merged due to "Automerge" label

6 years agoAdded missing include of 'kstat.h' and variable declaration
Pavel Rochnyack [Sun, 20 May 2018 19:35:44 +0000 (02:35 +0700)]
Added missing include of 'kstat.h' and variable declaration

This adressed to solve compilation issue on Solaris platform:

src/daemon/collectd.c:212: error: 'kc' undeclared (first use in this function)
src/daemon/collectd.c:213: error: implicit declaration of function 'kstat_open'

6 years agoAuto-Merge pull request #2785 from rpv-tomsk/fix-5.8
collectd bot [Sun, 20 May 2018 19:21:30 +0000 (21:21 +0200)]
Auto-Merge pull request #2785 from rpv-tomsk/fix-5.8

Automatically merged due to "Automerge" label

6 years agoTry to make clang-format happy
Pavel Rochnyack [Sun, 20 May 2018 17:57:27 +0000 (00:57 +0700)]
Try to make clang-format happy

6 years agoAdded missing include of 'kstat.h'
Pavel Rochnyack [Sun, 20 May 2018 17:52:33 +0000 (00:52 +0700)]
Added missing include of 'kstat.h'

This adressed to solve compilation issue on Solaris platform:

src/utils_vl_lookup.c:37:1: error: unknown type name 'kstat_ctl_t'
 kstat_ctl_t *kc;

6 years agoAuto-Merge pull request #2784 from rpv-tomsk/fix-5.8
collectd bot [Sun, 20 May 2018 17:21:04 +0000 (19:21 +0200)]
Auto-Merge pull request #2784 from rpv-tomsk/fix-5.8

Automatically merged due to "Automerge" label

6 years agoAdded missing include of 'kstat.h'
Pavel Rochnyack [Sun, 20 May 2018 16:48:00 +0000 (23:48 +0700)]
Added missing include of 'kstat.h'

This adressed to solve compilation issue on Solaris platform:

src/daemon/common.c:64:8: error: unknown type name 'kstat_ctl_t'
  extern kstat_ctl_t *kc;

6 years agoAdded missing include of "collectd.h"
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]

6 years agoMerge branch 'collectd-5.8'
Pavel Rochnyack [Sun, 20 May 2018 15:51:49 +0000 (22:51 +0700)]
Merge branch 'collectd-5.8'

6 years agoMerge branch 'collectd-5.8'
Pavel Rochnyack [Sun, 20 May 2018 15:41:22 +0000 (22:41 +0700)]
Merge branch 'collectd-5.8'

6 years agoMerge pull request #2783 from rpv-tomsk/tmpfix
Ruben Kerkhof [Sun, 20 May 2018 12:38:09 +0000 (14:38 +0200)]
Merge pull request #2783 from rpv-tomsk/tmpfix

Added support for libi2c-4.0

6 years agoAdded library link check and addressed review comments
Andrew Smith [Sat, 19 May 2018 15:12:05 +0000 (11:12 -0400)]
Added library link check and addressed review comments

6 years agoAdded support for libi2c-4.0
Pavel Rochnyack [Sat, 19 May 2018 11:50:06 +0000 (18:50 +0700)]
Added support for libi2c-4.0

Closes:  #2646

6 years agoMerge pull request #2701 from elfiesmelfie/feat_virt_notify_lifecycle
Ruben Kerkhof [Fri, 18 May 2018 16:44:38 +0000 (18:44 +0200)]
Merge pull request #2701 from elfiesmelfie/feat_virt_notify_lifecycle

virt: Fix tracking of VM state changes

6 years agoMerge pull request #2681 from elfiesmelfie/feat_pmu_cores
Ruben Kerkhof [Fri, 18 May 2018 16:43:47 +0000 (18:43 +0200)]
Merge pull request #2681 from elfiesmelfie/feat_pmu_cores

intel_pmu: core groups feature

6 years agointel_pmu plugin: fix for PR comments
Kamil Wiatrowski [Thu, 17 May 2018 14:15:24 +0000 (15:15 +0100)]
intel_pmu plugin: fix for PR comments

Check for failure from snprintf.
Make cgroup and event const in pmu_submit_counter.

Change-Id: I5547375da26c3a63b76588b733e844e3199e9bb8
Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
6 years agovirt: Cleanup - removed redundant true/false setting
Radoslaw Jablonski [Fri, 18 May 2018 09:48:20 +0000 (10:48 +0100)]
virt: Cleanup - removed redundant true/false setting

Setting explicitly true/false value in some cases was redundant.

Change-Id: I80bbdcefbf895ca8943c9a9ac45f1bfccf7b2881
Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
6 years agoipmi plugin: Add SELSensor and SELIgnoreSelected config options.
Mariusz Szafranski [Thu, 17 May 2018 12:19:37 +0000 (13:19 +0100)]
ipmi plugin: Add SELSensor and SELIgnoreSelected config options.

Functionality is similar to existing options 'Sensor' and 'IgnoreSelected',
which are used now for filtering metrics. New options will allow independent
filtering of SEL events.

Change-Id: I0fde54a25577e61a4c90a4ff52f62117540a4343
Signed-off-by: Mariusz Szafranski <mariuszx.szafranski@intel.com>
6 years agoplugin_mock: Mark params as unused in plugin-notification mocks
Radoslaw Jablonski [Thu, 17 May 2018 10:54:40 +0000 (11:54 +0100)]
plugin_mock: Mark params as unused in plugin-notification mocks

Change-Id: Iaf1b94849ad689a8e8c683a120a0ecb6cf6a872a
Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
6 years agovirt_test: Code cleanup
Radoslaw Jablonski [Thu, 17 May 2018 10:51:57 +0000 (11:51 +0100)]
virt_test: Code cleanup

Removed unnecessary '0'-initialization from static global
variables

Change-Id: Iaf1060dfd8be5e4a81a1e7bcec5cd5a88c0e1516
Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
6 years agovirt: Change '_Bool' to standard 'bool' type
Radoslaw Jablonski [Thu, 17 May 2018 09:00:36 +0000 (10:00 +0100)]
virt: Change '_Bool' to standard 'bool' type

Change-Id: I11c6d1f9526f22c82b6a375a5fad02209b71e03b
Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
6 years agoMerge branch 'collectd-5.8'
Ruben Kerkhof [Wed, 16 May 2018 13:19:05 +0000 (15:19 +0200)]
Merge branch 'collectd-5.8'

Conflicts:
src/ipmi.c

6 years agoAuto-Merge pull request #2779 from rpv-tomsk/tmpfix
collectd bot [Wed, 16 May 2018 13:13:12 +0000 (15:13 +0200)]
Auto-Merge pull request #2779 from rpv-tomsk/tmpfix

Automatically merged due to "Automerge" label

6 years agocleanup: code formatting
Pavel Rochnyack [Wed, 16 May 2018 12:44:16 +0000 (19:44 +0700)]
cleanup: code formatting

6 years agoRemove empty `cmd_listval_t` data structure and related no-op code.
Pavel Rochnyack [Wed, 16 May 2018 12:40:08 +0000 (19:40 +0700)]
Remove empty `cmd_listval_t` data structure and related no-op code.

Closes: #2739

6 years agoMerge pull request #2742 from elfiesmelfie/ipmi_bugfix_sensor_option
Pavel Rochnyak [Wed, 16 May 2018 12:25:13 +0000 (19:25 +0700)]
Merge pull request #2742 from elfiesmelfie/ipmi_bugfix_sensor_option

ipmi plugin: Fix for segmentation fault for wrong data type in Sensor section.

6 years agoFix make distcheck on Mac OS
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

6 years agoipmi plugin: Fix for segmentation fault for wrong data type in Sensor section.
Mariusz Szafranski [Thu, 29 Mar 2018 08:45:46 +0000 (09:45 +0100)]
ipmi plugin: Fix for segmentation fault for wrong data type in Sensor section.

Incorrect, malicious data in the Sensor section can cause a segmentation fault.
Error message is generated instead of crash after applying this patch.

Change-Id: Ibc387b5594f9453f1fc957ed37ceb09cfa34ded5
Signed-off-by: Mariusz Szafranski <mariuszx.szafranski@intel.com>
6 years agoMerge pull request #2777 from rubenk/fix-truncation-warnings
Ruben Kerkhof [Wed, 16 May 2018 09:45:20 +0000 (11:45 +0200)]
Merge pull request #2777 from rubenk/fix-truncation-warnings

Fix truncation warnings

6 years agotable plugin: fix truncation warnings
Ruben Kerkhof [Tue, 15 May 2018 20:03:00 +0000 (22:03 +0200)]
table plugin: fix truncation warnings

  CC       src/table.lo
src/table.c: In function ‘tbl_read_table’:
src/table.c:396:66: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=]
       snprintf(vl.type_instance, sizeof(vl.type_instance), "%s-%s",
                                                                  ^
src/table.c:396:7: note: ‘snprintf’ output 2 or more bytes (assuming 129) into a destination of size 128
       snprintf(vl.type_instance, sizeof(vl.type_instance), "%s-%s",
       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                res->instance_prefix, instances_str);
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

6 years agovirt plugin: fix truncation warning
Ruben Kerkhof [Tue, 15 May 2018 19:20:24 +0000 (21:20 +0200)]
virt plugin: fix truncation warning

src/virt.c: In function ‘refresh_lists’:
src/virt.c:2123:61: warning: ‘%u’ directive output may be truncated writing between 1 and 10 bytes into a region of size 5 [-Wformat-truncation=]
   snprintf(number_string, sizeof(number_string), "interface-%u", number);
                                                             ^~
src/virt.c:2123:50: note: directive argument in the range [1, 2147483647]
   snprintf(number_string, sizeof(number_string), "interface-%u", number);
                                                  ^~~~~~~~~~~~~~
src/virt.c:2123:3: note: ‘snprintf’ output between 12 and 21 bytes into a destination of size 15
   snprintf(number_string, sizeof(number_string), "interface-%u", number);
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

6 years agonetlink plugin: fix truncation warnings
Ruben Kerkhof [Tue, 15 May 2018 19:05:27 +0000 (21:05 +0200)]
netlink plugin: fix truncation warnings

  CC       src/netlink_la-netlink.lo
src/netlink.c: In function ‘qos_filter_cb’:
src/netlink.c:544:58: warning: ‘%s’ directive output may be truncated writing up to 127 bytes into a region of size between 121 and 122 [-Wformat-truncation=]
       snprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type, tc_inst);
                                                          ^~            ~~~~~~~
src/netlink.c:544:7: note: ‘snprintf’ output between 7 and 135 bytes into a destination of size 128
       snprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type, tc_inst);
       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/netlink.c:577:58: warning: ‘%s’ directive output may be truncated writing up to 127 bytes into a region of size between 121 and 122 [-Wformat-truncation=]
       snprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type, tc_inst);
                                                          ^~            ~~~~~~~
src/netlink.c:577:7: note: ‘snprintf’ output between 7 and 135 bytes into a destination of size 128
       snprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type, tc_inst);
       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  CCLD     netlink.la

6 years agotable plugin: modernize code a bit
Ruben Kerkhof [Tue, 15 May 2018 19:54:09 +0000 (21:54 +0200)]
table plugin: modernize code a bit

6 years agoMerge branch 'collectd-5.8'
Ruben Kerkhof [Tue, 15 May 2018 15:05:18 +0000 (17:05 +0200)]
Merge branch 'collectd-5.8'

6 years agoMerge pull request #2776 from mfournier/unblock_pr_2737
Marc Fournier [Tue, 15 May 2018 13:37:45 +0000 (14:37 +0100)]
Merge pull request #2776 from mfournier/unblock_pr_2737

Unblock #2737

6 years agoTrigger Jenkins
Marc Fournier [Tue, 15 May 2018 12:06:02 +0000 (14:06 +0200)]
Trigger Jenkins

6 years agoMerge pull request #2774 from takahashi-tsc/bugfix-collectdmon-loop
Ruben Kerkhof [Tue, 15 May 2018 10:43:45 +0000 (12:43 +0200)]
Merge pull request #2774 from takahashi-tsc/bugfix-collectdmon-loop

Fix collecdmon not start collectd

6 years agoMerge pull request #2773 from takahashi-tsc/bugfix-writeredis-duration
Ruben Kerkhof [Tue, 15 May 2018 10:40:57 +0000 (12:40 +0200)]
Merge pull request #2773 from takahashi-tsc/bugfix-writeredis-duration

write_redis: fix "max_set_duration" deletes unexpected data

6 years agorun contrib/format.sh src/collectdmon.c
Toshiaki Takahashi [Tue, 15 May 2018 09:25:29 +0000 (09:25 +0000)]
run contrib/format.sh src/collectdmon.c

6 years agoFix collecdmon not start collectd
Toshiaki Takahashi [Tue, 15 May 2018 09:06:16 +0000 (09:06 +0000)]
Fix collecdmon not start collectd

Because collectdmon cannot exit parse command line options loop,
it cannot execute collectd start processing.

6 years agowrite_redis: fix "max_set_duration" deletes unexpected data
Toshiaki Takahashi [Tue, 15 May 2018 07:19:25 +0000 (07:19 +0000)]
write_redis: fix "max_set_duration" deletes unexpected data

The calculation result of the data range
when "max_set_duration" is used is incorrect,
because the (char []) type, i.e. string, variable "time" is used
as the number for the time calculation.
As a result, data in the wrong range is deleted.
With this change, the correct data is deleted
by calculation using a double type value.

6 years agocollectdmon: fix build failure on Xenial
Ruben Kerkhof [Tue, 15 May 2018 07:46:01 +0000 (09:46 +0200)]
collectdmon: fix build failure on Xenial

CC       src/collectdmon.o
src/collectdmon.c:262:44: error: comparison of unsigned expression >= 0 is always true [-Werror,-Wtautological-compare]
    while (((time_left = sleep(time_left)) >= 0) && loop == 0)
            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~
1 error generated.

6 years agonut plugin: fix warning
Ruben Kerkhof [Mon, 14 May 2018 22:27:58 +0000 (00:27 +0200)]
nut plugin: fix warning

  CC       src/nut_la-nut.lo
In function ‘nut_ca_path’,
    inlined from ‘nut_config.part.1’ at src/nut.c:181:12,
    inlined from ‘nut_config’:
src/nut.c:148:5: warning: ‘strncpy’ specified bound depends on the length of the source argument [-Wstringop-overflow=]
     strncpy(ca_path, value, (strlen(value) + 1));
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/nut.c: In function ‘nut_config’:
src/nut.c:148:30: note: length computed here
     strncpy(ca_path, value, (strlen(value) + 1));
                              ^~~~~~~~~~~~~
  CCLD     nut.la

6 years agocollectdmon: modernize the code a bit
Ruben Kerkhof [Mon, 14 May 2018 22:08:35 +0000 (00:08 +0200)]
collectdmon: modernize the code a bit

6 years agocollectdmon: remove unneccesary cast
Ruben Kerkhof [Mon, 14 May 2018 21:38:09 +0000 (23:38 +0200)]
collectdmon: remove unneccesary cast

6 years agoFix syntax error introduced by previous
Ruben Kerkhof [Mon, 14 May 2018 21:37:22 +0000 (23:37 +0200)]
Fix syntax error introduced by previous

./configure: line 20320: syntax error near unexpected token `fi'
./configure: line 20320: `fi'
make: *** [Makefile:4418: config.status] Error 2

Oops, my bad.