Merge branch 'collectd-5.4' into collectd-5.5

Conflicts:
	src/write_redis.c

diff --cc configure.ac
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/write_redis.c
index 22e30abb3833687f1a423810f19c1c4860d0efd6,3b8addd2c02e63f9ea8725d2ba431d7253ffb36f..02663c6609c0d5f1923bb5192e718927782eaaa5
--- 1/src/write_redis.c
--- 2/src/write_redis.c
+++ b/src/write_redis.c
@@@ -74,39 -70,10 +74,42 @@@ static int wr_write (const data_set_t *
    value_size = sizeof (value);
    value_ptr = &value[0];
  
 +#define APPEND(...) do {                                             \
 +  status = snprintf (value_ptr, value_size, __VA_ARGS__);            \
 +  if (((size_t) status) > value_size)                                \
 +  {                                                                  \
 +    value_ptr += value_size;                                         \
 +    value_size = 0;                                                  \
 +  }                                                                  \
 +  else                                                               \
 +  {                                                                  \
 +    value_ptr += status;                                             \
 +    value_size -= status;                                            \
 +  }                                                                  \
 +} while (0)
 +
 +  APPEND ("%s:", time);
 +
 +  for (i = 0; i < ds->ds_num; i++)
 +  {
 +    if (ds->ds[i].type == DS_TYPE_COUNTER)
 +      APPEND ("%llu", vl->values[i].counter);
 +    else if (ds->ds[i].type == DS_TYPE_GAUGE)
 +      APPEND (GAUGE_FORMAT, vl->values[i].gauge);
 +    else if (ds->ds[i].type == DS_TYPE_DERIVE)
 +      APPEND ("%"PRIi64, vl->values[i].derive);
 +    else if (ds->ds[i].type == DS_TYPE_ABSOLUTE)
 +      APPEND ("%"PRIu64, vl->values[i].absolute);
 +    else
 +      assert (23 == 42);
 +  }
 +
 +#undef APPEND
 +
+   status = format_values (value_ptr, value_size, ds, vl, /* store rates = */ 0);
    pthread_mutex_lock (&node->lock);
+   if (status != 0)
+     return (status);
  
    if (node->conn == NULL)
    {