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

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

5 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

5 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

5 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

5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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

5 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

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

5 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

5 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.

5 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

5 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>
5 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

5 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);
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

5 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);
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

5 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

5 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

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

5 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

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

5 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

5 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

5 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

5 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.

5 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.

5 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.

5 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

5 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

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

5 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.

5 years agoUse sane CFLAGS while checking for strtok_r
Ruben Kerkhof [Mon, 14 May 2018 21:23:36 +0000 (23:23 +0200)]
Use sane CFLAGS while checking for strtok_r

Instead of using the flags passed in via the environment.

This makes `./configure CC=clang CFLAGS="-Weverything` work properly.

5 years agoLook for more variants of liblua
Ruben Kerkhof [Mon, 14 May 2018 20:54:34 +0000 (22:54 +0200)]
Look for more variants of liblua

So we pick up liblua automatically on OpenBSD.

5 years agosnmp plugin: add some missing error handling
Ruben Kerkhof [Mon, 14 May 2018 20:12:28 +0000 (22:12 +0200)]
snmp plugin: add some missing error handling

Fixes CID #179226

5 years agowrite_sensu plugin: use the right size for buffer
Ruben Kerkhof [Mon, 14 May 2018 20:08:35 +0000 (22:08 +0200)]
write_sensu plugin: use the right size for buffer

I missed that r is a pointer, not an array.
Fixes CID #185580

5 years agowrite_riemann plugin: fix warning
Ruben Kerkhof [Mon, 14 May 2018 13:22:17 +0000 (15:22 +0200)]
write_riemann plugin: fix warning

