diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-04-12 16:30:45 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-04-12 16:30:45 +0000 |
commit | 105ad30a29266eafedd8ef79bc21218b92415907 (patch) | |
tree | ca61c4aec3a3feceef50a88e5d125bbb2621ad3a /web | |
parent | Releasing debian version 1.30.0-1. (diff) | |
download | netdata-105ad30a29266eafedd8ef79bc21218b92415907.tar.xz netdata-105ad30a29266eafedd8ef79bc21218b92415907.zip |
Merging upstream version 1.30.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'web')
-rw-r--r-- | web/api/formatters/rrd2json.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/web/api/formatters/rrd2json.c b/web/api/formatters/rrd2json.c index 5b12c89ba..4344af4ac 100644 --- a/web/api/formatters/rrd2json.c +++ b/web/api/formatters/rrd2json.c @@ -95,12 +95,8 @@ void build_context_param_list(struct context_param **param_list, RRDSET *st) memcpy(rd->state, rd1->state, sizeof(*rd->state)); memcpy(&rd->state->collect_ops, &rd1->state->collect_ops, sizeof(struct rrddim_collect_ops)); memcpy(&rd->state->query_ops, &rd1->state->query_ops, sizeof(struct rrddim_query_ops)); -#ifdef ENABLE_DBENGINE - if (rd->rrd_memory_mode == RRD_MEMORY_MODE_DBENGINE) { - rd->state->metric_uuid = mallocz(sizeof(uuid_t)); - uuid_copy(*rd->state->metric_uuid, *rd1->state->metric_uuid); - } -#endif + rd->state->metric_uuid = mallocz(sizeof(uuid_t)); + uuid_copy(*rd->state->metric_uuid, *rd1->state->metric_uuid); rd->next = (*param_list)->rd; (*param_list)->rd = rd; } |