From ecb5d94b2d6c2b2eb2cdd0865721aaef2e51d9be Mon Sep 17 00:00:00 2001 From: Dominik Prokop Date: Mon, 18 Dec 2023 16:52:33 +0100 Subject: [PATCH] Prometheus: Replace pre-calculated $__interval values for backend interpolation (#79645) --- .../app/plugins/datasource/prometheus/datasource.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts index 92869351a1e..e79405d4ce4 100644 --- a/public/app/plugins/datasource/prometheus/datasource.ts +++ b/public/app/plugins/datasource/prometheus/datasource.ts @@ -883,9 +883,14 @@ export class PrometheusDatasource applyTemplateVariables(target: PromQuery, scopedVars: ScopedVars, filters?: AdHocVariableFilter[]) { const variables = cloneDeep(scopedVars); - // We want to interpolate these variables on backend - delete variables.__interval; - delete variables.__interval_ms; + // We want to interpolate these variables on backend. + // The pre-calculated values are replaced withe the variable strings. + variables.__interval = { + value: '$__interval', + }; + variables.__interval_ms = { + value: '$__interval_ms', + }; // interpolate expression const expr = this.templateSrv.replace(target.expr, variables, this.interpolateQueryExpr);