|
@@ -41,6 +41,7 @@ export interface PromDataQueryResponse {
|
|
|
result?: DataQueryResponseData[];
|
|
result?: DataQueryResponseData[];
|
|
|
};
|
|
};
|
|
|
};
|
|
};
|
|
|
|
|
+ cancelled?: boolean;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions> {
|
|
export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions> {
|
|
@@ -528,6 +529,9 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
|
|
|
const eventList: AnnotationEvent[] = [];
|
|
const eventList: AnnotationEvent[] = [];
|
|
|
tagKeys = tagKeys.split(',');
|
|
tagKeys = tagKeys.split(',');
|
|
|
|
|
|
|
|
|
|
+ if (results.cancelled) {
|
|
|
|
|
+ return [];
|
|
|
|
|
+ }
|
|
|
_.each(results.data.data.result, series => {
|
|
_.each(results.data.data.result, series => {
|
|
|
const tags = _.chain(series.metric)
|
|
const tags = _.chain(series.metric)
|
|
|
.filter((v, k) => {
|
|
.filter((v, k) => {
|