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

[Florian Forster]

 src/amqp1.c           |  103 +++++++++++++++++++------------------------------
 src/collectd.conf.in  |    2 +
 src/collectd.conf.pod |   26 ++++++++++---
 src/modbus.c          |   78 +++++++++++++++++++++++++++++--------
 4 files changed, 125 insertions(+), 84 deletions(-)

New commits:
commit 72d69048198a8d5f351a7cbd67cbc0311cbf1b8c
Merge: 0d5f3a0 a74efda
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Thu May 24 20:24:28 2018 +0200

    Merge pull request #2797 from rubenk/amqp-cleanups
    
    Amqp1 cleanups

commit 0d5f3a040375be8936a85614e31c589f668cebaf
Merge: f11cb15 fe33f28
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Thu May 24 21:27:59 2018 +0700

    Merge pull request #2729 from cekstam/add-scale-and-shift-to-modbus

commit f11cb153816269a7888b0b94627b806e9f5ce327
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Thu May 24 21:24:41 2018 +0700

    modbus: polished code style

commit 9b2d6a2792ef579fca5c03a2076c1e05f4b93507
Merge: b59f84f a4bb32f
Author: Pavel Rochnyak <pavel2000 at ngs.ru>
Date:   Thu May 24 21:13:10 2018 +0700

    Merge pull request #2670 from antvick/feature/modbus_64bit
    
    modbus: Add support for 64 bit vals and update docs

commit a74efda2fb10bdfb4af9e9e3e7a4b11dfddb6452
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Thu May 24 13:55:12 2018 +0200

    amqp1 plugin: remove unneccesary cast

commit 0a8ac823f4cc79adc29b64ad2f9e8231d8b7397d
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Thu May 24 13:47:59 2018 +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.

commit 8b61d5470231446eef24ddfbedd028e7d78c005c
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Thu May 24 13:27:51 2018 +0200

    amqp1 plugin: use bool for boolean variable
    
    event_thread_running is only ever 0 or 1 so use a bool

commit 0a9dc5f8443de4fa54153ad4517e764b43f86b5e
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Thu May 24 13:26:16 2018 +0200

    amqp1 plugin: no need to initialize statics

commit fe33f28cb313fd0b5d71173898056ea42edeeada
Author: Christian Ekstam <chek01 at management.datacenter.se>
Date:   Fri Apr 20 10:50:53 2018 +0200

    trying again

commit 8270e0d09971aecd4ea32360486f18ea578a93e2
Author: cekstam <christian.ekstam at gmail.com>
Date:   Tue Mar 27 16:31:13 2018 +0200

    Now with updated clang-format

commit 3127b45acf1af66b849cb83e02843b5efad18362
Author: cekstam <christian.ekstam at gmail.com>
Date:   Tue Mar 27 15:08:08 2018 +0200

    Read CONTRIBUTING.md, but obviously got it wrong

commit 60280b80416be023d0d4a23a6a967da3f8865b75
Author: cekstam <christian.ekstam at gmail.com>
Date:   Tue Mar 27 14:11:52 2018 +0200

    correcting all the wrongs
    
    , data->scale, data->shift

commit 938897a27dc7f5a68c81a4e3dae78b99bd5ad841
Author: cekstam <christian.ekstam at gmail.com>
Date:   Tue Mar 27 13:15:28 2018 +0200

    Add scale and shift to modbus plugin
    
    Adding a Scale and Shift parameter to the modbus plugin in order to correct amplifed data

commit a4bb32fe599ea4ddab39a5994ee478675da18cc2
Author: Anthony Vickers <av at cityscience.com>
Date:   Fri Feb 2 15:36:14 2018 +0000

    Add support for Modbus 64 bit vals and update docs
    
    Add support for reading Int64 and Uint64 from four 16 bit registers.
    Update config document to explain new feature added.