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

Dashboard datasource: Return annotations as series when query topic is "annotations" (#95965)

Browse Source
This commit is contained in:
kay delaney 2024-11-06 15:03:06 +00:00 committed by GitHub
parent a279220d74
commit 26b0e8f105
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/app/plugins/datasource/dashboard/datasource.ts
View File

@ -7,6 +7,9 @@ import {
DataSourceInstanceSettings, DataSourceInstanceSettings,
TestDataSourceResponse, TestDataSourceResponse,
ScopedVar, ScopedVar,
DataTopic,
PanelData,
DataFrame,
} from '@grafana/data'; } from '@grafana/data';
import { SceneDataProvider, SceneDataTransformer, SceneObject } from '@grafana/scenes'; import { SceneDataProvider, SceneDataTransformer, SceneObject } from '@grafana/scenes';
import { import {
@ -78,7 +81,7 @@ export class DashboardDatasource extends DataSourceApi<DashboardQuery> {
return sourceDataProvider!.getResultsStream!().pipe( return sourceDataProvider!.getResultsStream!().pipe(
map((result) => { map((result) => {
return { return {
data: [...result.data.series, ...(result.data.annotations ?? [])], data: this.getDataFramesForQueryTopic(result.data, query),
state: result.data.state, state: result.data.state,
errors: result.data.errors, errors: result.data.errors,
error: result.data.error, error: result.data.error,
@ -90,6 +93,21 @@ export class DashboardDatasource extends DataSourceApi<DashboardQuery> {
}); });
} }
private getDataFramesForQueryTopic(data: PanelData, query: DashboardQuery): DataFrame[] {
const annotations = data.annotations ?? [];
if (query.topic === DataTopic.Annotations) {
return annotations.map((frame) => ({
...frame,
meta: {
...frame.meta,
dataTopic: DataTopic.Series,
},
}));
} else {
return [...data.series, ...annotations];
}
}
private findSourcePanel(scene: SceneObject, panelId: number) { private findSourcePanel(scene: SceneObject, panelId: number) {
return findVizPanelByKey(scene, getVizPanelKeyForPanelId(panelId)); return findVizPanelByKey(scene, getVizPanelKeyForPanelId(panelId));
} }