collectd.git
6 years agoprocesses plugin: Fix error message.
Florian Forster [Thu, 7 Dec 2017 21:20:28 +0000 (22:20 +0100)]
processes plugin: Fix error message.

6 years agoprocesses plugin: Make delay metric reporting less repetitive.
Florian Forster [Thu, 7 Dec 2017 20:51:22 +0000 (21:51 +0100)]
processes plugin: Make delay metric reporting less repetitive.

6 years agocontrib/systemd.collectd.service: Add the processes plugin.
Florian Forster [Thu, 7 Dec 2017 20:25:40 +0000 (21:25 +0100)]
contrib/systemd.collectd.service: Add the processes plugin.

6 years agoprocesses plugin: Check for the CAP_NET_ADMIN capability.
Florian Forster [Thu, 7 Dec 2017 20:20:40 +0000 (21:20 +0100)]
processes plugin: Check for the CAP_NET_ADMIN capability.

This allows us to print helpful error messages to the user if something
goes wrong.

6 years agoprocesses plugin: Implement the "CollectDelayAccounting" option.
Florian Forster [Wed, 6 Dec 2017 21:24:34 +0000 (22:24 +0100)]
processes plugin: Implement the "CollectDelayAccounting" option.

6 years agosrc/utils_taskstats.[ch]: Add library for Linux Delay Accounting.
Florian Forster [Wed, 6 Dec 2017 21:03:52 +0000 (22:03 +0100)]
src/utils_taskstats.[ch]: Add library for Linux Delay Accounting.

6 years agoMerge branch 'collectd-5.8'
Florian Forster [Tue, 5 Dec 2017 06:33:18 +0000 (07:33 +0100)]
Merge branch 'collectd-5.8'

6 years ago.travis.yml: Send notifications to the changes ML.
Florian Forster [Tue, 5 Dec 2017 06:33:13 +0000 (07:33 +0100)]
.travis.yml: Send notifications to the changes ML.

6 years agoMerge pull request #2590 from maryamtahhan/fix_collectd_ovs_deadlock
Florian Forster [Mon, 4 Dec 2017 08:53:48 +0000 (09:53 +0100)]
Merge pull request #2590 from maryamtahhan/fix_collectd_ovs_deadlock

Fix collectd ovs deadlock

6 years agoceph plugin: Fix #2572
Aleksei Zakharov [Fri, 1 Dec 2017 16:07:04 +0000 (19:07 +0300)]
ceph plugin: Fix #2572

Signed-off-by: Florian Forster <octo@collectd.org>
6 years agoMerge branch 'collectd-5.7' into collectd-5.8
Florian Forster [Mon, 4 Dec 2017 07:23:26 +0000 (08:23 +0100)]
Merge branch 'collectd-5.7' into collectd-5.8

6 years agotable plugin: Add explicit NULL checks to clear functions.
Florian Forster [Mon, 4 Dec 2017 07:18:33 +0000 (08:18 +0100)]
table plugin: Add explicit NULL checks to clear functions.

CID: 37966

6 years agoexec plugin: Check return value of plugin_thread_create().
Florian Forster [Fri, 1 Dec 2017 20:05:00 +0000 (21:05 +0100)]
exec plugin: Check return value of plugin_thread_create().

CID: 37942, 37943

6 years agorrdtool plugin: Check return value of c_avl_get().
Florian Forster [Fri, 1 Dec 2017 19:45:04 +0000 (20:45 +0100)]
rrdtool plugin: Check return value of c_avl_get().

CID: 37940

6 years agoAuto-Merge pull request #2589 from octo/cid/37960
collectd bot [Fri, 1 Dec 2017 15:14:57 +0000 (16:14 +0100)]
Auto-Merge pull request #2589 from octo/cid/37960

Automatically merged due to "Automerge" label

6 years agoutils_ovs: fix #2574
Tahhan, Maryam [Wed, 29 Nov 2017 12:50:18 +0000 (12:50 +0000)]
utils_ovs: fix #2574

Poll thread was trying to reconnect after event thread was terminated.

Change-Id: I48bf196302139ddf99bb96b49a6c3b4ede345240
Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
6 years agoAuto-Merge pull request #2588 from octo/cid/37968
collectd bot [Fri, 1 Dec 2017 14:20:59 +0000 (15:20 +0100)]
Auto-Merge pull request #2588 from octo/cid/37968

Automatically merged due to "Automerge" label

6 years agocontrib/format.sh src/perl.c
Florian Forster [Fri, 1 Dec 2017 13:59:55 +0000 (14:59 +0100)]
contrib/format.sh src/perl.c

