From 8db35b9b0b2a35743b3fb6efd05d06d26e23717c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Farkas?= Date: Tue, 12 Apr 2022 12:16:05 +0200 Subject: [PATCH] loki: backend-mode: allow for dashboards too (#47578) --- public/app/plugins/datasource/loki/datasource.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index f5196b6ba76..69d9b771cc5 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -8,7 +8,6 @@ import Prism from 'prismjs'; import { AnnotationEvent, AnnotationQueryRequest, - CoreApp, DataFrame, DataFrameView, DataQueryError, @@ -153,9 +152,7 @@ export class LokiDatasource ...this.getRangeScopedVars(request.range), }; - const shouldRunBackendQuery = config.featureToggles.lokiBackendMode && request.app === CoreApp.Explore; - - if (shouldRunBackendQuery) { + if (config.featureToggles.lokiBackendMode) { // we "fix" the loki queries to have `.queryType` and not have `.instant` and `.range` const fixedRequest = { ...request, @@ -789,7 +786,7 @@ export class LokiDatasource } // Used when running queries through backend - applyTemplateVariables(target: LokiQuery, scopedVars: ScopedVars): Record { + applyTemplateVariables(target: LokiQuery, scopedVars: ScopedVars): LokiQuery { // We want to interpolate these variables on backend const { __interval, __interval_ms, ...rest } = scopedVars;