1 files changed, 39 insertions, 4 deletions

diff --git a/web/api/formatters/json_wrapper.c b/web/api/formatters/json_wrapper.c
index bfe172cfce..72967375d7 100644
--- a/web/api/formatters/json_wrapper.c
+++ b/web/api/formatters/json_wrapper.c
@@ -2,7 +2,7 @@
 
 #include "json_wrapper.h"
 
-void rrdr_json_wrapper_begin(RRDR *r, BUFFER *wb, uint32_t format, RRDR_OPTIONS options, int string_value, RRDDIM *temp_rd) {
+void rrdr_json_wrapper_begin(RRDR *r, BUFFER *wb, uint32_t format, RRDR_OPTIONS options, int string_value, RRDDIM *temp_rd, char *chart_label_key) {
     rrdset_check_rdlock(r->st);
 
     long rows = rrdr_rows(r);
@@ -86,12 +86,12 @@ void rrdr_json_wrapper_begin(RRDR *r, BUFFER *wb, uint32_t format, RRDR_OPTIONS
         buffer_strcat(wb, "no data");
         buffer_strcat(wb, sq);
     }
+    buffer_strcat(wb, "],\n");
 
     // Composite charts
     if (temp_rd) {
         buffer_sprintf(
             wb,
-            "],\n"
             "   %schart_ids%s: [",
             kq, kq);
 
@@ -114,11 +114,46 @@ void rrdr_json_wrapper_begin(RRDR *r, BUFFER *wb, uint32_t format, RRDR_OPTIONS
             buffer_strcat(wb, "no data");
             buffer_strcat(wb, sq);
         }
+        buffer_strcat(wb, "],\n");
+        if (chart_label_key) {
+            uint32_t key_hash = simple_hash(chart_label_key);
+            struct label *current_label;
+
+            buffer_sprintf(
+                wb,
+                "   %schart_labels%s: { %s%s%s : [",
+                kq, kq, kq, chart_label_key, kq);
+
+            for (c = 0, i = 0, rd = temp_rd; rd && c < r->d; c++, rd = rd->next) {
+                if (unlikely(r->od[c] & RRDR_DIMENSION_HIDDEN))
+                    continue;
+                if (unlikely((options & RRDR_OPTION_NONZERO) && !(r->od[c] & RRDR_DIMENSION_NONZERO)))
+                    continue;
+
+                if (i)
+                    buffer_strcat(wb, ", ");
+
+                current_label = rrdset_lookup_label_key(rd->rrdset, chart_label_key, key_hash);
+                if (current_label) {
+                    buffer_strcat(wb, sq);
+                    buffer_strcat(wb, current_label->value);
+                    buffer_strcat(wb, sq);
+                } else
+                    buffer_strcat(wb, "null");
+                i++;
+            }
+            if (!i) {
+                rows = 0;
+                buffer_strcat(wb, sq);
+                buffer_strcat(wb, "no data");
+                buffer_strcat(wb, sq);
+            }
+            buffer_strcat(wb, "] },\n");
+        }
     }
 
 
-    buffer_sprintf(wb, "],\n"
-                       "   %slatest_values%s: ["
+    buffer_sprintf(wb, "   %slatest_values%s: ["
                    , kq, kq);
 
     for(c = 0, i = 0, rd = temp_rd?temp_rd:r->st->dimensions; rd && c < r->d ;c++, rd = rd->next) {