From cd7ed12292aef11d9062b64f61215174e8cc1860 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 3 Sep 2019 12:23:48 +0200 Subject: Merging upstream version 1.17.0. Signed-off-by: Daniel Baumann --- web/api/formatters/rrdset2json.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'web/api/formatters/rrdset2json.c') diff --git a/web/api/formatters/rrdset2json.c b/web/api/formatters/rrdset2json.c index 2bbd2a70f..4d9139927 100644 --- a/web/api/formatters/rrdset2json.c +++ b/web/api/formatters/rrdset2json.c @@ -73,7 +73,10 @@ void rrdset2json(RRDSET *st, BUFFER *wb, size_t *dimensions_count, size_t *memor if(dimensions_count) *dimensions_count += dimensions; if(memory_used) *memory_used += memory; - buffer_strcat(wb, "\n\t\t\t},\n\t\t\t\"green\": "); + buffer_sprintf(wb, "\n\t\t\t},\n\t\t\t\"chart_variables\": "); + health_api_v1_chart_custom_variables2json(st, wb); + + buffer_strcat(wb, ",\n\t\t\t\"green\": "); buffer_rrd_value(wb, st->green); buffer_strcat(wb, ",\n\t\t\t\"red\": "); buffer_rrd_value(wb, st->red); -- cgit v1.2.3