6 years agopowerdns plugin: Remove the unused ret_buffer_size argument …
Florian Forster [Fri, 1 Dec 2017 13:18:50 +0000 (14:18 +0100)]
powerdns plugin: Remove the unused ret_buffer_size argument …

… from powerdns_get_data().

6 years agoperl plugin: Fix exporting notification meta data.
Florian Forster [Fri, 1 Dec 2017 13:30:23 +0000 (14:30 +0100)]
perl plugin: Fix exporting notification meta data.

Previously, the while loop ensured that meta was NULL, causing the for
loop to never been executed. This introduces a new temporary variable to
avoid changing meta before the for loop.

CID: 37960

6 years agopowerdns plugin: Declare variables on first use.
Florian Forster [Fri, 1 Dec 2017 11:06:26 +0000 (12:06 +0100)]
powerdns plugin: Declare variables on first use.

6 years agopowerdns plugin: Ensure powerdns_get_data() returns a non-NULL buffer.
Florian Forster [Fri, 1 Dec 2017 11:05:21 +0000 (12:05 +0100)]
powerdns plugin: Ensure powerdns_get_data() returns a non-NULL buffer.

Coverity is concerned that if buffer is NULL, strtok_r() is called with
two NULL arguments, causing a NULL pointer dereference.

CID: 37968

6 years agoMerge branch 'collectd-5.8'
Florian Forster [Fri, 1 Dec 2017 10:26:17 +0000 (11:26 +0100)]
Merge branch 'collectd-5.8'

6 years agoMerge branch 'collectd-5.8'
Florian Forster [Fri, 1 Dec 2017 10:25:18 +0000 (11:25 +0100)]
Merge branch 'collectd-5.8'

6 years ago.travis.yml: Call coverity scan from job 1 only.
Florian Forster [Fri, 1 Dec 2017 10:25:06 +0000 (11:25 +0100)]
.travis.yml: Call coverity scan from job 1 only.

The logic was inverted.

6 years agoMerge branch 'collectd-5.7' into collectd-5.8
Florian Forster [Thu, 30 Nov 2017 16:11:49 +0000 (17:11 +0100)]
Merge branch 'collectd-5.7' into collectd-5.8

6 years agoAuto-Merge pull request #2586 from octo/issue/2583
collectd bot [Thu, 30 Nov 2017 09:09:13 +0000 (10:09 +0100)]
Auto-Merge pull request #2586 from octo/issue/2583

Automatically merged due to "Automerge" label

6 years agonetwork_parse_test.c: Only test security features if libgcrypt is available.
Florian Forster [Thu, 30 Nov 2017 08:33:50 +0000 (09:33 +0100)]
network_parse_test.c: Only test security features if libgcrypt is available.

Fixes: #2583

6 years agoAuto-Merge pull request #2584 from octo/coverity
collectd bot [Wed, 29 Nov 2017 12:32:30 +0000 (13:32 +0100)]
Auto-Merge pull request #2584 from octo/coverity

Automatically merged due to "Automerge" label

6 years ago.travis.yml: Try to work around travis-ci/travis-ci#1975.
Florian Forster [Wed, 29 Nov 2017 07:20:38 +0000 (08:20 +0100)]
.travis.yml: Try to work around travis-ci/travis-ci#1975.

6 years agoAuto-Merge pull request #2580 from octo/cid/179235
collectd bot [Tue, 28 Nov 2017 08:32:33 +0000 (09:32 +0100)]
Auto-Merge pull request #2580 from octo/cid/179235

Automatically merged due to "Automerge" label

6 years agoAuto-Merge pull request #2579 from octo/cid/179238
collectd bot [Tue, 28 Nov 2017 08:11:23 +0000 (09:11 +0100)]
Auto-Merge pull request #2579 from octo/cid/179238

Automatically merged due to "Automerge" label

6 years agocontrib/format.sh src/aggregation.c
Florian Forster [Tue, 28 Nov 2017 07:24:14 +0000 (08:24 +0100)]
contrib/format.sh src/aggregation.c

6 years agoaggregation plugin: Check return value of config functions.
Florian Forster [Tue, 28 Nov 2017 07:21:48 +0000 (08:21 +0100)]
aggregation plugin: Check return value of config functions.

CID: 179235

6 years agoaggregation plugin: Declare variables on initialization.
Florian Forster [Tue, 28 Nov 2017 07:17:05 +0000 (08:17 +0100)]
aggregation plugin: Declare variables on initialization.

