IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix issue after AzureMonitor fix (#41746)

Browse Source 
* check if filterquery exists

* update tests

* test: re-run CI

Co-authored-by: gillesdemey <gilles.de.mey@gmail.com>
This commit is contained in:
Peter Holmberg 2021-11-16 17:45:55 +01:00 committed by GitHub
parent 4d288cc6c7
commit 4a31dfd903
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts
View File

@ -2,7 +2,7 @@ import {
ArrayVector,
DataFrame,
DataFrameJSON,
DataQuery,
DataSourceApi,
Field,
FieldType,
getDefaultRelativeTimeRange,
@ -189,7 +189,7 @@ describe('AlertingQueryRunner', () => {
mockBackendSrv({
fetch: () => throwError(new Error("shouldn't happen")),
}),
mockDataSourceSrv(() => false)
mockDataSourceSrv({ filterQuery: () => false })
);
const data = runner.get();
@ -218,12 +218,9 @@ const mockBackendSrv = ({ fetch }: MockBackendSrvConfig): BackendSrv => {
} as unknown) as BackendSrv;
};
const mockDataSourceSrv = (filterQuery: (query: DataQuery) => boolean = () => true) => {
const mockDataSourceSrv = (dsApi?: Partial<DataSourceApi>) => {
return ({
get: () =>
Promise.resolve({
filterQuery,
}),
get: () => Promise.resolve(dsApi ?? {}),
} as unknown) as DataSourceSrv;
};

2
public/app/features/alerting/unified/state/AlertingQueryRunner.ts
View File

@ -52,7 +52,7 @@ export class AlertingQueryRunner {
for (const query of queries) {
if (!isExpressionQuery(query.model)) {
const ds = await this.dataSourceSrv.get(query.datasourceUid);
if (!ds.filterQuery?.(query.model)) {
if (ds.filterQuery && !ds.filterQuery(query.model)) {
const empty = initialState(queries, LoadingState.Done);
return this.subject.next(empty);
}