[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 docs/BUILD.dpdkstat.md |   12 +++++++++++-
 src/intel_pmu.c        |   38 ++++++++++++++++++++++----------------
 src/ipmi.c             |    2 +-
 src/write_kafka.c      |   10 +++++++++-
 src/write_prometheus.c |   10 ++++++++++
 5 files changed, 53 insertions(+), 19 deletions(-)

New commits:
commit 7ef225022164d12f4560d03789c9d418b442d4cf
Merge: 4355f4c 1159cb5
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Mon Feb 19 16:14:24 2018 +0100

    Merge branch 'collectd-5.8'

commit 1159cb5d383c55a80a0db100b8f7aadcf44740a5
Merge: a68a482 ad0a129
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Mon Feb 19 16:14:01 2018 +0100

    Merge branch 'collectd-5.7' into collectd-5.8

commit a68a482c6ea1900e4f758019117a6856737ff34d
Merge: 4012a0e 1d80ea3
Author: Pavel Rochnyak <pavel2000 at ngs.ru>
Date:   Mon Feb 12 15:20:10 2018 +0700

    Merge pull request #2676 from elfiesmelfie/fix_intel_pmu_crash
    
    intel_pmu: fix for possible null pointer dereference

commit 1d80ea3884c8116f32d7f47de3a263a9da426e37
Author: Kamil Wiatrowski <kamilx.wiatrowski at intel.com>
Date:   Mon Feb 5 13:57:13 2018 +0000

    intel_pmu: fix for possible null pointer dereference
    
    Null pointer dereference could occur for invalid first hardware event.
    In pmu_add_hw_events if the first event was not resolved, on the second
    iteration the eventlist_last could be dereferenced to mark previous
    event as group leader.
    
    Change-Id: Ic2a2a3572d6835ca892d71f3e66812f356592d9e
    Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski at intel.com>

commit ad0a12907bf80b4f0deec217b8379dd08c490dbc
Merge: 35a6c9c 2c78bdf
Author: Pavel Rochnyak <pavel2000 at ngs.ru>
Date:   Sat Feb 10 18:23:08 2018 +0700

    Merge pull request #2684 from rpv-tomsk/fix-2673
    
    write_prometheus: Set SO_REUSEADDR on listening socket

commit 35a6c9c5fcd87cb78451a974c4d5b5707926845c
Merge: 7536b41 13fa69a
Author: Pavel Rochnyak <pavel2000 at ngs.ru>
Date:   Sat Feb 10 18:19:02 2018 +0700

    Merge pull request #2613 from elfiesmelfie/update_dpdk_note
    
    docs: update dpdkstats documentation

commit 2c78bdf94c0fdd6240d5d202cf5aba12ac8c5a20
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Sat Feb 10 17:46:30 2018 +0700

    write_prometheus: Set SO_REUSEADDR on listening socket
    
    Otherwise Collectd fails to bind the socket after restart.
    
    Thanks to Richard Weinberger and Brandon Hume for reporting.
    
    Closes: #2570
    Closes: #2673

commit 7536b41b8dee524307d3f9d4bf8773b7ec8314f0
Merge: cc61d3a 6c2eb3a
Author: collectd bot <32910397+collectd-bot at users.noreply.github.com>
Date:   Sat Feb 10 11:12:50 2018 +0100

    Auto-Merge pull request #2683 from rpv-tomsk/fix-2607
    
    Automatically merged due to "Automerge" label

commit 6c2eb3ad28f08f7e774b6eaea5ae01b0857cf884
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Sat Feb 10 09:20:41 2018 +0000

    write_kafka: 'rd_kafka_errno2err' is deprecated, fix failed builds
    
    Since librdkafka-0.11.0 applications should use rd_kafka_last_error()
    to retrieve the error code from the legacy APIs.
    
    Thanks to hikdo.
    
    Closes: #2607
    Closes: #2628
    Closes: #2640

commit 13fa69a159fde3549cad939b6bd83b2cb1ddaa68
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date:   Fri Jan 26 11:41:57 2018 +0000

    Update BUILD.dpdkstat.md
    
    fixed trailing word "Version"

commit 4012a0e3328806fa682411eea0382e5087bd80cc
Merge: b5e2928 39ef2f9
Author: collectd bot <32910397+collectd-bot at users.noreply.github.com>
Date:   Tue Dec 19 15:09:45 2017 +0100

    Auto-Merge pull request #2629 from rpv-tomsk/fix-2626
    
    Automatically merged due to "Automerge" label

commit 39ef2f94ba6ba524146ddfa9365b57c3a73308b1
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Tue Dec 19 20:30:12 2017 +0700

    ipmi plugin: Fix broken 'Sensor' configuration option

commit f7c01f813d19803b4fc95730a4da5db9725954b1
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date:   Tue Dec 12 16:36:52 2017 +0000

    docs: dpdk extended the initial note

commit 19a024b9e2711c6480abe0b7d61af70dbba2242f
Author: Maryam Tahhan <maryam.tahhan at intel.com>
Date:   Mon Dec 11 16:14:20 2017 +0000

    docs: update dpdkstats documentation
    
    Update the dpdkstats documentation to state that it shouldn't be used with
    OVS-with-DPDK. The Open vSwitch plugins is what should be used.
    
    Signed-off-by: Maryam Tahhan <maryam.tahhan at intel.com>