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

Azure Monitor: Use default from datasource if not saved on dashboard/query (#20899)

Browse Source 
* use default from datasource if not saved on dash/query

* find datasource default workspace in returned workspace list

* don't need the find

* fix dropdown
This commit is contained in:
Shavonn Brown
2019-12-13 11:03:08 -05:00
committed by GitHub
parent c14398edc8
commit f65da93d72
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts
View File

@@ -537,9 +537,18 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
.getWorkspaces(this.target.subscription)
.then((list: any[]) => {
this.workspaces = list;
if (list.length > 0 && !this.target.azureLogAnalytics.workspace) {
this.target.azureLogAnalytics.workspace = list[0].value;
if (this.datasource.azureLogAnalyticsDatasource.defaultOrFirstWorkspace) {
this.target.azureLogAnalytics.workspace = this.datasource.azureLogAnalyticsDatasource.defaultOrFirstWorkspace;
}
if (!this.target.azureLogAnalytics.workspace) {
this.target.azureLogAnalytics.workspace = list[0].value;
}
}
return this.workspaces;
})
.catch(this.handleQueryCtrlError.bind(this));
};