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

[Florian Forster]

 src/collectd.conf.in   |  1 +
 src/collectd.conf.pod  |  7 ++++++
 src/routeros.c         | 62 ++++++++++++++++++++++++++++++++++++++++++++++++--
 src/write_prometheus.c |  7 +++++-
 4 files changed, 74 insertions(+), 3 deletions(-)

New commits:
commit 733fc645b6389d1f42aef8f1c1631f1db7d58196
Merge: d0c99e9 97967b0
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Sun Jul 8 20:11:28 2018 +0700

    Merge branch 'collectd-5.8' into master

commit d0c99e96294d7a047641028a501afdac9f8ec0ed
Merge: cbac2f1 de454cf
Author: Pavel Rochnyak <pavel2000 at ngs.ru>
Date:   Sun Jul 8 19:47:53 2018 +0700

    Merge pull request #2851 from rpv-tomsk/external-manio-master
    
    routeros: Add support for temperature and voltage data, fixed typo in 'sectors_written' metric name

commit de454cf8a66a597d11db15c88ac2dbf0cff5cf7e
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Sun Jul 8 15:25:51 2018 +0700

    routeros: Fixed typo in 'sectors_written' metric name

commit 0832e872abcf1db9afb80924dbd01ad578c8a657
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Sun Jul 8 15:24:07 2018 +0700

    routeros: Use 'voltage' and 'temperature' as reported types

commit 98c0b6509f4d33d6696d8b581cdf43e8d1ac3015
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Sun Jul 8 13:19:01 2018 +0700

    routeros: Fixed check of 'Collect*' options

commit 34c2754cc44f955a3ca783bdf2e30254739a2f36
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Sun Jul 8 13:17:11 2018 +0700

    routeros: Added conditionals around collect_health code

commit 2d4291e0b1e6618cb44d1c34ea8423f1b44536fe
Author: Mariusz Bialonczyk <manio at skyboo.net>
Date:   Fri Sep 25 11:50:29 2015 +0200

    doc: add information about routeros CollectHealth option

commit f8ce6e1a9f5d02e43e2c97dc810c40f39e3b6e72
Author: Mariusz Bialonczyk <manio at skyboo.net>
Date:   Fri Sep 25 11:44:37 2015 +0200

    routeros: add support for collecting health data
    
    It includes the voltage and temperature data on supported hardware.

commit 97967b03d0b7ded714f038cb55ed17b642809d53
Merge: cd59bf0 2b13220
Author: collectd bot <32910397+collectd-bot at users.noreply.github.com>
Date:   Sat Jul 7 17:31:54 2018 +0200

    Auto-Merge pull request #2850 from rpv-tomsk/collectd-collectd-5.8
    
    Automatically merged due to "Automerge" label

commit 2b13220c508c4bb2faa6baf89c8a057b774f4907
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Sat Jul 7 21:38:07 2018 +0700

    write_prometheus: Added MHD_USE_INTERNAL_POLLING_THREAD flag
    
    Since 0.9.53, libmicrohttpd requires explicit setting of this flag.
    
    Closes: #2849