6 years agovirt plugin: Remove `do {} while(0)` loop around macro.
Florian Forster [Tue, 28 Nov 2017 07:11:07 +0000 (08:11 +0100)]
virt plugin: Remove `do {} while(0)` loop around macro.

The `continue` in the macro was supposed to continue the `for` loop, but
was (unexpectedly) exiting the do…while loop instead.

CID: 179238

6 years ago.travis.yml: Import list of dependencies from collectd-ci.
Florian Forster [Mon, 27 Nov 2017 21:35:21 +0000 (22:35 +0100)]
.travis.yml: Import list of dependencies from collectd-ci.

6 years ago.travis.yml: Add coverity addon.
Florian Forster [Mon, 27 Nov 2017 21:07:33 +0000 (22:07 +0100)]
.travis.yml: Add coverity addon.

6 years agoAuto-Merge pull request #2576 from octo/collectd-5.8
collectd bot [Mon, 27 Nov 2017 21:10:38 +0000 (22:10 +0100)]
Auto-Merge pull request #2576 from octo/collectd-5.8

Automatically merged due to "Automerge" label

6 years agocontrib/format.sh: Switch to custom domain name.
Florian Forster [Mon, 27 Nov 2017 20:09:14 +0000 (21:09 +0100)]
contrib/format.sh: Switch to custom domain name.

6 years agoAuto-Merge pull request #2575 from octo/cid/37934
collectd bot [Sat, 25 Nov 2017 08:18:51 +0000 (09:18 +0100)]
Auto-Merge pull request #2575 from octo/cid/37934

Automatically merged due to "Automerge" label

6 years agoping plugin: Lock the mutex later.
Florian Forster [Sat, 25 Nov 2017 07:28:35 +0000 (08:28 +0100)]
ping plugin: Lock the mutex later.

Coverity gets confused if holding the lock while allocating pingobj.

CID: 37934

6 years agoAuto-Merge pull request #2568 from octo/cid/157645
collectd bot [Wed, 22 Nov 2017 07:14:52 +0000 (08:14 +0100)]
Auto-Merge pull request #2568 from octo/cid/157645

Automatically merged due to "Automerge" label

6 years agoset target: Fix memory leak.
Florian Forster [Wed, 22 Nov 2017 06:47:14 +0000 (07:47 +0100)]
set target: Fix memory leak.

CID: 157645

6 years agoAuto-Merge pull request #2566 from octo/pr/2556
collectd bot [Tue, 21 Nov 2017 16:08:21 +0000 (17:08 +0100)]
Auto-Merge pull request #2566 from octo/pr/2556

Automatically merged due to "Automerge" label

6 years agoMerge branch 'collectd-5.8'
Florian Forster [Tue, 21 Nov 2017 09:39:44 +0000 (10:39 +0100)]
Merge branch 'collectd-5.8'

6 years agoMerge branch 'collectd-5.7' into collectd-5.8
Florian Forster [Tue, 21 Nov 2017 09:38:52 +0000 (10:38 +0100)]
Merge branch 'collectd-5.7' into collectd-5.8

6 years agorrd plugin: Fix writing of long values.
Miroslav Lichvar [Mon, 20 Nov 2017 11:02:44 +0000 (12:02 +0100)]
rrd plugin: Fix writing of long values.

The buffer provided for value_list_to_string() was not long enough to
fit a timestamp and a negative value using exponent and maximum
precision of the gauge format.

Signed-off-by: Florian Forster <octo@collectd.org>
6 years agoAuto-Merge pull request #2565 from octo/cid/37966
collectd bot [Mon, 20 Nov 2017 14:10:07 +0000 (15:10 +0100)]
Auto-Merge pull request #2565 from octo/cid/37966

Automatically merged due to "Automerge" label

6 years agotable plugin: Refactor realloc() calls.
Florian Forster [Mon, 20 Nov 2017 13:26:41 +0000 (14:26 +0100)]
table plugin: Refactor realloc() calls.

Increase the number of elements in the successful path only, instead of
increasing it immediately and decreasing on error.

6 years agotable plugin: Assert that result_num is zero when result is NULL.
Florian Forster [Mon, 20 Nov 2017 13:19:46 +0000 (14:19 +0100)]
table plugin: Assert that result_num is zero when result is NULL.

The Coverity check gets confused by the `tbl->results == NULL` check:
due to the check, is assumes that tbl->results *may* be NULL. It then
discovers the dereference in tbl_clear() without realizing that "result"
and "result_num" are linked and that situation can't happen. This
assertion makes this link a bit easier to conclude.

