From b312f48c103b60982574db1aec0ad9d2cd8dbba5 Mon Sep 17 00:00:00 2001 From: Domas Date: Wed, 20 Dec 2023 10:24:06 +0200 Subject: [PATCH] Loki: Replace pre-calculated $__interval values for backend interpolation (#79697) Loki datasource: pass through interval variables --- public/app/plugins/datasource/loki/datasource.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index 7295a17b77e..ce19187d277 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -1085,10 +1085,21 @@ export class LokiDatasource const exprWithAdHoc = this.addAdHocFilters(target.expr, adhocFilters); + const variables = { + ...rest, + + // pass through for backend interpolation. Need to be in scopedVars for Scenes though + __interval: { + value: '$__interval', + }, + __interval_ms: { + value: '$__interval_ms', + }, + }; return { ...target, legendFormat: this.templateSrv.replace(target.legendFormat, rest), - expr: this.templateSrv.replace(exprWithAdHoc, rest, this.interpolateQueryExpr), + expr: this.templateSrv.replace(exprWithAdHoc, variables, this.interpolateQueryExpr), }; }