From b6763e0ac2279a4a5ef30224020a78e4c9fd71d5 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 14 Apr 2021 04:38:55 -0400 Subject: [PATCH] fix(datasource_srv): prevent infinite loop where default datasource is named default (#32949) (#32967) (cherry picked from commit b0470c84a5eac8b7871e5a2e4711cadc5e67f93d) Co-authored-by: Jack Westbrook --- public/app/features/plugins/datasource_srv.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts index c09318c59a6..fb71888f325 100644 --- a/public/app/features/plugins/datasource_srv.ts +++ b/public/app/features/plugins/datasource_srv.ts @@ -97,7 +97,7 @@ export class DatasourceSrv implements DataSourceService { // Interpolation here is to support template variable in data source selection nameOrUid = this.templateSrv.replace(nameOrUid, scopedVars, variableInterpolation); - if (nameOrUid === 'default') { + if (nameOrUid === 'default' && this.defaultName !== 'default') { return this.get(this.defaultName); }