Support chart labels in alerts (#13290)

* chart labels for alerts

* proper termination

* use strchr

* change if statement

* change label variable. add docs

* change doc

* assign buf to temp

* use new dictionary functions

* reduce variable scope

* reduce line length

* make sure rrdcalc updates labels after inserted

* reduce var scope

* add rrdcalc.c for cmocka tests

* Revert "add rrdcalc.c for cmocka tests"

This reverts commit 5fe122adcf7abcbe6d67fa2ebd7c4ff8620cf9c8.

* Fix cmocka unit tests

* valgrind errors

Co-authored-by: Vladimir Kobal <vlad@prokk.net>

1 files changed, 2 insertions, 35 deletions

diff --git a/health/health_json.c b/health/health_json.c
index 4e8f437613..a0dc55b612 100644
--- a/health/health_json.c
+++ b/health/health_json.c
@@ -96,22 +96,7 @@ void health_alarm_entry2json_nolock(BUFFER *wb, ALARM_ENTRY *ae, RRDHOST *host)
                    , (ae->flags & HEALTH_ENTRY_FLAG_SILENCED)?"true":"false"
     );
 
-    char *replaced_info = NULL;
-    if (likely(ae->info)) {
-        char *m = NULL;
-        replaced_info = strdupz(ae->info);
-        size_t pos = 0;
-        while ((m = strstr(replaced_info + pos, "$family"))) {
-            char *buf = NULL;
-            pos = m - replaced_info;
-            buf = find_and_replace(replaced_info, "$family", ae->family ? ae->family : "", m);
-            freez(replaced_info);
-            replaced_info = strdupz(buf);
-            freez(buf);
-        }
-    }
-
-    health_string2json(wb, "\t\t", "info", replaced_info?replaced_info:"", ",\n");
+    health_string2json(wb, "\t\t", "info", ae->info ? ae->info : "", ",\n");
 
     if(unlikely(ae->flags & HEALTH_ENTRY_FLAG_NO_CLEAR_NOTIFICATION)) {
         buffer_strcat(wb, "\t\t\"no_clear_notification\": true,\n");
@@ -127,7 +112,6 @@ void health_alarm_entry2json_nolock(BUFFER *wb, ALARM_ENTRY *ae, RRDHOST *host)
 
     buffer_strcat(wb, "\t}");
 
-    freez(replaced_info);
     freez(edit_command);
 }
 
@@ -182,21 +166,6 @@ static inline void health_rrdcalc2json_nolock(RRDHOST *host, BUFFER *wb, RRDCALC
     char value_string[100 + 1];
     format_value_and_unit(value_string, 100, rc->value, rc->units, -1);
 
-    char *replaced_info = NULL;
-    if (likely(rc->info)) {
-        char *m;
-        replaced_info = strdupz(rc->info);
-        size_t pos = 0;
-        while ((m = strstr(replaced_info + pos, "$family"))) {
-            char *buf = NULL;
-            pos = m - replaced_info;
-            buf = find_and_replace(replaced_info, "$family", (rc->rrdset && rc->rrdset->family) ? rc->rrdset->family : "", m);
-            freez(replaced_info);
-            replaced_info = strdupz(buf);
-            freez(buf);
-        }
-    }
-
     char hash_id[GUID_LEN + 1];
     uuid_unparse_lower(rc->config_hash_id, hash_id);
 
@@ -250,7 +219,7 @@ static inline void health_rrdcalc2json_nolock(RRDHOST *host, BUFFER *wb, RRDCALC
                    , rc->recipient?rc->recipient:host->health_default_recipient
                    , rc->source
                    , rc->units?rc->units:""
-                   , replaced_info?replaced_info:""
+                   , rc->info?rc->info:""
                    , rrdcalc_status2string(rc->status)
                    , (unsigned long)rc->last_status_change
                    , (unsigned long)rc->last_updated
@@ -322,8 +291,6 @@ static inline void health_rrdcalc2json_nolock(RRDHOST *host, BUFFER *wb, RRDCALC
     buffer_strcat(wb, "\n");
 
     buffer_strcat(wb, "\t\t}");
-
-    freez(replaced_info);
 }
 
 //void health_rrdcalctemplate2json_nolock(BUFFER *wb, RRDCALCTEMPLATE *rt) {