CID: 37966

6 years agoAuto-Merge pull request #2563 from octo/cid/179225
collectd bot [Mon, 20 Nov 2017 12:06:19 +0000 (13:06 +0100)]
Auto-Merge pull request #2563 from octo/cid/179225

Automatically merged due to "Automerge" label

6 years agoAuto-Merge pull request #2562 from octo/cid/179233
collectd bot [Mon, 20 Nov 2017 11:49:09 +0000 (12:49 +0100)]
Auto-Merge pull request #2562 from octo/cid/179233

Automatically merged due to "Automerge" label

6 years agoAuto-Merge pull request #2561 from octo/cid/157643
collectd bot [Mon, 20 Nov 2017 11:36:14 +0000 (12:36 +0100)]
Auto-Merge pull request #2561 from octo/cid/157643

Automatically merged due to "Automerge" label

6 years agoAuto-Merge pull request #2560 from octo/cid/179237
collectd bot [Mon, 20 Nov 2017 11:15:53 +0000 (12:15 +0100)]
Auto-Merge pull request #2560 from octo/cid/179237

Automatically merged due to "Automerge" label

6 years agoAuto-Merge pull request #2559 from octo/cid/179236
collectd bot [Mon, 20 Nov 2017 10:42:03 +0000 (11:42 +0100)]
Auto-Merge pull request #2559 from octo/cid/179236

Automatically merged due to "Automerge" label

6 years agogps plugin: Properly unlock mutex after waiting.
Florian Forster [Mon, 20 Nov 2017 10:21:41 +0000 (11:21 +0100)]
gps plugin: Properly unlock mutex after waiting.

How did this ever work?!

CID: 158522

6 years agowrite_tsdb plugin: Unlock mutex before destroying it.
Florian Forster [Mon, 20 Nov 2017 10:19:52 +0000 (11:19 +0100)]
write_tsdb plugin: Unlock mutex before destroying it.

CID: 179224

6 years agowrite_graphite plugin: Unlock mutex before destroying it.
Florian Forster [Mon, 20 Nov 2017 10:18:32 +0000 (11:18 +0100)]
write_graphite plugin: Unlock mutex before destroying it.

CID: 179225

6 years agoAuto-Merge pull request #2558 from octo/refactor/plugin_load_file
collectd bot [Mon, 20 Nov 2017 10:13:27 +0000 (11:13 +0100)]
Auto-Merge pull request #2558 from octo/refactor/plugin_load_file

Automatically merged due to "Automerge" label

6 years agosrc/utils_ovs.c: Initialize pdb->sock to -1 earlier.
Florian Forster [Mon, 20 Nov 2017 10:13:02 +0000 (11:13 +0100)]
src/utils_ovs.c: Initialize pdb->sock to -1 earlier.

ovs_db_destroy() was called before the field was initialized, leading to
close(0) being called.

6 years agosrc/utils_ovs.c: Assign variable only once.
Florian Forster [Mon, 20 Nov 2017 10:11:22 +0000 (11:11 +0100)]
src/utils_ovs.c: Assign variable only once.

CID: 179233

6 years agoset target: Ensure that int being cast to size_t is positive or zero.
Florian Forster [Mon, 20 Nov 2017 10:04:01 +0000 (11:04 +0100)]
set target: Ensure that int being cast to size_t is positive or zero.

CID: 157643

6 years agowrite_sensu plugin: Unlock mutex before destroying it.
Florian Forster [Mon, 20 Nov 2017 09:50:51 +0000 (10:50 +0100)]
write_sensu plugin: Unlock mutex before destroying it.

CID: 179237

6 years agosrc/utils_format_json.c: Check return values of yajl_gen_* functions.
Florian Forster [Mon, 20 Nov 2017 09:43:10 +0000 (10:43 +0100)]
src/utils_format_json.c: Check return values of yajl_gen_* functions.

CID: 179228, 179236, 179239

6 years agosrc/daemon/plugin.c: Refactor plugin_load_file().
Florian Forster [Mon, 20 Nov 2017 09:16:56 +0000 (10:16 +0100)]
src/daemon/plugin.c: Refactor plugin_load_file().

6 years agoUpdate version to 5.8.0. collectd-5.8.0
Florian Forster [Sat, 18 Nov 2017 08:59:39 +0000 (09:59 +0100)]
Update version to 5.8.0.

