Merging upstream version 1.44.3.

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

1 files changed, 16 insertions, 4 deletions

diff --git a/health/health_config.c b/health/health_config.c
index 1a730ab91..27b2a71aa 100644
--- a/health/health_config.c
+++ b/health/health_config.c
@@ -583,6 +583,7 @@ static int health_readfile(const char *filename, void *data) {
     struct alert_config *alert_cfg = NULL;
 
     int ignore_this = 0;
+    bool filtered_config = false;
     size_t line = 0, append = 0;
     char *s;
     while((s = fgets(&buffer[append], (int)(HEALTH_CONF_MAX_LINE - append), fp)) || append) {
@@ -680,8 +681,10 @@ static int health_readfile(const char *filename, void *data) {
                 alert_cfg->alarm = string_dup(rc->name);
                 alert_cfg->source = health_source_file(line, filename);
                 ignore_this = 0;
+                filtered_config = false;
             } else {
                 rc = NULL;
+                filtered_config = true;
             }
         }
         else if(hash == hash_template && !strcasecmp(key, HEALTH_TEMPLATE_KEY)) {
@@ -727,8 +730,10 @@ static int health_readfile(const char *filename, void *data) {
                 alert_cfg->template_key = string_dup(rt->name);
                 alert_cfg->source = health_source_file(line, filename);
                 ignore_this = 0;
+                filtered_config = false;
             } else {
                 rt = NULL;
+                filtered_config = true;
             }
         }
         else if(hash == hash_os && !strcasecmp(key, HEALTH_OS_KEY)) {
@@ -1320,8 +1325,8 @@ static int health_readfile(const char *filename, void *data) {
             }
         }
         else {
-            netdata_log_error("Health configuration at line %zu of file '%s' has unknown key '%s'. Expected either '" HEALTH_ALARM_KEY "' or '" HEALTH_TEMPLATE_KEY "'.",
-                              line, filename, key);
+            if (!filtered_config)
+                netdata_log_error("Health configuration at line %zu of file '%s' has unknown key '%s'. Expected either '" HEALTH_ALARM_KEY "' or '" HEALTH_TEMPLATE_KEY "'.", line, filename, key);
         }
     }
 
@@ -1363,7 +1368,10 @@ void health_readdir(RRDHOST *host, const char *user_path, const char *stock_path
                                                 CONFIG_BOOLEAN_YES);
 
     if (!stock_enabled) {
-        netdata_log_health("[%s]: Netdata will not load stock alarms.", rrdhost_hostname(host));
+        nd_log(NDLS_DAEMON, NDLP_DEBUG,
+               "[%s]: Netdata will not load stock alarms.",
+               rrdhost_hostname(host));
+
         stock_path = user_path;
     }
 
@@ -1371,6 +1379,10 @@ void health_readdir(RRDHOST *host, const char *user_path, const char *stock_path
         health_rrdvars = health_rrdvariables_create();
 
     recursive_config_double_dir_load(user_path, stock_path, subpath, health_readfile, (void *) host, 0);
-    netdata_log_health("[%s]: Read health configuration.", rrdhost_hostname(host));
+
+    nd_log(NDLS_DAEMON, NDLP_DEBUG,
+           "[%s]: Read health configuration.",
+           rrdhost_hostname(host));
+
     sql_store_hashes = 0;
 }