From 43f61622b32c99d85cdf6889b7ce6835d9042921 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 17 Mar 2023 12:36:38 +0100 Subject: [PATCH] [v9.3.x] Alerting: Fix queries not being previewed in detail view (#64949) Alerting: Fix queries not being previewed in detail view (#64198) (cherry picked from commit 4e81aab60a587b102305a255891986e592a0d1a4) Co-authored-by: Gilles De Mey --- .../alerting/unified/hooks/useAlertQueriesStatus.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/public/app/features/alerting/unified/hooks/useAlertQueriesStatus.ts b/public/app/features/alerting/unified/hooks/useAlertQueriesStatus.ts index 4a7b3386a92..af3b744ceaa 100644 --- a/public/app/features/alerting/unified/hooks/useAlertQueriesStatus.ts +++ b/public/app/features/alerting/unified/hooks/useAlertQueriesStatus.ts @@ -1,11 +1,18 @@ import { useMemo } from 'react'; import { getDataSourceSrv } from '@grafana/runtime'; +import { isExpressionReference } from '@grafana/runtime/src/utils/DataSourceWithBackend'; import { AlertQuery } from 'app/types/unified-alerting-dto'; export function useAlertQueriesStatus(queries: AlertQuery[]) { const allDataSourcesAvailable = useMemo( - () => queries.every((query) => Boolean(getDataSourceSrv().getInstanceSettings(query.datasourceUid))), + () => + queries + .filter((query) => !isExpressionReference(query.datasourceUid)) + .every((query) => { + const instanceSettings = getDataSourceSrv().getInstanceSettings(query.datasourceUid); + return Boolean(instanceSettings); + }), [queries] );