Merging upstream version 1.11.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 900 deletions

diff --git a/src/health_config.c b/src/health_config.c
deleted file mode 100644
index a25ee7227..000000000
--- a/src/health_config.c
+++ /dev/null
@@ -1,900 +0,0 @@
-#define NETDATA_HEALTH_INTERNALS
-#include "common.h"
-
-#define HEALTH_CONF_MAX_LINE 4096
-
-#define HEALTH_ALARM_KEY "alarm"
-#define HEALTH_TEMPLATE_KEY "template"
-#define HEALTH_ON_KEY "on"
-#define HEALTH_HOST_KEY "hosts"
-#define HEALTH_OS_KEY "os"
-#define HEALTH_FAMILIES_KEY "families"
-#define HEALTH_LOOKUP_KEY "lookup"
-#define HEALTH_CALC_KEY "calc"
-#define HEALTH_EVERY_KEY "every"
-#define HEALTH_GREEN_KEY "green"
-#define HEALTH_RED_KEY "red"
-#define HEALTH_WARN_KEY "warn"
-#define HEALTH_CRIT_KEY "crit"
-#define HEALTH_EXEC_KEY "exec"
-#define HEALTH_RECIPIENT_KEY "to"
-#define HEALTH_UNITS_KEY "units"
-#define HEALTH_INFO_KEY "info"
-#define HEALTH_DELAY_KEY "delay"
-#define HEALTH_OPTIONS_KEY "options"
-
-static inline int rrdcalc_add_alarm_from_config(RRDHOST *host, RRDCALC *rc) {
-    if(!rc->chart) {
-        error("Health configuration for alarm '%s' does not have a chart", rc->name);
-        return 0;
-    }
-
-    if(!rc->update_every) {
-        error("Health configuration for alarm '%s.%s' has no frequency (parameter 'every'). Ignoring it.", rc->chart?rc->chart:"NOCHART", rc->name);
-        return 0;
-    }
-
-    if(!RRDCALC_HAS_DB_LOOKUP(rc) && !rc->calculation && !rc->warning && !rc->critical) {
-        error("Health configuration for alarm '%s.%s' is useless (no db lookup, no calculation, no warning and no critical expressions)", rc->chart?rc->chart:"NOCHART", rc->name);
-        return 0;
-    }
-
-    if (rrdcalc_exists(host, rc->chart, rc->name, rc->hash_chart, rc->hash))
-        return 0;
-
-    rc->id = rrdcalc_get_unique_id(host, rc->chart, rc->name, &rc->next_event_id);
-
-    debug(D_HEALTH, "Health configuration adding alarm '%s.%s' (%u): exec '%s', recipient '%s', green " CALCULATED_NUMBER_FORMAT_AUTO ", red " CALCULATED_NUMBER_FORMAT_AUTO ", lookup: group %d, after %d, before %d, options %u, dimensions '%s', update every %d, calculation '%s', warning '%s', critical '%s', source '%s', delay up %d, delay down %d, delay max %d, delay_multiplier %f",
-            rc->chart?rc->chart:"NOCHART",
-            rc->name,
-            rc->id,
-            (rc->exec)?rc->exec:"DEFAULT",
-            (rc->recipient)?rc->recipient:"DEFAULT",
-            rc->green,
-            rc->red,
-            rc->group,
-            rc->after,
-            rc->before,
-            rc->options,
-            (rc->dimensions)?rc->dimensions:"NONE",
-            rc->update_every,
-            (rc->calculation)?rc->calculation->parsed_as:"NONE",
-            (rc->warning)?rc->warning->parsed_as:"NONE",
-            (rc->critical)?rc->critical->parsed_as:"NONE",
-            rc->source,
-            rc->delay_up_duration,
-            rc->delay_down_duration,
-            rc->delay_max_duration,
-            rc->delay_multiplier
-    );
-
-    rrdcalc_create_part2(host, rc);
-    return 1;
-}
-
-static inline int rrdcalctemplate_add_template_from_config(RRDHOST *host, RRDCALCTEMPLATE *rt) {
-    if(unlikely(!rt->context)) {
-        error("Health configuration for template '%s' does not have a context", rt->name);
-        return 0;
-    }
-
-    if(unlikely(!rt->update_every)) {
-        error("Health configuration for template '%s' has no frequency (parameter 'every'). Ignoring it.", rt->name);
-        return 0;
-    }
-
-    if(unlikely(!RRDCALCTEMPLATE_HAS_CALCULATION(rt) && !rt->warning && !rt->critical)) {
-        error("Health configuration for template '%s' is useless (no calculation, no warning and no critical evaluation)", rt->name);
-        return 0;
-    }
-
-    RRDCALCTEMPLATE *t, *last = NULL;
-    for (t = host->templates; t ; last = t, t = t->next) {
-        if(unlikely(t->hash_name == rt->hash_name
-                    && !strcmp(t->name, rt->name)
-                    && !strcmp(t->family_match?t->family_match:"*", rt->family_match?rt->family_match:"*")
-        )) {
-            error("Health configuration template '%s' already exists for host '%s'.", rt->name, host->hostname);
-            return 0;
-        }
-    }
-
-    debug(D_HEALTH, "Health configuration adding template '%s': context '%s', exec '%s', recipient '%s', green " CALCULATED_NUMBER_FORMAT_AUTO ", red " CALCULATED_NUMBER_FORMAT_AUTO ", lookup: group %d, after %d, before %d, options %u, dimensions '%s', update every %d, calculation '%s', warning '%s', critical '%s', source '%s', delay up %d, delay down %d, delay max %d, delay_multiplier %f",
-            rt->name,
-            (rt->context)?rt->context:"NONE",
-            (rt->exec)?rt->exec:"DEFAULT",
-            (rt->recipient)?rt->recipient:"DEFAULT",
-            rt->green,
-            rt->red,
-            rt->group,
-            rt->after,
-            rt->before,
-            rt->options,
-            (rt->dimensions)?rt->dimensions:"NONE",
-            rt->update_every,
-            (rt->calculation)?rt->calculation->parsed_as:"NONE",
-            (rt->warning)?rt->warning->parsed_as:"NONE",
-            (rt->critical)?rt->critical->parsed_as:"NONE",
-            rt->source,
-            rt->delay_up_duration,
-            rt->delay_down_duration,
-            rt->delay_max_duration,
-            rt->delay_multiplier
-    );
-
-    if(likely(last)) {
-        last->next = rt;
-    }
-    else {
-        rt->next = host->templates;
-        host->templates = rt;
-    }
-
-    return 1;
-}
-
-static inline int health_parse_duration(char *string, int *result) {
-    // make sure it is a number
-    if(!*string || !(isdigit(*string) || *string == '+' || *string == '-')) {
-        *result = 0;
-        return 0;
-    }
-
-    char *e = NULL;
-    calculated_number n = str2ld(string, &e);
-    if(e && *e) {
-        switch (*e) {
-            case 'Y':
-                *result = (int) (n * 86400 * 365);
-                break;
-            case 'M':
-                *result = (int) (n * 86400 * 30);
-                break;
-            case 'w':
-                *result = (int) (n * 86400 * 7);
-                break;
-            case 'd':
-                *result = (int) (n * 86400);
-                break;
-            case 'h':
-                *result = (int) (n * 3600);
-                break;
-            case 'm':
-                *result = (int) (n * 60);
-                break;
-
-            default:
-            case 's':
-                *result = (int) (n);
-                break;
-        }
-    }
-    else
-        *result = (int)(n);
-
-    return 1;
-}
-
-static inline int health_parse_delay(
-        size_t line, const char *path, const char *file, char *string,
-        int *delay_up_duration,
-        int *delay_down_duration,
-        int *delay_max_duration,
-        float *delay_multiplier) {
-
-    char given_up = 0;
-    char given_down = 0;
-    char given_max = 0;
-    char given_multiplier = 0;
-
-    char *s = string;
-    while(*s) {
-        char *key = s;
-
-        while(*s && !isspace(*s)) s++;
-        while(*s && isspace(*s)) *s++ = '\0';
-
-        if(!*key) break;
-
-        char *value = s;
-        while(*s && !isspace(*s)) s++;
-        while(*s && isspace(*s)) *s++ = '\0';
-
-        if(!strcasecmp(key, "up")) {
-            if (!health_parse_duration(value, delay_up_duration)) {
-                error("Health configuration at line %zu of file '%s/%s': invalid value '%s' for '%s' keyword",
-                        line, path, file, value, key);
-            }
-            else given_up = 1;
-        }
-        else if(!strcasecmp(key, "down")) {
-            if (!health_parse_duration(value, delay_down_duration)) {
-                error("Health configuration at line %zu of file '%s/%s': invalid value '%s' for '%s' keyword",
-                        line, path, file, value, key);
-            }
-            else given_down = 1;
-        }
-        else if(!strcasecmp(key, "multiplier")) {
-            *delay_multiplier = strtof(value, NULL);
-            if(isnan(*delay_multiplier) || isinf(*delay_multiplier) || islessequal(*delay_multiplier, 0)) {
-                error("Health configuration at line %zu of file '%s/%s': invalid value '%s' for '%s' keyword",
-                        line, path, file, value, key);
-            }
-            else given_multiplier = 1;
-        }
-        else if(!strcasecmp(key, "max")) {
-            if (!health_parse_duration(value, delay_max_duration)) {
-                error("Health configuration at line %zu of file '%s/%s': invalid value '%s' for '%s' keyword",
-                        line, path, file, value, key);
-            }
-            else given_max = 1;
-        }
-        else {
-            error("Health configuration at line %zu of file '%s/%s': unknown keyword '%s'",
-                    line, path, file, key);
-        }
-    }
-
-    if(!given_up)
-        *delay_up_duration = 0;
-
-    if(!given_down)
-        *delay_down_duration = 0;
-
-    if(!given_multiplier)
-        *delay_multiplier = 1.0;
-
-    if(!given_max) {
-        if((*delay_max_duration) < (*delay_up_duration) * (*delay_multiplier))
-            *delay_max_duration = (int)((*delay_up_duration) * (*delay_multiplier));
-
-        if((*delay_max_duration) < (*delay_down_duration) * (*delay_multiplier))
-            *delay_max_duration = (int)((*delay_down_duration) * (*delay_multiplier));
-    }
-
-    return 1;
-}
-
-static inline uint32_t health_parse_options(const char *s) {
-    uint32_t options = 0;
-    char buf[100+1] = "";
-
-    while(*s) {
-        buf[0] = '\0';
-
-        // skip spaces
-        while(*s && isspace(*s))
-            s++;
-
-        // find the next space
-        size_t count = 0;
-        while(*s && count < 100 && !isspace(*s))
-            buf[count++] = *s++;
-
-        if(buf[0]) {
-            buf[count] = '\0';
-
-            if(!strcasecmp(buf, "no-clear-notification") || !strcasecmp(buf, "no-clear"))
-                options |= RRDCALC_FLAG_NO_CLEAR_NOTIFICATION;
-            else
-                error("Ignoring unknown alarm option '%s'", buf);
-        }
-    }
-
-    return options;
-}
-
-static inline int health_parse_db_lookup(
-        size_t line, const char *path, const char *file, char *string,
-        int *group_method, int *after, int *before, int *every,
-        uint32_t *options, char **dimensions
-) {
-    debug(D_HEALTH, "Health configuration parsing database lookup %zu@%s/%s: %s", line, path, file, string);
-
-    if(*dimensions) freez(*dimensions);
-    *dimensions = NULL;
-    *after = 0;
-    *before = 0;
-    *every = 0;
-    *options = 0;
-
-    char *s = string, *key;
-
-    // first is the group method
-    key = s;
-    while(*s && !isspace(*s)) s++;
-    while(*s && isspace(*s)) *s++ = '\0';
-    if(!*s) {
-        error("Health configuration invalid chart calculation at line %zu of file '%s/%s': expected group method followed by the 'after' time, but got '%s'",
-                line, path, file, key);
-        return 0;
-    }
-
-    if((*group_method = web_client_api_request_v1_data_group(key, -1)) == -1) {
-        error("Health configuration at line %zu of file '%s/%s': invalid group method '%s'",
-                line, path, file, key);
-        return 0;
-    }
-
-    // then is the 'after' time
-    key = s;
-    while(*s && !isspace(*s)) s++;
-    while(*s && isspace(*s)) *s++ = '\0';
-
-    if(!health_parse_duration(key, after)) {
-        error("Health configuration at line %zu of file '%s/%s': invalid duration '%s' after group method",
-                line, path, file, key);
-        return 0;
-    }
-
-    // sane defaults
-    *every = abs(*after);
-
-    // now we may have optional parameters
-    while(*s) {
-        key = s;
-        while(*s && !isspace(*s)) s++;
-        while(*s && isspace(*s)) *s++ = '\0';
-        if(!*key) break;
-
-        if(!strcasecmp(key, "at")) {
-            char *value = s;
-            while(*s && !isspace(*s)) s++;
-            while(*s && isspace(*s)) *s++ = '\0';
-
-            if (!health_parse_duration(value, before)) {
-                error("Health configuration at line %zu of file '%s/%s': invalid duration '%s' for '%s' keyword",
-                        line, path, file, value, key);
-            }
-        }
-        else if(!strcasecmp(key, HEALTH_EVERY_KEY)) {
-            char *value = s;
-            while(*s && !isspace(*s)) s++;
-            while(*s && isspace(*s)) *s++ = '\0';
-
-            if (!health_parse_duration(value, every)) {
-                error("Health configuration at line %zu of file '%s/%s': invalid duration '%s' for '%s' keyword",
-                        line, path, file, value, key);
-            }
-        }
-        else if(!strcasecmp(key, "absolute") || !strcasecmp(key, "abs") || !strcasecmp(key, "absolute_sum")) {
-            *options |= RRDR_OPTION_ABSOLUTE;
-        }
-        else if(!strcasecmp(key, "min2max")) {
-            *options |= RRDR_OPTION_MIN2MAX;
-        }
-        else if(!strcasecmp(key, "null2zero")) {
-            *options |= RRDR_OPTION_NULL2ZERO;
-        }
-        else if(!strcasecmp(key, "percentage")) {
-            *options |= RRDR_OPTION_PERCENTAGE;
-        }
-        else if(!strcasecmp(key, "unaligned")) {
-            *options |= RRDR_OPTION_NOT_ALIGNED;
-        }
-        else if(!strcasecmp(key, "match-ids") || !strcasecmp(key, "match_ids")) {
-            *options |= RRDR_OPTION_MATCH_IDS;
-        }
-        else if(!strcasecmp(key, "match-names") || !strcasecmp(key, "match_names")) {
-            *options |= RRDR_OPTION_MATCH_NAMES;
-        }
-        else if(!strcasecmp(key, "of")) {
-            if(*s && strcasecmp(s, "all") != 0)
-                *dimensions = strdupz(s);
-            break;
-        }
-        else {
-            error("Health configuration at line %zu of file '%s/%s': unknown keyword '%s'",
-                    line, path, file, key);
-        }
-    }
-
-    return 1;
-}
-
-static inline char *health_source_file(size_t line, const char *path, const char *filename) {
-    char buffer[FILENAME_MAX + 1];
-    snprintfz(buffer, FILENAME_MAX, "%zu@%s/%s", line, path, filename);
-    return strdupz(buffer);
-}
-
-static inline void strip_quotes(char *s) {
-    while(*s) {
-        if(*s == '\'' || *s == '"') *s = ' ';
-        s++;
-    }
-}
-
-int health_readfile(RRDHOST *host, const char *path, const char *filename) {
-    debug(D_HEALTH, "Health configuration reading file '%s/%s'", path, filename);
-
-    static uint32_t
-            hash_alarm = 0,
-            hash_template = 0,
-            hash_os = 0,
-            hash_on = 0,
-            hash_host = 0,
-            hash_families = 0,
-            hash_calc = 0,
-            hash_green = 0,
-            hash_red = 0,
-            hash_warn = 0,
-            hash_crit = 0,
-            hash_exec = 0,
-            hash_every = 0,
-            hash_lookup = 0,
-            hash_units = 0,
-            hash_info = 0,
-            hash_recipient = 0,
-            hash_delay = 0,
-            hash_options = 0;
-
-    char buffer[HEALTH_CONF_MAX_LINE + 1];
-
-    if(unlikely(!hash_alarm)) {
-        hash_alarm = simple_uhash(HEALTH_ALARM_KEY);
-        hash_template = simple_uhash(HEALTH_TEMPLATE_KEY);
-        hash_on = simple_uhash(HEALTH_ON_KEY);
-        hash_os = simple_uhash(HEALTH_OS_KEY);
-        hash_host = simple_uhash(HEALTH_HOST_KEY);
-        hash_families = simple_uhash(HEALTH_FAMILIES_KEY);
-        hash_calc = simple_uhash(HEALTH_CALC_KEY);
-        hash_lookup = simple_uhash(HEALTH_LOOKUP_KEY);
-        hash_green = simple_uhash(HEALTH_GREEN_KEY);
-        hash_red = simple_uhash(HEALTH_RED_KEY);
-        hash_warn = simple_uhash(HEALTH_WARN_KEY);
-        hash_crit = simple_uhash(HEALTH_CRIT_KEY);
-        hash_exec = simple_uhash(HEALTH_EXEC_KEY);
-        hash_every = simple_uhash(HEALTH_EVERY_KEY);
-        hash_units = simple_hash(HEALTH_UNITS_KEY);
-        hash_info = simple_hash(HEALTH_INFO_KEY);
-        hash_recipient = simple_hash(HEALTH_RECIPIENT_KEY);
-        hash_delay = simple_uhash(HEALTH_DELAY_KEY);
-        hash_options = simple_uhash(HEALTH_OPTIONS_KEY);
-    }
-
-    snprintfz(buffer, HEALTH_CONF_MAX_LINE, "%s/%s", path, filename);
-    FILE *fp = fopen(buffer, "r");
-    if(!fp) {
-        error("Health configuration cannot read file '%s'.", buffer);
-        return 0;
-    }
-
-    RRDCALC *rc = NULL;
-    RRDCALCTEMPLATE *rt = NULL;
-
-    int ignore_this = 0;
-    size_t line = 0, append = 0;
-    char *s;
-    while((s = fgets(&buffer[append], (int)(HEALTH_CONF_MAX_LINE - append), fp)) || append) {
-        int stop_appending = !s;
-        line++;
-        s = trim(buffer);
-        if(!s || *s == '#') continue;
-
-        append = strlen(s);
-        if(!stop_appending && s[append - 1] == '\\') {
-            s[append - 1] = ' ';
-            append = &s[append] - buffer;
-            if(append < HEALTH_CONF_MAX_LINE)
-                continue;
-            else {
-                error("Health configuration has too long muli-line at line %zu of file '%s/%s'.", line, path, filename);
-            }
-        }
-        append = 0;
-
-        char *key = s;
-        while(*s && *s != ':') s++;
-        if(!*s) {
-            error("Health configuration has invalid line %zu of file '%s/%s'. It does not contain a ':'. Ignoring it.", line, path, filename);
-            continue;
-        }
-        *s = '\0';
-        s++;
-
-        char *value = s;
-        key = trim_all(key);
-        value = trim_all(value);
-
-        if(!key) {
-            error("Health configuration has invalid line %zu of file '%s/%s'. Keyword is empty. Ignoring it.", line, path, filename);
-            continue;
-        }
-
-        if(!value) {
-            error("Health configuration has invalid line %zu of file '%s/%s'. value is empty. Ignoring it.", line, path, filename);
-            continue;
-        }
-
-        uint32_t hash = simple_uhash(key);
-
-        if(hash == hash_alarm && !strcasecmp(key, HEALTH_ALARM_KEY)) {
-            if (rc && (ignore_this || !rrdcalc_add_alarm_from_config(host, rc)))
-                rrdcalc_free(rc);
-
-            if(rt) {
-                if (ignore_this || !rrdcalctemplate_add_template_from_config(host, rt))
-                    rrdcalctemplate_free(rt);
-
-                rt = NULL;
-            }
-
-            rc = callocz(1, sizeof(RRDCALC));
-            rc->next_event_id = 1;
-            rc->name = strdupz(value);
-            rc->hash = simple_hash(rc->name);
-            rc->source = health_source_file(line, path, filename);
-            rc->green = NAN;
-            rc->red = NAN;
-            rc->value = NAN;
-            rc->old_value = NAN;
-            rc->delay_multiplier = 1.0;
-
-            if(rrdvar_fix_name(rc->name))
-                error("Health configuration renamed alarm '%s' to '%s'", value, rc->name);
-
-            ignore_this = 0;
-        }
-        else if(hash == hash_template && !strcasecmp(key, HEALTH_TEMPLATE_KEY)) {
-            if(rc) {
-                if(ignore_this || !rrdcalc_add_alarm_from_config(host, rc))
-                    rrdcalc_free(rc);
-
-                rc = NULL;
-            }
-
-            if(rt && (ignore_this || !rrdcalctemplate_add_template_from_config(host, rt)))
-                rrdcalctemplate_free(rt);
-
-            rt = callocz(1, sizeof(RRDCALCTEMPLATE));
-            rt->name = strdupz(value);
-            rt->hash_name = simple_hash(rt->name);
-            rt->source = health_source_file(line, path, filename);
-            rt->green = NAN;
-            rt->red = NAN;
-            rt->delay_multiplier = 1.0;
-
-            if(rrdvar_fix_name(rt->name))
-                error("Health configuration renamed template '%s' to '%s'", value, rt->name);
-
-            ignore_this = 0;
-        }
-        else if(hash == hash_os && !strcasecmp(key, HEALTH_OS_KEY)) {
-            char *os_match = value;
-            SIMPLE_PATTERN *os_pattern = simple_pattern_create(os_match, NULL, SIMPLE_PATTERN_EXACT);
-
-            if(!simple_pattern_matches(os_pattern, host->os)) {
-                if(rc)
-                    debug(D_HEALTH, "HEALTH on '%s' ignoring alarm '%s' defined at %zu@%s/%s: host O/S does not match '%s'", host->hostname, rc->name, line, path, filename, os_match);
-
-                if(rt)
-                    debug(D_HEALTH, "HEALTH on '%s' ignoring template '%s' defined at %zu@%s/%s: host O/S does not match '%s'", host->hostname, rt->name, line, path, filename, os_match);
-
-                ignore_this = 1;
-            }
-
-            simple_pattern_free(os_pattern);
-        }
-        else if(hash == hash_host && !strcasecmp(key, HEALTH_HOST_KEY)) {
-            char *host_match = value;
-            SIMPLE_PATTERN *host_pattern = simple_pattern_create(host_match, NULL, SIMPLE_PATTERN_EXACT);
-
-            if(!simple_pattern_matches(host_pattern, host->hostname)) {
-                if(rc)
-                    debug(D_HEALTH, "HEALTH on '%s' ignoring alarm '%s' defined at %zu@%s/%s: hostname does not match '%s'", host->hostname, rc->name, line, path, filename, host_match);
-
-                if(rt)
-                    debug(D_HEALTH, "HEALTH on '%s' ignoring template '%s' defined at %zu@%s/%s: hostname does not match '%s'", host->hostname, rt->name, line, path, filename, host_match);
-
-                ignore_this = 1;
-            }
-
-            simple_pattern_free(host_pattern);
-        }
-        else if(rc) {
-            if(hash == hash_on && !strcasecmp(key, HEALTH_ON_KEY)) {
-                if(rc->chart) {
-                    if(strcmp(rc->chart, value) != 0)
-                        error("Health configuration at line %zu of file '%s/%s' for alarm '%s' has key '%s' twice, once with value '%s' and later with value '%s'. Using ('%s').",
-                                line, path, filename, rc->name, key, rc->chart, value, value);
-
-                    freez(rc->chart);
-                }
-                rc->chart = strdupz(value);
-                rc->hash_chart = simple_hash(rc->chart);
-            }
-            else if(hash == hash_lookup && !strcasecmp(key, HEALTH_LOOKUP_KEY)) {
-                health_parse_db_lookup(line, path, filename, value, &rc->group, &rc->after, &rc->before,
-                        &rc->update_every,
-                        &rc->options, &rc->dimensions);
-            }
-            else if(hash == hash_every && !strcasecmp(key, HEALTH_EVERY_KEY)) {
-                if(!health_parse_duration(value, &rc->update_every))
-                    error("Health configuration at line %zu of file '%s/%s' for alarm '%s' at key '%s' cannot parse duration: '%s'.",
-                            line, path, filename, rc->name, key, value);
-            }
-            else if(hash == hash_green && !strcasecmp(key, HEALTH_GREEN_KEY)) {
-                char *e;
-                rc->green = str2ld(value, &e);
-                if(e && *e) {
-                    error("Health configuration at line %zu of file '%s/%s' for alarm '%s' at key '%s' leaves this string unmatched: '%s'.",
-                            line, path, filename, rc->name, key, e);
-                }
-            }
-            else if(hash == hash_red && !strcasecmp(key, HEALTH_RED_KEY)) {
-                char *e;
-                rc->red = str2ld(value, &e);
-                if(e && *e) {
-                    error("Health configuration at line %zu of file '%s/%s' for alarm '%s' at key '%s' leaves this string unmatched: '%s'.",
-                            line, path, filename, rc->name, key, e);
-                }
-            }
-            else if(hash == hash_calc && !strcasecmp(key, HEALTH_CALC_KEY)) {
-                const char *failed_at = NULL;
-                int error = 0;
-                rc->calculation = expression_parse(value, &failed_at, &error);
-                if(!rc->calculation) {
-                    error("Health configuration at line %zu of file '%s/%s' for alarm '%s' at key '%s' has unparse-able expression '%s': %s at '%s'",
-                            line, path, filename, rc->name, key, value, expression_strerror(error), failed_at);
-                }
-            }
-            else if(hash == hash_warn && !strcasecmp(key, HEALTH_WARN_KEY)) {
-                const char *failed_at = NULL;
-                int error = 0;
-                rc->warning = expression_parse(value, &failed_at, &error);
-                if(!rc->warning) {
-                    error("Health configuration at line %zu of file '%s/%s' for alarm '%s' at key '%s' has unparse-able expression '%s': %s at '%s'",
-                            line, path, filename, rc->name, key, value, expression_strerror(error), failed_at);
-                }
-            }
-            else if(hash == hash_crit && !strcasecmp(key, HEALTH_CRIT_KEY)) {
-                const char *failed_at = NULL;
-                int error = 0;
-                rc->critical = expression_parse(value, &failed_at, &error);
-                if(!rc->critical) {
-                    error("Health configuration at line %zu of file '%s/%s' for alarm '%s' at key '%s' has unparse-able expression '%s': %s at '%s'",
-                            line, path, filename, rc->name, key, value, expression_strerror(error), failed_at);
-                }
-            }
-            else if(hash == hash_exec && !strcasecmp(key, HEALTH_EXEC_KEY)) {
-                if(rc->exec) {
-                    if(strcmp(rc->exec, value) != 0)
-                        error("Health configuration at line %zu of file '%s/%s' for alarm '%s' has key '%s' twice, once with value '%s' and later with value '%s'. Using ('%s').",
-                                line, path, filename, rc->name, key, rc->exec, value, value);
-
-                    freez(rc->exec);
-                }
-                rc->exec = strdupz(value);
-            }
-            else if(hash == hash_recipient && !strcasecmp(key, HEALTH_RECIPIENT_KEY)) {
-                if(rc->recipient) {
-                    if(strcmp(rc->recipient, value) != 0)
-                        error("Health configuration at line %zu of file '%s/%s' for alarm '%s' has key '%s' twice, once with value '%s' and later with value '%s'. Using ('%s').",
-                                line, path, filename, rc->name, key, rc->recipient, value, value);
-
-                    freez(rc->recipient);
-                }
-                rc->recipient = strdupz(value);
-            }
-            else if(hash == hash_units && !strcasecmp(key, HEALTH_UNITS_KEY)) {
-                if(rc->units) {
-                    if(strcmp(rc->units, value) != 0)
-                        error("Health configuration at line %zu of file '%s/%s' for alarm '%s' has key '%s' twice, once with value '%s' and later with value '%s'. Using ('%s').",
-                                line, path, filename, rc->name, key, rc->units, value, value);
-
-                    freez(rc->units);
-                }
-                rc->units = strdupz(value);
-                strip_quotes(rc->units);
-            }
-            else if(hash == hash_info && !strcasecmp(key, HEALTH_INFO_KEY)) {
-                if(rc->info) {
-                    if(strcmp(rc->info, value) != 0)
-                        error("Health configuration at line %zu of file '%s/%s' for alarm '%s' has key '%s' twice, once with value '%s' and later with value '%s'. Using ('%s').",
-                                line, path, filename, rc->name, key, rc->info, value, value);
-
-                    freez(rc->info);
-                }
-                rc->info = strdupz(value);
-                strip_quotes(rc->info);
-            }
-            else if(hash == hash_delay && !strcasecmp(key, HEALTH_DELAY_KEY)) {
-                health_parse_delay(line, path, filename, value, &rc->delay_up_duration, &rc->delay_down_duration, &rc->delay_max_duration, &rc->delay_multiplier);
-            }
-            else if(hash == hash_options && !strcasecmp(key, HEALTH_OPTIONS_KEY)) {
-                rc->options |= health_parse_options(value);
-            }
-            else {
-                error("Health configuration at line %zu of file '%s/%s' for alarm '%s' has unknown key '%s'.",
-                        line, path, filename, rc->name, key);
-            }
-        }
-        else if(rt) {
-            if(hash == hash_on && !strcasecmp(key, HEALTH_ON_KEY)) {
-                if(rt->context) {
-                    if(strcmp(rt->context, value) != 0)
-                        error("Health configuration at line %zu of file '%s/%s' for template '%s' has key '%s' twice, once with value '%s' and later with value '%s'. Using ('%s').",
-                                line, path, filename, rt->name, key, rt->context, value, value);
-
-                    freez(rt->context);
-                }
-                rt->context = strdupz(value);
-                rt->hash_context = simple_hash(rt->context);
-            }
-            else if(hash == hash_families && !strcasecmp(key, HEALTH_FAMILIES_KEY)) {
-                freez(rt->family_match);
-                simple_pattern_free(rt->family_pattern);
-
-                rt->family_match = strdupz(value);
-                rt->family_pattern = simple_pattern_create(rt->family_match, NULL, SIMPLE_PATTERN_EXACT);
-            }
-            else if(hash == hash_lookup && !strcasecmp(key, HEALTH_LOOKUP_KEY)) {
-                health_parse_db_lookup(line, path, filename, value, &rt->group, &rt->after, &rt->before,
-                        &rt->update_every, &rt->options, &rt->dimensions);
-            }
-            else if(hash == hash_every && !strcasecmp(key, HEALTH_EVERY_KEY)) {
-                if(!health_parse_duration(value, &rt->update_every))
-                    error("Health configuration at line %zu of file '%s/%s' for template '%s' at key '%s' cannot parse duration: '%s'.",
-                            line, path, filename, rt->name, key, value);
-            }
-            else if(hash == hash_green && !strcasecmp(key, HEALTH_GREEN_KEY)) {
-                char *e;
-                rt->green = str2ld(value, &e);
-                if(e && *e) {
-                    error("Health configuration at line %zu of file '%s/%s' for template '%s' at key '%s' leaves this string unmatched: '%s'.",
-                            line, path, filename, rt->name, key, e);
-                }
-            }
-            else if(hash == hash_red && !strcasecmp(key, HEALTH_RED_KEY)) {
-                char *e;
-                rt->red = str2ld(value, &e);
-                if(e && *e) {
-                    error("Health configuration at line %zu of file '%s/%s' for template '%s' at key '%s' leaves this string unmatched: '%s'.",
-                            line, path, filename, rt->name, key, e);
-                }
-            }
-            else if(hash == hash_calc && !strcasecmp(key, HEALTH_CALC_KEY)) {
-                const char *failed_at = NULL;
-                int error = 0;
-                rt->calculation = expression_parse(value, &failed_at, &error);
-                if(!rt->calculation) {
-                    error("Health configuration at line %zu of file '%s/%s' for template '%s' at key '%s' has unparse-able expression '%s': %s at '%s'",
-                            line, path, filename, rt->name, key, value, expression_strerror(error), failed_at);
-                }
-            }
-            else if(hash == hash_warn && !strcasecmp(key, HEALTH_WARN_KEY)) {
-                const char *failed_at = NULL;
-                int error = 0;
-                rt->warning = expression_parse(value, &failed_at, &error);
-                if(!rt->warning) {
-                    error("Health configuration at line %zu of file '%s/%s' for template '%s' at key '%s' has unparse-able expression '%s': %s at '%s'",
-                            line, path, filename, rt->name, key, value, expression_strerror(error), failed_at);
-                }
-            }
-            else if(hash == hash_crit && !strcasecmp(key, HEALTH_CRIT_KEY)) {
-                const char *failed_at = NULL;
-                int error = 0;
-                rt->critical = expression_parse(value, &failed_at, &error);
-                if(!rt->critical) {
-                    error("Health configuration at line %zu of file '%s/%s' for template '%s' at key '%s' has unparse-able expression '%s': %s at '%s'",
-                            line, path, filename, rt->name, key, value, expression_strerror(error), failed_at);
-                }
-            }
-            else if(hash == hash_exec && !strcasecmp(key, HEALTH_EXEC_KEY)) {
-                if(rt->exec) {
-                    if(strcmp(rt->exec, value) != 0)
-                        error("Health configuration at line %zu of file '%s/%s' for template '%s' has key '%s' twice, once with value '%s' and later with value '%s'. Using ('%s').",
-                                line, path, filename, rt->name, key, rt->exec, value, value);
-
-                    freez(rt->exec);
-                }
-                rt->exec = strdupz(value);
-            }
-            else if(hash == hash_recipient && !strcasecmp(key, HEALTH_RECIPIENT_KEY)) {
-                if(rt->recipient) {
-                    if(strcmp(rt->recipient, value) != 0)
-                        error("Health configuration at line %zu of file '%s/%s' for template '%s' has key '%s' twice, once with value '%s' and later with value '%s'. Using ('%s').",
-                                line, path, filename, rt->name, key, rt->recipient, value, value);
-
-                    freez(rt->recipient);
-                }
-                rt->recipient = strdupz(value);
-            }
-            else if(hash == hash_units && !strcasecmp(key, HEALTH_UNITS_KEY)) {
-                if(rt->units) {
-                    if(strcmp(rt->units, value) != 0)
-                        error("Health configuration at line %zu of file '%s/%s' for template '%s' has key '%s' twice, once with value '%s' and later with value '%s'. Using ('%s').",
-                                line, path, filename, rt->name, key, rt->units, value, value);
-
-                    freez(rt->units);
-                }
-                rt->units = strdupz(value);
-                strip_quotes(rt->units);
-            }
-            else if(hash == hash_info && !strcasecmp(key, HEALTH_INFO_KEY)) {
-                if(rt->info) {
-                    if(strcmp(rt->info, value) != 0)
-                        error("Health configuration at line %zu of file '%s/%s' for template '%s' has key '%s' twice, once with value '%s' and later with value '%s'. Using ('%s').",
-                                line, path, filename, rt->name, key, rt->info, value, value);
-
-                    freez(rt->info);
-                }
-                rt->info = strdupz(value);
-                strip_quotes(rt->info);
-            }
-            else if(hash == hash_delay && !strcasecmp(key, HEALTH_DELAY_KEY)) {
-                health_parse_delay(line, path, filename, value, &rt->delay_up_duration, &rt->delay_down_duration, &rt->delay_max_duration, &rt->delay_multiplier);
-            }
-            else if(hash == hash_options && !strcasecmp(key, HEALTH_OPTIONS_KEY)) {
-                rt->options |= health_parse_options(value);
-            }
-            else {
-                error("Health configuration at line %zu of file '%s/%s' for template '%s' has unknown key '%s'.",
-                        line, path, filename, rt->name, key);
-            }
-        }
-        else {
-            error("Health configuration at line %zu of file '%s/%s' has unknown key '%s'. Expected either '" HEALTH_ALARM_KEY "' or '" HEALTH_TEMPLATE_KEY "'.",
-                    line, path, filename, key);
-        }
-    }
-
-    if(rc && (ignore_this || !rrdcalc_add_alarm_from_config(host, rc)))
-        rrdcalc_free(rc);
-
-    if(rt && (ignore_this || !rrdcalctemplate_add_template_from_config(host, rt)))
-        rrdcalctemplate_free(rt);
-
-    fclose(fp);
-    return 1;
-}
-
-void health_readdir(RRDHOST *host, const char *path) {
-    if(!host->health_enabled) return;
-
-    size_t pathlen = strlen(path);
-
-    debug(D_HEALTH, "Health configuration reading directory '%s'", path);
-
-    DIR *dir = opendir(path);
-    if (!dir) {
-        error("Health configuration cannot open directory '%s'.", path);
-        return;
-    }
-
-    struct dirent *de = NULL;
-    while ((de = readdir(dir))) {
-        size_t len = strlen(de->d_name);
-
-        if(de->d_type == DT_DIR
-           && (
-                   (de->d_name[0] == '.' && de->d_name[1] == '\0')
-                   || (de->d_name[0] == '.' && de->d_name[1] == '.' && de->d_name[2] == '\0')
-           )) {
-            debug(D_HEALTH, "Ignoring directory '%s'", de->d_name);
-            continue;
-        }
-
-        else if(de->d_type == DT_DIR) {
-            char *s = mallocz(pathlen + strlen(de->d_name) + 2);
-            strcpy(s, path);
-            strcat(s, "/");
-            strcat(s, de->d_name);
-            health_readdir(host, s);
-            freez(s);
-            continue;
-        }
-
-        else if((de->d_type == DT_LNK || de->d_type == DT_REG || de->d_type == DT_UNKNOWN) &&
-                len > 5 && !strcmp(&de->d_name[len - 5], ".conf")) {
-            health_readfile(host, path, de->d_name);
-        }
-
-        else debug(D_HEALTH, "Ignoring file '%s'", de->d_name);
-    }
-
-    closedir(dir);
-}
-
-