summaryrefslogtreecommitdiffstats
path: root/web/api/queries
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-02-18 15:22:04 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-02-18 15:22:04 +0000
commit608af7bf0232448f73e76e62a75c8a2e77655101 (patch)
tree65ff9e4da7675e8713b7fb149f674ffe1a8742d1 /web/api/queries
parentAdding upstream version 1.29.1. (diff)
downloadnetdata-608af7bf0232448f73e76e62a75c8a2e77655101.tar.xz
netdata-608af7bf0232448f73e76e62a75c8a2e77655101.zip
Adding upstream version 1.29.2.upstream/1.29.2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'web/api/queries')
-rw-r--r--web/api/queries/query.c3
-rw-r--r--web/api/queries/rrdr.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/web/api/queries/query.c b/web/api/queries/query.c
index 3b9077cd6..663e4bd14 100644
--- a/web/api/queries/query.c
+++ b/web/api/queries/query.c
@@ -1591,6 +1591,9 @@ RRDR *rrd2rrdr(
if (first_entry_t > after_requested)
first_entry_t = after_requested;
+ if (context_param_list)
+ rebuild_context_param_list(context_param_list, after_requested);
+
#ifdef ENABLE_DBENGINE
if (st->rrd_memory_mode == RRD_MEMORY_MODE_DBENGINE) {
struct rrdeng_region_info *region_info_array;
diff --git a/web/api/queries/rrdr.c b/web/api/queries/rrdr.c
index 6cd0c0b14..ef237fa02 100644
--- a/web/api/queries/rrdr.c
+++ b/web/api/queries/rrdr.c
@@ -130,8 +130,8 @@ RRDR *rrdr_create(struct rrdset *st, long n, struct context_param *context_param
// set the hidden flag on hidden dimensions
int c;
- for(c = 0, rd = temp_rd?temp_rd:st->dimensions ; rd ; c++, rd = rd->next) {
- if(unlikely(rrddim_flag_check(rd, RRDDIM_FLAG_HIDDEN)))
+ for (c = 0, rd = temp_rd ? temp_rd : st->dimensions; rd; c++, rd = rd->next) {
+ if (unlikely(rrddim_flag_check(rd, RRDDIM_FLAG_HIDDEN)))
r->od[c] = RRDR_DIMENSION_HIDDEN;
else
r->od[c] = RRDR_DIMENSION_DEFAULT;