6 years agoMerge branch 'collectd-5.8'
Florian Forster [Sat, 18 Nov 2017 08:56:30 +0000 (09:56 +0100)]
Merge branch 'collectd-5.8'

6 years agoMerge branch 'collectd-5.7' into collectd-5.8
Florian Forster [Sat, 18 Nov 2017 08:55:58 +0000 (09:55 +0100)]
Merge branch 'collectd-5.7' into collectd-5.8

6 years agoAuto-Merge pull request #2555 from octo/cid/179231
collectd bot [Fri, 17 Nov 2017 17:32:21 +0000 (18:32 +0100)]
Auto-Merge pull request #2555 from octo/cid/179231

Automatically merged due to "Automerge" label

6 years agoAuto-Merge pull request #2554 from octo/cid/179227
collectd bot [Fri, 17 Nov 2017 17:20:21 +0000 (18:20 +0100)]
Auto-Merge pull request #2554 from octo/cid/179227

Automatically merged due to "Automerge" label

6 years agoAuto-Merge pull request #2553 from octo/cid/179230
collectd bot [Fri, 17 Nov 2017 17:04:45 +0000 (18:04 +0100)]
Auto-Merge pull request #2553 from octo/cid/179230

Automatically merged due to "Automerge" label

6 years agoovs_stats plugin: Fix null dereference of "port".
Florian Forster [Fri, 17 Nov 2017 16:26:28 +0000 (17:26 +0100)]
ovs_stats plugin: Fix null dereference of "port".

This also refactors the ovs_stats_update_iface_ext_ids() function to
handle errors, instead of many nested if blocks.

CID: 179231

6 years agowrite_riemann plugin: Unlock mutex before destroying it.
Florian Forster [Fri, 17 Nov 2017 16:16:39 +0000 (17:16 +0100)]
write_riemann plugin: Unlock mutex before destroying it.

CID: 179227

6 years agoprocesses plugin: Fix check for context switch counters.
Florian Forster [Fri, 17 Nov 2017 16:11:32 +0000 (17:11 +0100)]
processes plugin: Fix check for context switch counters.

CID: 179230

6 years agoAuto-Merge pull request #2550 from octo/cid/179234
collectd bot [Fri, 17 Nov 2017 15:44:07 +0000 (16:44 +0100)]
Auto-Merge pull request #2550 from octo/cid/179234

Automatically merged due to "Automerge" label

6 years agoAuto-Merge pull request #2549 from octo/cid/179240
collectd bot [Fri, 17 Nov 2017 15:32:19 +0000 (16:32 +0100)]
Auto-Merge pull request #2549 from octo/cid/179240

Automatically merged due to "Automerge" label

6 years agoAuto-Merge pull request #2548 from octo/cid/42796
collectd bot [Fri, 17 Nov 2017 15:20:46 +0000 (16:20 +0100)]
Auto-Merge pull request #2548 from octo/cid/42796

Automatically merged due to "Automerge" label

6 years agoAuto-Merge pull request #2547 from octo/cid/81390
collectd bot [Fri, 17 Nov 2017 15:08:50 +0000 (16:08 +0100)]
Auto-Merge pull request #2547 from octo/cid/81390

Automatically merged due to "Automerge" label

6 years agoovs_stats plugin: Minor code cleanup.
Florian Forster [Fri, 17 Nov 2017 14:38:59 +0000 (15:38 +0100)]
ovs_stats plugin: Minor code cleanup.

6 years agoovs_stats plugin: Add missing unlock.
Florian Forster [Fri, 17 Nov 2017 14:37:57 +0000 (15:37 +0100)]
ovs_stats plugin: Add missing unlock.

CID: 179234

6 years agosrc/utils_ovs.c: Random coding style improvements.
Florian Forster [Fri, 17 Nov 2017 14:29:07 +0000 (15:29 +0100)]
src/utils_ovs.c: Random coding style improvements.

6 years agosrc/utils_ovs.c: Don't set pthread_t to -1, use pthread_equal() to compare.
Florian Forster [Fri, 17 Nov 2017 14:28:39 +0000 (15:28 +0100)]
src/utils_ovs.c: Don't set pthread_t to -1, use pthread_equal() to compare.

The assumption that pthread_t is a scalar is not portable.

6 years agosrc/utils_ovs.c: Unlock pdb->mutex before calling ovs_db_callback_remove_all().
Florian Forster [Fri, 17 Nov 2017 14:26:13 +0000 (15:26 +0100)]
src/utils_ovs.c: Unlock pdb->mutex before calling ovs_db_callback_remove_all().

CID: 179240

