/api/v1/charts: bring back chart id to `title` (#16416)
fix /api/v1/charts add chart name to title
Ilya Mashchenko committed
Nov 15, 2023 at 12:00 UTC
183a7fb84f85885a3d91f8e28d4e9780f964f659
1 file changed
+5
-4
web/api/formatters/rrdset2json.c
+5
-4
@@ -21,21 +21,22 @@ void rrdset2json(RRDSET *st, BUFFER *wb, size_t *dimensions_count, size_t *memor
21
{
22
time_t first_entry_t = rrdset_first_entry_s(st);
23
time_t last_entry_t = rrdset_last_entry_s(st);
24
+ char buf[RRD_ID_LENGTH_MAX + 16];
25
26
buffer_json_member_add_string(wb, "id", rrdset_id(st));
27
buffer_json_member_add_string(wb, "name", rrdset_name(st));
28
buffer_json_member_add_string(wb, "type", rrdset_parts_type(st));
29
buffer_json_member_add_string(wb, "family", rrdset_family(st));
30
buffer_json_member_add_string(wb, "context", rrdset_context(st));
30
- buffer_json_member_add_string(wb, "title", rrdset_title(st));
31
+ snprintfz(buf, RRD_ID_LENGTH_MAX + 15, "%s (%s)", rrdset_title(st), rrdset_name(st));
32
+ buffer_json_member_add_string(wb, "title", buf);
33
buffer_json_member_add_int64(wb, "priority", st->priority);
34
buffer_json_member_add_string(wb, "plugin", rrdset_plugin_name(st));
35
buffer_json_member_add_string(wb, "module", rrdset_module_name(st));
36
buffer_json_member_add_string(wb, "units", rrdset_units(st));
37
36
- char data_url[RRD_ID_LENGTH_MAX + 16];
37
- snprintfz(data_url, RRD_ID_LENGTH_MAX + 15, "/api/v1/data?chart=%s", rrdset_name(st));
38
- buffer_json_member_add_string(wb, "data_url", data_url);
38
+ snprintfz(buf, RRD_ID_LENGTH_MAX + 15, "/api/v1/data?chart=%s", rrdset_name(st));
39
+ buffer_json_member_add_string(wb, "data_url", buf);
40
41
buffer_json_member_add_string(wb, "chart_type", rrdset_type_name(st->chart_type));
42
buffer_json_member_add_int64(wb, "duration", (int64_t)(last_entry_t - first_entry_t + st->update_every));