1 files changed, 30 insertions, 45 deletions

diff --git a/database/rrdcalctemplate.c b/database/rrdcalctemplate.c
index 3f9804b936..4ba96082ac 100644
--- a/database/rrdcalctemplate.c
+++ b/database/rrdcalctemplate.c
@@ -12,30 +12,30 @@
  * @param st is the chart where the alarm will be attached.
  */
 void rrdcalctemplate_check_conditions_and_link(RRDCALCTEMPLATE *rt, RRDSET *st, RRDHOST *host) {
-    if(rt->hash_context != st->hash_context || strcmp(rt->context, st->context) != 0)
+    if(rt->context != st->context)
         return;
 
-    if (rt->charts_pattern && !simple_pattern_matches(rt->charts_pattern, st->name))
+    if (rt->charts_pattern && !simple_pattern_matches(rt->charts_pattern, rrdset_name(st)))
         return;
 
-    if (rt->family_pattern && !simple_pattern_matches(rt->family_pattern, st->family))
+    if (rt->family_pattern && !simple_pattern_matches(rt->family_pattern, rrdset_family(st)))
         return;
 
-    if (rt->module_pattern && !simple_pattern_matches(rt->module_pattern, st->module_name))
+    if (rt->module_pattern && !simple_pattern_matches(rt->module_pattern, rrdset_module_name(st)))
         return;
 
-    if (rt->plugin_pattern && !simple_pattern_matches(rt->plugin_pattern, st->plugin_name))
+    if (rt->plugin_pattern && !simple_pattern_matches(rt->plugin_pattern, rrdset_plugin_name(st)))
         return;
 
     if(host->host_labels && rt->host_labels_pattern && !rrdlabels_match_simple_pattern_parsed(host->host_labels, rt->host_labels_pattern, '='))
         return;
 
-    RRDCALC *rc = rrdcalc_create_from_template(host, rt, st->id);
+    RRDCALC *rc = rrdcalc_create_from_template(host, rt, rrdset_id(st));
     if (unlikely(!rc))
-        info("Health tried to create alarm from template '%s' on chart '%s' of host '%s', but it failed", rt->name, st->id, host->hostname);
+        info("Health tried to create alarm from template '%s' on chart '%s' of host '%s', but it failed", rrdcalctemplate_name(rt), rrdset_id(st), rrdhost_hostname(host));
 #ifdef NETDATA_INTERNAL_CHECKS
-    else if (rc->rrdset != st && !rc->foreachdim) //When we have a template with foreadhdim, the child will be added to the index late
-        error("Health alarm '%s.%s' should be linked to chart '%s', but it is not", rc->chart ? rc->chart : "NOCHART", rc->name, st->id);
+    else if (rc->rrdset != st && !rc->foreachdim) //When we have a template with foreachdim, the child will be added to the index late
+        error("Health alarm '%s.%s' should be linked to chart '%s', but it is not", rrdcalc_chart_name(rc), rrdcalc_name(rc), rrdset_id(st));
 #endif
 }
 
@@ -43,10 +43,7 @@ void rrdcalctemplate_link_matching(RRDSET *st) {
     RRDHOST *host = st->rrdhost;
     RRDCALCTEMPLATE *rt;
 
-    for(rt = host->templates; rt ; rt = rt->next)
-        rrdcalctemplate_check_conditions_and_link(rt, st, host);
-
-    for(rt = host->alarms_template_with_foreach; rt ; rt = rt->next)
+    foreach_rrdcalctemplate_in_rrdhost(host, rt)
         rrdcalctemplate_check_conditions_and_link(rt, st, host);
 }
 
@@ -57,31 +54,31 @@ inline void rrdcalctemplate_free(RRDCALCTEMPLATE *rt) {
     expression_free(rt->warning);
     expression_free(rt->critical);
 
-    freez(rt->family_match);
+    string_freez(rt->family_match);
     simple_pattern_free(rt->family_pattern);
 
-    freez(rt->plugin_match);
+    string_freez(rt->plugin_match);
     simple_pattern_free(rt->plugin_pattern);
 
-    freez(rt->module_match);
+    string_freez(rt->module_match);
     simple_pattern_free(rt->module_pattern);
 
-    freez(rt->charts_match);
+    string_freez(rt->charts_match);
     simple_pattern_free(rt->charts_pattern);
 
-    freez(rt->name);
-    freez(rt->exec);
-    freez(rt->recipient);
-    freez(rt->classification);
-    freez(rt->component);
-    freez(rt->type);
-    freez(rt->context);
-    freez(rt->source);
-    freez(rt->units);
-    freez(rt->info);
-    freez(rt->dimensions);
-    freez(rt->foreachdim);
-    freez(rt->host_labels);
+    string_freez(rt->name);
+    string_freez(rt->exec);
+    string_freez(rt->recipient);
+    string_freez(rt->classification);
+    string_freez(rt->component);
+    string_freez(rt->type);
+    string_freez(rt->context);
+    string_freez(rt->source);
+    string_freez(rt->units);
+    string_freez(rt->info);
+    string_freez(rt->dimensions);
+    string_freez(rt->foreachdim);
+    string_freez(rt->host_labels);
     simple_pattern_free(rt->spdim);
     simple_pattern_free(rt->host_labels_pattern);
     freez(rt);
@@ -90,21 +87,9 @@ inline void rrdcalctemplate_free(RRDCALCTEMPLATE *rt) {
 inline void rrdcalctemplate_unlink_and_free(RRDHOST *host, RRDCALCTEMPLATE *rt) {
     if(unlikely(!rt)) return;
 
-    debug(D_HEALTH, "Health removing template '%s' of host '%s'", rt->name, host->hostname);
-
-    if(host->templates == rt) {
-        host->templates = rt->next;
-    }
-    else {
-        RRDCALCTEMPLATE *t;
-        for (t = host->templates; t && t->next != rt; t = t->next ) ;
-        if(t) {
-            t->next = rt->next;
-            rt->next = NULL;
-        }
-        else
-            error("Cannot find RRDCALCTEMPLATE '%s' linked in host '%s'", rt->name, host->hostname);
-    }
+    debug(D_HEALTH, "Health removing template '%s' of host '%s'", rrdcalctemplate_name(rt), rrdhost_hostname(host));
+
+    DOUBLE_LINKED_LIST_REMOVE_UNSAFE(host->alarms_templates, rt, prev, next);
 
     rrdcalctemplate_free(rt);
 }