6 years agogps plugin: Fix double unlock.
Florian Forster [Fri, 17 Nov 2017 14:15:32 +0000 (15:15 +0100)]
gps plugin: Fix double unlock.

CID: 179241

6 years agozfs_arc plugin: Allocate ksp later to avoid memory leak.
Florian Forster [Fri, 17 Nov 2017 14:09:59 +0000 (15:09 +0100)]
zfs_arc plugin: Allocate ksp later to avoid memory leak.

CID: 42796

6 years agoAuto-Merge pull request #2546 from octo/cid/179229
collectd bot [Fri, 17 Nov 2017 14:05:35 +0000 (15:05 +0100)]
Auto-Merge pull request #2546 from octo/cid/179229

Automatically merged due to "Automerge" label

6 years agosnmp plugin: Ensure that index is within bounds.
Florian Forster [Fri, 17 Nov 2017 13:56:06 +0000 (14:56 +0100)]
snmp plugin: Ensure that index is within bounds.

CID: 81389, 81390

6 years agoovs_stats plugin: Fix a memory leak.
Florian Forster [Fri, 17 Nov 2017 13:34:39 +0000 (14:34 +0100)]
ovs_stats plugin: Fix a memory leak.

br_name would leak when jumping to cleanup_fail.

CID: 179229

6 years agoAuto-Merge pull request #2540 from octo/cid/141009
collectd bot [Fri, 17 Nov 2017 13:29:29 +0000 (14:29 +0100)]
Auto-Merge pull request #2540 from octo/cid/141009

Automatically merged due to "Automerge" label

6 years agoAuto-Merge pull request #2539 from octo/cid/179243
collectd bot [Fri, 17 Nov 2017 13:16:58 +0000 (14:16 +0100)]
Auto-Merge pull request #2539 from octo/cid/179243

Automatically merged due to "Automerge" label

6 years agoAuto-Merge pull request #2538 from octo/cid/179244
collectd bot [Fri, 17 Nov 2017 13:05:01 +0000 (14:05 +0100)]
Auto-Merge pull request #2538 from octo/cid/179244

Automatically merged due to "Automerge" label

6 years agolibcollectdclient: Ensure vl->values_len is non-zero.
Florian Forster [Wed, 15 Nov 2017 21:26:11 +0000 (22:26 +0100)]
libcollectdclient: Ensure vl->values_len is non-zero.

That size_t is then used to declare Variable Length Arrays. Hopefully
this helps to convince Coverity that pkg_values and pkg_values_types are
actually fully initialized.

CID: 141009, 141010

6 years agoovs_events plugin: Replace strncpy() with sstrncpy().
Florian Forster [Wed, 15 Nov 2017 21:03:53 +0000 (22:03 +0100)]
ovs_events plugin: Replace strncpy() with sstrncpy().

CID: 179243

6 years agosnmp_agent plugin: Fix memory leak.
Florian Forster [Wed, 15 Nov 2017 20:38:32 +0000 (21:38 +0100)]
snmp_agent plugin: Fix memory leak.

Allocate "entry" later so that the error handling blocks don't leak it.

CID: 179244

6 years agoMerge branch 'collectd-5.7' into collectd-5.8
Florian Forster [Fri, 17 Nov 2017 12:18:00 +0000 (13:18 +0100)]
Merge branch 'collectd-5.7' into collectd-5.8

6 years agoAuto-Merge pull request #2545 from octo/turbostat
collectd bot [Fri, 17 Nov 2017 12:15:19 +0000 (13:15 +0100)]
Auto-Merge pull request #2545 from octo/turbostat

Automatically merged due to "Automerge" label

6 years agocontrib/format.sh src/msr-index.h src/turbostat.c
Florian Forster [Fri, 17 Nov 2017 10:51:43 +0000 (11:51 +0100)]
contrib/format.sh src/msr-index.h src/turbostat.c

6 years agomsr-index: include GPLv2 header
Vincent Brillault [Tue, 26 Sep 2017 17:34:03 +0000 (19:34 +0200)]
msr-index: include GPLv2 header

Signed-off-by: Florian Forster <octo@collectd.org>
6 years agoturbostat: import msr-index header from linux
Vincent Brillault [Mon, 25 Sep 2017 19:21:45 +0000 (21:21 +0200)]
turbostat: import msr-index header from linux

Since Linux 4.12, the kernel does not expose msr-index.h to the userland
anymore. This commit pulls and hardcode the required definitions.

Signed-off-by: Florian Forster <octo@collectd.org>