Merge branch 'collectd-5.4' into collectd-5.5

diff --cc src/amqp.c
Simple merge

diff --cc src/curl_json.c
Simple merge

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

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

diff --cc src/email.c
Simple merge

diff --cc src/exec.c
Simple merge

diff --cc src/gmond.c
Simple merge

diff --cc src/libcollectdclient/client.c
Simple merge

diff --cc src/modbus.c
Simple merge

diff --cc src/network.c
Simple merge

diff --cc src/ntpd.c
Simple merge

diff --cc src/openvpn.c
Simple merge

diff --cc src/ping.c
Simple merge

diff --cc src/powerdns.c
Simple merge

diff --cc src/snmp.c
index cb2bb36d7bf7add534b4530af9697e879afa7a3d,3dd08e4adacde990e28847925627f2a442986fe7..7e40392c4631f5627856d42b6823aa0646fc9d7a
--- 1/src/snmp.c
--- 2/src/snmp.c
+++ b/src/snmp.c
@@@ -402,12 -402,11 +402,11 @@@ static int csnmp_config_add_data (oconf
    for (i = 0; i < ci->children_num; i++)
    {
      oconfig_item_t *option = ci->children + i;
-     status = 0;
  
      if (strcasecmp ("Type", option->key) == 0)
 -      status = csnmp_config_add_data_type (dd, option);
 +      status = cf_util_get_string(option, &dd->type);
      else if (strcasecmp ("Table", option->key) == 0)
 -      status = csnmp_config_add_data_table (dd, option);
 +      status = cf_util_get_boolean(option, &dd->is_table);
      else if (strcasecmp ("Instance", option->key) == 0)
        status = csnmp_config_add_data_instance (dd, option);
      else if (strcasecmp ("InstancePrefix", option->key) == 0)

diff --cc src/tail.c
index 9ae4139add86a2bb654895f2a8718f8cfde56770,5b9dc53988c46440c839878253385dd097f8d3ad..e5f24d11280ef0eaa250016f2fa66a56e559d30f
--- 1/src/tail.c
--- 2/src/tail.c
+++ b/src/tail.c
@@@ -221,10 -209,8 +221,9 @@@ static int ctail_config_add_match (cu_t
  static int ctail_config_add_file (oconfig_item_t *ci)
  {
    cu_tail_match_t *tm;
 +  cdtime_t interval = 0;
    char *plugin_instance = NULL;
    int num_matches = 0;
-   int status;
    int i;
  
    if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
@@@ -244,15 -230,11 +243,15 @@@
    for (i = 0; i < ci->children_num; i++)
    {
      oconfig_item_t *option = ci->children + i;
+     int status;
  
 -    if (strcasecmp ("Match", option->key) == 0)
 +    if (strcasecmp ("Instance", option->key) == 0)
 +      status = cf_util_get_string (option, &plugin_instance);
 +    else if (strcasecmp ("Interval", option->key) == 0)
 +      cf_util_get_cdtime (option, &interval);
 +    else if (strcasecmp ("Match", option->key) == 0)
      {
 -      status = ctail_config_add_match (tm, plugin_instance, option);
 +      status = ctail_config_add_match (tm, plugin_instance, option, interval);
        if (status == 0)
        num_matches++;
        /* Be mild with failed matches.. */

diff --cc src/threshold.c
Simple merge