From 483bb79de8379969d936e080be03e741728c229a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Farkas?= Date: Thu, 25 Sep 2025 14:09:13 +0200 Subject: [PATCH] datasources: querier: do not check for related toggles (#111586) datasources: querier: do not check for realted toggles --- .../src/utils/DataSourceWithBackend.ts | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts index ca7bc045f9c..2e7153328e9 100644 --- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts +++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.ts @@ -211,23 +211,12 @@ class DataSourceWithBackend< // Use the new query service for explore if (config.featureToggles.queryServiceFromExplore && request.app === CoreApp.Explore) { - // make sure query-service is enabled on the backend - const isQueryServiceEnabled = config.featureToggles.queryService; - const isExperimentalAPIsEnabled = config.featureToggles.grafanaAPIServerWithExperimentalAPIs; - if (!isQueryServiceEnabled && !isExperimentalAPIsEnabled) { - console.warn('feature toggle queryServiceFromExplore also requires the queryService to be running'); - } else { - url = `/apis/query.grafana.app/v0alpha1/namespaces/${config.namespace}/query?ds_type=${this.type}`; - } + url = `/apis/query.grafana.app/v0alpha1/namespaces/${config.namespace}/query?ds_type=${this.type}`; } // Use the new query service if (config.featureToggles.queryServiceFromUI) { - if (!(config.featureToggles.queryService || config.featureToggles.grafanaAPIServerWithExperimentalAPIs)) { - console.warn('feature toggle queryServiceFromUI also requires the queryService to be running'); - } else { - url = `/apis/query.grafana.app/v0alpha1/namespaces/${config.namespace}/query?ds_type=${this.type}`; - } + url = `/apis/query.grafana.app/v0alpha1/namespaces/${config.namespace}/query?ds_type=${this.type}`; } if (hasExpr) {