Merge branch 'collectd-5.4' into collectd-5.5

diff --cc src/Makefile.am
index 9839c03a3358a6d82b79381d3bbb4c69cd88ace0,62f98751f05e8efb7ffba40aece71e72732cddf0..c718621e974a0addd969705d85f484f50ec3b1b8
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -953,8 -1094,10 +953,8 @@@ if BUILD_PLUGIN_STATS
  pkglib_LTLIBRARIES += statsd.la
  statsd_la_SOURCES = statsd.c \
                      utils_latency.h utils_latency.c
 -statsd_la_LDFLAGS = -module -avoid-version
 +statsd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
- statsd_la_LIBADD = -lpthread
+ statsd_la_LIBADD = -lpthread -lm
 -collectd_LDADD += "-dlopen" statsd.la
 -collectd_DEPENDENCIES += statsd.la
  endif
  
  if BUILD_PLUGIN_SWAP

diff --cc src/daemon/collectd.c
Simple merge

diff --cc src/daemon/configfile.c
Simple merge

diff --cc src/df.c
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/table.c
Simple merge

diff --cc src/threshold.c
index 882f95535aa3718ed0d057293992dccc21fc7ef1,4a840bb9c7145970044ba5f156efd2e7e24cae96..a8900db76ce280aed62a1959f3d7ec84fcfda10c
--- 1/src/threshold.c
--- 2/src/threshold.c
+++ b/src/threshold.c
@@@ -516,11 -626,7 +516,9 @@@ static int ut_report_state (const data_
            ": Value is no longer missing.");
      else
        status = ssnprintf (buf, bufsize,
 -          ": All data sources are within range again.");
 +          ": All data sources are within range again. "
 +          "Current value of \"%s\" is %f.",
 +          ds->ds[ds_index].name, values[ds_index]);
-     buf += status;
-     bufsize -= status;
    }
    else
    {

diff --cc src/utils_db_query.c
Simple merge

diff --cc src/virt.c
Simple merge