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

only push default datasources to the list if they're not undefined (#43966)

Browse Source
This commit is contained in:
Ashley Harrison 2022-01-13 09:26:26 +00:00 committed by GitHub
parent bf417be2e0
commit 8f1468df6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/features/plugins/datasource_srv.ts
View File

@ -268,15 +268,24 @@ export class DatasourceSrv implements DataSourceService {
if (!filters.pluginId && !filters.alerting) { if (!filters.pluginId && !filters.alerting) {
if (filters.mixed) { if (filters.mixed) {
base.push(this.getInstanceSettings('-- Mixed --')!); const mixedInstanceSettings = this.getInstanceSettings('-- Mixed --');
if (mixedInstanceSettings) {
base.push(mixedInstanceSettings);
}
} }
if (filters.dashboard) { if (filters.dashboard) {
base.push(this.getInstanceSettings('-- Dashboard --')!); const dashboardInstanceSettings = this.getInstanceSettings('-- Dashboard --');
if (dashboardInstanceSettings) {
base.push(dashboardInstanceSettings);
}
} }
if (!filters.tracing) { if (!filters.tracing) {
base.push(this.getInstanceSettings('-- Grafana --')!); const grafanaInstanceSettings = this.getInstanceSettings('-- Grafana --');
if (grafanaInstanceSettings) {
base.push(grafanaInstanceSettings);
}
} }
} }