Merge branch 'collectd-5.4' into collectd-5.5

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

diff --cc src/email.c
Simple merge

diff --cc src/ping.c
Simple merge

diff --cc src/postgresql.c
Simple merge

diff --cc src/python.c
Simple merge

diff --cc src/tail.c
index 3904f1be201acb31c089057bfe189d78e7e8c5ed,72d97a385245b1918c89c2a42d0e0f2a5287a44c..708cd2a32737e0a10678bc7d650c48c4c6029ba8
--- 1/src/tail.c
--- 2/src/tail.c
+++ b/src/tail.c
@@@ -243,17 -230,13 +243,17 @@@ static int ctail_config_add_file (oconf
    for (i = 0; i < ci->children_num; i++)
    {
      oconfig_item_t *option = ci->children + i;
 -    int status;
 +    int status = 0;
  
 -    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++;
+         num_matches++;
        /* Be mild with failed matches.. */
        status = 0;
      }