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

PanelEdit: Query now correctly initializes data source (#42291)

Browse Source
This commit is contained in:
Ashley Harrison 2021-11-26 09:37:19 +00:00 committed by GitHub
parent 1e1403fad1
commit 0516ad822b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/app/features/dashboard/components/PanelEditor/PanelEditorQueries.tsx
View File

@ -19,20 +19,18 @@ export class PanelEditorQueries extends PureComponent<Props> {
} }
buildQueryOptions(panel: PanelModel): QueryGroupOptions { buildQueryOptions(panel: PanelModel): QueryGroupOptions {
const dataSource: QueryGroupDataSource = panel.datasource?.uid const dataSource: QueryGroupDataSource = panel.datasource ?? {
? {
default: false,
...panel.datasource,
}
: {
default: true, default: true,
}; };
const datasourceSettings = getDatasourceSrv().getInstanceSettings(dataSource);
const datasourceSettings = getDatasourceSrv().getInstanceSettings(dataSource.uid);
return { return {
cacheTimeout: datasourceSettings?.meta.queryOptions?.cacheTimeout ? panel.cacheTimeout : undefined, cacheTimeout: datasourceSettings?.meta.queryOptions?.cacheTimeout ? panel.cacheTimeout : undefined,
dataSource, dataSource: {
default: datasourceSettings?.isDefault,
type: datasourceSettings?.type,
uid: datasourceSettings?.uid,
},
queries: panel.targets, queries: panel.targets,
maxDataPoints: panel.maxDataPoints, maxDataPoints: panel.maxDataPoints,
minInterval: panel.interval, minInterval: panel.interval,