src/write_riemann.c:185:50: warning: unused parameter 'host' [-Wunused-parameter]
wrr_notification_to_message(struct riemann_host *host, /* {{{ */
                                                 ^
1 warning generated.

5 years agowrite_sensu plugin: remove unused parameter
Ruben Kerkhof [Mon, 14 May 2018 13:18:33 +0000 (15:18 +0200)]
write_sensu plugin: remove unused parameter

  CC       src/write_sensu.lo
src/write_sensu.c:341:38: warning: unused parameter 'status' [-Wunused-parameter]
                                 int status) {
                                     ^
1 warning generated.

5 years agocurl_json_test.c: fix warnings
Ruben Kerkhof [Mon, 14 May 2018 13:14:32 +0000 (15:14 +0200)]
curl_json_test.c: fix warnings

src/curl_json_test.c:142:14: warning: unused parameter 'argc' [-Wunused-parameter]
int main(int argc, char **argv) {
             ^
src/curl_json_test.c:142:27: warning: unused parameter 'argv' [-Wunused-parameter]
int main(int argc, char **argv) {
                          ^
2 warnings generated.

5 years agoBind plugin: remove unused parameters
Ruben Kerkhof [Mon, 14 May 2018 13:08:22 +0000 (15:08 +0200)]
Bind plugin: remove unused parameters

  CC       src/bind_la-bind.lo
src/bind.c:911:49: warning: unused parameter 'statsnode' [-Wunused-parameter]
                                       xmlNode *statsnode,
                                                ^
src/bind.c:943:67: warning: unused parameter 'statsnode' [-Wunused-parameter]
                              xmlXPathContext *xpathCtx, xmlNode *statsnode,
                                                                  ^
src/bind.c:1062:70: warning: unused parameter 'statsnode' [-Wunused-parameter]
                                 xmlXPathContext *xpathCtx, xmlNode *statsnode,
                                                                     ^
3 warnings generated.

5 years agocollectd-tg: fix warning
Ruben Kerkhof [Mon, 14 May 2018 12:57:00 +0000 (14:57 +0200)]
collectd-tg: fix warning

src/collectd-tg.c:98:32: warning: unused parameter 'signal' [-Wunused-parameter]
static void signal_handler(int signal) /* {{{ */
                               ^

5 years agoMerge pull request #2772 from rubenk/static-initializers
Ruben Kerkhof [Mon, 14 May 2018 12:52:04 +0000 (14:52 +0200)]
Merge pull request #2772 from rubenk/static-initializers

Don't initialize static pointers to NULL

5 years agoRemove unreachable break statement
Ruben Kerkhof [Mon, 14 May 2018 12:25:06 +0000 (14:25 +0200)]
Remove unreachable break statement

src/daemon/collectd.c:492:7: warning: 'break' will never be executed [-Wunreachable-code-break]
      break;
      ^~~~~

5 years agoDon't initialize static numeric variables to 0
Ruben Kerkhof [Mon, 14 May 2018 12:10:34 +0000 (14:10 +0200)]
Don't initialize static numeric variables to 0

5 years agoDon't initialize static pointers to NULL
Ruben Kerkhof [Mon, 14 May 2018 10:48:25 +0000 (12:48 +0200)]
Don't initialize static pointers to NULL

This is the default

5 years agotcpconns: remove redundant include
Ruben Kerkhof [Mon, 14 May 2018 10:17:07 +0000 (12:17 +0200)]
tcpconns: remove redundant include

5 years agoMerge pull request #2771 from rubenk/stdbool
Ruben Kerkhof [Mon, 14 May 2018 09:38:16 +0000 (11:38 +0200)]
Merge pull request #2771 from rubenk/stdbool

Stdbool

5 years agoUse true and false for assignments to bool
Ruben Kerkhof [Sun, 13 May 2018 18:38:40 +0000 (20:38 +0200)]
Use true and false for assignments to bool

5 years agoclang-format
Ruben Kerkhof [Sun, 13 May 2018 17:30:31 +0000 (19:30 +0200)]
clang-format

5 years agoSet static bools to true instead of 1
Ruben Kerkhof [Sun, 13 May 2018 17:05:33 +0000 (19:05 +0200)]
Set static bools to true instead of 1

5 years agoNo need to initialize static bools to false
Ruben Kerkhof [Sun, 13 May 2018 16:56:18 +0000 (18:56 +0200)]
No need to initialize static bools to false

5 years agoTreewide: use bool instead of _Bool
Ruben Kerkhof [Sun, 13 May 2018 16:35:29 +0000 (18:35 +0200)]
Treewide: use bool instead of _Bool

It's about time

5 years agowrite_sensu: use sstrncpy
Ruben Kerkhof [Sun, 13 May 2018 15:06:54 +0000 (17:06 +0200)]
write_sensu: use sstrncpy

Fixes:
  CC       src/write_sensu.lo
src/write_sensu.c: In function ‘replace_str’:
src/write_sensu.c:630:3: warning: ‘strncpy’ output truncated before terminating nul copying as many bytes from a string as its length [-Wstringop-truncation]
   strncpy(r, p, strlen(p));
   ^~~~~~~~~~~~~~~~~~~~~~~~
  CCLD     write_sensu.la

5 years agovirt: Remove unneeded info about thread id
Radoslaw Jablonski [Wed, 9 May 2018 11:48:57 +0000 (12:48 +0100)]
virt: Remove unneeded info about thread id

There is only one notification thread in virt plugin, therefore
information about ID is not needed.

Change-Id: I755f649711a815132927007a80a89caa98704f95
Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
5 years agovirt: Add valgrind.suppress to EXTRA_DIST
Radoslaw Jablonski [Tue, 8 May 2018 14:09:50 +0000 (15:09 +0100)]
virt: Add valgrind.suppress to EXTRA_DIST

Previosusly newly added valgrind.suppress file was
missing during collectd archive creation using
'make dist-gzip' target.
Virt unit tests were failing on debian wheezy platform
without that file (because of unfiltered libnl v1 leaks).

Change-Id: I49543f883dd6dbeaef439c602b2f05ac0e977053
Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
5 years agoMerge pull request #2767 from rpv-tomsk/tmpfix
Ruben Kerkhof [Mon, 7 May 2018 20:13:11 +0000 (22:13 +0200)]
Merge pull request #2767 from rpv-tomsk/tmpfix

netlink plugin: Handle new counter from Linux kernel version 4.6+.

5 years agonetlink plugin: Report `rx_nohandler` stats
Pavel Rochnyack [Mon, 7 May 2018 16:39:35 +0000 (23:39 +0700)]
netlink plugin: Report `rx_nohandler` stats

Added metric for new counter from Linux kernel version 4.6+.

Issue: #2510

5 years agonetlink plugin: Use of less strict rules in link_filter_cb()
Pavel Rochnyack [Mon, 7 May 2018 15:53:23 +0000 (22:53 +0700)]
netlink plugin: Use of less strict rules in link_filter_cb()

mnl_attr_validate2() function implements strict equality check of kernel and
userspace structures size. Additional counters was added to 4.6 Linux kernel,
sizes was changed and mismatch can occur.

This patch weakened validation.
Now Collectd just checks if structures, received from kernel space, has enough
data.

Closes: #2510

5 years agovirt unit tests: Add valgrind.suppress with libnl1 leak definition
Radoslaw Jablonski [Wed, 2 May 2018 07:48:34 +0000 (08:48 +0100)]
virt unit tests: Add valgrind.suppress with libnl1 leak definition

Libnl-1 is used by libvirt on older systems (e.g. debian wheezy)
and unfortunately it has memory leaks that cannot be fixed from
collectd side - virt unit tests were failing on platforms with
libnl1 because of those leaks.
Valgrind.suppress file is used to pass definitions for leaks that
cannot be fixed and now virt unit tests can be run without any
problems on every platform - memory leaks are still validated and
the only difference is that libnl1 leaks are ignored during
valgrind check.

Change-Id: I5fc423402f7b89e4e43fb896f73cba89eea36226
Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
5 years agoMerge pull request #2761 from dago/patch-3
Ruben Kerkhof [Thu, 3 May 2018 13:51:32 +0000 (15:51 +0200)]
Merge pull request #2761 from dago/patch-3

Add endianness checks for AIX

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

5 years agoMerge pull request #2755 from dehotot/debug-option-rpms
Ruben Kerkhof [Wed, 2 May 2018 15:19:10 +0000 (17:19 +0200)]
Merge pull request #2755 from dehotot/debug-option-rpms

Add ability to turn on collectd "debug" feature in RPMs

5 years agoaggregation plugin: modernize the code a bit
Ruben Kerkhof [Wed, 2 May 2018 13:26:43 +0000 (15:26 +0200)]
aggregation plugin: modernize the code a bit

5 years agoapache plugin: modernize the code a bit
Ruben Kerkhof [Wed, 2 May 2018 13:15:15 +0000 (15:15 +0200)]
apache plugin: modernize the code a bit

5 years agoRun clang-format on src/bind.c after my change
Ruben Kerkhof [Wed, 2 May 2018 12:21:14 +0000 (14:21 +0200)]
Run clang-format on src/bind.c after my change

5 years agobind plugin: modernize the code a bit
Ruben Kerkhof [Wed, 2 May 2018 12:19:07 +0000 (14:19 +0200)]
bind plugin: modernize the code a bit

5 years agowrite_tsdb: ansify function declaration
Ruben Kerkhof [Wed, 2 May 2018 11:17:13 +0000 (13:17 +0200)]
write_tsdb: ansify function declaration

5 years agoDo not hide prototype of check_capability()
Ruben Kerkhof [Wed, 2 May 2018 10:42:56 +0000 (12:42 +0200)]
Do not hide prototype of check_capability()

We have a fallback definition for if <sys/capability.h> is not found.
That definition needs a prototype.

Noticed while checking with sparse on Mac OS.

5 years agoMerge branch 'collectd-5.8'
Ruben Kerkhof [Wed, 2 May 2018 10:27:01 +0000 (12:27 +0200)]
Merge branch 'collectd-5.8'

Conflicts:
src/collectd.conf.pod

5 years agoconfigure.ac: return is not a function
Ruben Kerkhof [Wed, 2 May 2018 10:23:56 +0000 (12:23 +0200)]
configure.ac: return is not a function

5 years agonetwork_parse.c: ansify function definition
Ruben Kerkhof [Wed, 2 May 2018 10:17:13 +0000 (12:17 +0200)]
network_parse.c: ansify function definition

5 years agoMerge pull request #2691 from lilydjwg/master
Pavel Rochnyak [Tue, 1 May 2018 12:13:51 +0000 (19:13 +0700)]
Merge pull request #2691 from lilydjwg/master

ping plugin: support specifying the address family

5 years agoping plugin: doc: wrap long lines
lilydjwg [Tue, 1 May 2018 11:52:53 +0000 (19:52 +0800)]
ping plugin: doc: wrap long lines

5 years agoAuto-Merge pull request #2760 from rpv-tomsk/tmpfix
collectd bot [Tue, 1 May 2018 09:12:01 +0000 (11:12 +0200)]
Auto-Merge pull request #2760 from rpv-tomsk/tmpfix

Automatically merged due to "Automerge" label

5 years agoping plugin: warn on invalid AddressFamily value instead of error
lilydjwg [Tue, 1 May 2018 08:40:09 +0000 (16:40 +0800)]
ping plugin: warn on invalid AddressFamily value instead of error

5 years agodocs: Fix typo in collectd.conf.pod
Pavel Rochnyack [Tue, 1 May 2018 08:30:43 +0000 (15:30 +0700)]
docs: Fix typo in collectd.conf.pod

5 years agoFix typo in collectd.conf.pod
Pavel Rochnyack [Tue, 1 May 2018 08:26:36 +0000 (15:26 +0700)]
Fix typo in collectd.conf.pod

5 years agoping plugin: reformat
lilydjwg [Tue, 1 May 2018 07:14:26 +0000 (15:14 +0800)]
ping plugin: reformat

5 years agoping plugin: update docs for AddressFamily option
lilydjwg [Tue, 1 May 2018 06:52:44 +0000 (14:52 +0800)]
ping plugin: update docs for AddressFamily option

5 years agoping plugin: check AddressFamily option value in ping_config
lilydjwg [Tue, 1 May 2018 06:10:30 +0000 (14:10 +0800)]
ping plugin: check AddressFamily option value in ping_config

5 years agoAdd ability to turn on collectd "debug" feature in RPMs
Alex White [Fri, 27 Apr 2018 09:47:04 +0000 (10:47 +0100)]
Add ability to turn on collectd "debug" feature in RPMs

6 years agovirt: Add exit condition in notif-thread loop
Radoslaw Jablonski [Mon, 23 Apr 2018 06:32:35 +0000 (07:32 +0100)]
virt: Add exit condition in notif-thread loop

Previously thread was stopped using pthread_cancel() call.
Now introduced state variable to track thread active state.

This patch fixes warning about 'infinite loop without
exit condition' generated by Klocwork static analisys.

Change-Id: Ifbaf1dacf422ad6a2a11057e6475c4320c709f33
Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
6 years agovirt: Fix memory handling for domains data
Radoslaw Jablonski [Fri, 30 Mar 2018 15:31:00 +0000 (16:31 +0100)]
virt: Fix memory handling for domains data

Memory with data for inactive domains was wrongly
freed earlier in refresh_lists() function and crash
was generated. Memory for active domains have
had the same problems with unnecessary free.
Also added handling for freeing inactive domain in
case of error.

Change-Id: I618798d9a369840be9ee596c96f12cbc1f7b24a6
Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
6 years agovirt: Fix code style in unit tests
Radoslaw Jablonski [Thu, 29 Mar 2018 07:39:23 +0000 (08:39 +0100)]
virt: Fix code style in unit tests

Change-Id: I22501153af210082b444103a8c2ae2686064ebfa
Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
6 years agovirt: Fix memory leak when using libvirt <= 1.0
Radoslaw Jablonski [Tue, 27 Mar 2018 14:59:13 +0000 (15:59 +0100)]
virt: Fix memory leak when using libvirt <= 1.0

Cleanup was missing for libvirt-allocated virDomainPtr.

Change-Id: Ied152e9e4084ee9e25b7357e648a6aac8778d09b
Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
6 years agovirt: Replace malloc with calloc for array allocations
Radoslaw Jablonski [Mon, 26 Mar 2018 10:18:19 +0000 (11:18 +0100)]
virt: Replace malloc with calloc for array allocations

Change-Id: I5720ea4c4a237eca7aac19e2cdf7a37194c4c69c
Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
6 years agosrc/virt.c: Decouple persistent notifications from refreshInterval
Antoine Naud [Wed, 21 Mar 2018 08:51:42 +0000 (08:51 +0000)]
src/virt.c: Decouple persistent notifications from refreshInterval

When persistentNotification is true, if refreshInterval value is larger than
(read) Interval, the notifications are not issued every read interval as should
be. The fix consist in decoupling persistent notifications from refreshInterval.

Change-Id: I157554a360510c21ffa631430446afd57b99dfab
Signed-off-by: Antoine Naud <antoinex.naud@intel.com>
6 years agosrc/virt_test.c: Fix build error on ubuntu:trusty
Antoine Naud [Thu, 22 Mar 2018 09:48:09 +0000 (09:48 +0000)]
src/virt_test.c: Fix build error on ubuntu:trusty

Change-Id: Ie7dce42f52709c95e1cc51c2236276755278a0ec
Signed-off-by: Antoine Naud <antoinex.naud@intel.com>
6 years agosrc/virt_test.c: Fix memory leaks detected by valgrind
Antoine Naud [Thu, 22 Mar 2018 08:31:23 +0000 (08:31 +0000)]
src/virt_test.c: Fix memory leaks detected by valgrind

src/virt.c: The same memory leaks are also fixed.

Change-Id: Ie970ec5ce500be7cc06512a52994b37cfb687e84
Signed-off-by: Antoine Naud <antoinex.naud@intel.com>
6 years agosrc/virt.c: Fix build error on ubuntu:trusty
Antoine Naud [Wed, 14 Mar 2018 11:49:13 +0000 (11:49 +0000)]
src/virt.c: Fix build error on ubuntu:trusty

Change-Id: Ic76a5b9861360181c677b643245b24f40b80777b
Signed-off-by: Antoine Naud <antoinex.naud@intel.com>
6 years agoMerge pull request #2740 from melak/ros_radioname_null
Ruben Kerkhof [Mon, 9 Apr 2018 11:18:03 +0000 (13:18 +0200)]
Merge pull request #2740 from melak/ros_radioname_null

Fix routeros unset radio-name showing up as "(null)"

6 years agoMerge pull request #2741 from dago/mac
Ruben Kerkhof [Thu, 5 Apr 2018 17:05:32 +0000 (19:05 +0200)]
Merge pull request #2741 from dago/mac

Fix gcc issue on Mac byteorder

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 routeros unset radio-name showing up as "(null)"
Tamas TEVESZ [Wed, 4 Apr 2018 16:25:28 +0000 (18:25 +0200)]
Fix routeros unset radio-name showing up as "(null)"

This happens when the `radio-name` property is unset on a wireless
interface. Why this is done is beyond me, but it does seem to be a thing.

6 years agoFix compilation on OpenBSD
Ruben Kerkhof [Wed, 4 Apr 2018 15:02:29 +0000 (17:02 +0200)]
Fix compilation on OpenBSD

  CC       src/libcollectdclient/libcollectdclient_la-server.lo
In file included from src/libcollectdclient/server.c:37:
/usr/include/net/if.h:121: error: field 'ifi_lastchange' has incomplete type
/usr/include/net/if.h:369: error: field 'ifru_addr' has incomplete type
/usr/include/net/if.h:370: error: field 'ifru_dstaddr' has incomplete type
/usr/include/net/if.h:371: error: field 'ifru_broadaddr' has incomplete type
/usr/include/net/if.h:399: error: field 'ifrau_addr' has incomplete type
/usr/include/net/if.h:405: error: field 'ifra_dstaddr' has incomplete type
/usr/include/net/if.h:407: error: field 'ifra_mask' has incomplete type
/usr/include/net/if.h:450: error: field 'addr' has incomplete type
/usr/include/net/if.h:451: error: field 'dstaddr' has incomplete type
/usr/include/net/if.h:457: error: expected specifier-qualifier-list before 'sa_family_t'
In file included from /usr/include/net/if.h:466,
                 from src/libcollectdclient/server.c:37:
/usr/include/net/if_arp.h:79: error: field 'arp_pa' has incomplete type
/usr/include/net/if_arp.h:80: error: field 'arp_ha' has incomplete type
*** Error 1 in . (Makefile:6017 'src/libcollectdclient/libcollectdclient_la-server.lo': @echo "  CC      " src/libcollectdclient/libcollectd...)
*** Error 1 in /home/ruben/src/collectd (Makefile:4188 'all')

6 years agoMerge pull request #2690 from shastah/fix-spec-typo
Ruben Kerkhof [Wed, 4 Apr 2018 14:52:56 +0000 (16:52 +0200)]
Merge pull request #2690 from shastah/fix-spec-typo

RPM spec: fix mbmon/mcelog typo