diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-13 17:16:02 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-13 17:16:02 +0000 |
| commit | 396c327fe40b1db11fc204d7ae7ace84503de681 (patch) | |
| tree | 6718eb5d5dcf3c6e3c93e32ac6ac9a857f6ca56e /database | |
| parent | Releasing debian version 1.38.0-1. (diff) | |
| download | netdata-396c327fe40b1db11fc204d7ae7ace84503de681.tar.xz netdata-396c327fe40b1db11fc204d7ae7ace84503de681.zip | |
Merging upstream version 1.38.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'database')
| -rw-r--r-- | database/rrdcontext.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/database/rrdcontext.c b/database/rrdcontext.c index 9fc605f32..3f1ce73f8 100644 --- a/database/rrdcontext.c +++ b/database/rrdcontext.c @@ -2501,7 +2501,7 @@ static void query_target_add_metric(QUERY_TARGET_LOCALS *qtl, RRDMETRIC_ACQUIRED if (rrd_flag_check(rm, RRD_FLAG_HIDDEN) || (rm->rrddim && rrddim_option_check(rm->rrddim, RRDDIM_OPTION_HIDDEN))) { options |= RRDR_DIMENSION_HIDDEN; - options &= ~RRDR_DIMENSION_SELECTED; + options &= ~RRDR_DIMENSION_QUERIED; } if (qt->query.pattern) { @@ -2512,13 +2512,13 @@ static void query_target_add_metric(QUERY_TARGET_LOCALS *qtl, RRDMETRIC_ACQUIRED || (qtl->match_names && simple_pattern_matches(qt->query.pattern, string2str(rm->name))) ) { // it matches the pattern - options |= (RRDR_DIMENSION_SELECTED | RRDR_DIMENSION_NONZERO); + options |= (RRDR_DIMENSION_QUERIED | RRDR_DIMENSION_NONZERO); options &= ~RRDR_DIMENSION_HIDDEN; } else { // it does not match the pattern options |= RRDR_DIMENSION_HIDDEN; - options &= ~RRDR_DIMENSION_SELECTED; + options &= ~RRDR_DIMENSION_QUERIED; } } else { @@ -2526,10 +2526,10 @@ static void query_target_add_metric(QUERY_TARGET_LOCALS *qtl, RRDMETRIC_ACQUIRED // so this is a selected dimension // if it is not hidden if(!(options & RRDR_DIMENSION_HIDDEN)) - options |= RRDR_DIMENSION_SELECTED; + options |= RRDR_DIMENSION_QUERIED; } - if((options & RRDR_DIMENSION_HIDDEN) && (options & RRDR_DIMENSION_SELECTED)) + if((options & RRDR_DIMENSION_HIDDEN) && (options & RRDR_DIMENSION_QUERIED)) options &= ~RRDR_DIMENSION_HIDDEN; if(!(options & RRDR_DIMENSION_HIDDEN) || (qt->request.options & RRDR_OPTION_PERCENTAGE)) { |