IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 10:03:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix queries not being previewed in detail view (#64198)

Browse Source
This commit is contained in:
Gilles De Mey 2023-03-06 15:46:55 +01:00 committed by GitHub
parent f36c431442
commit 4e81aab60a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/alerting/unified/hooks/useAlertQueriesStatus.ts
View File

@ -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]
);

3
public/app/features/alerting/unified/utils/query.ts
View File

@ -1,4 +1,5 @@
import { DataQuery, DataSourceInstanceSettings } from '@grafana/data';
import { DataSourceInstanceSettings } from '@grafana/data';
import { DataQuery } from '@grafana/schema';
import { LokiQuery } from 'app/plugins/datasource/loki/types';
import { PromQuery } from 'app/plugins/datasource/prometheus/types';
import { CombinedRule } from 'app/types/unified-alerting';

2
public/app/features/expressions/guards.ts
View File

@ -1,5 +1,5 @@
import { DataQuery } from '@grafana/data';
import { isExpressionReference } from '@grafana/runtime/src/utils/DataSourceWithBackend';
import { DataQuery } from '@grafana/schema';
import { ExpressionQuery, ExpressionQueryType } from './types';