api/ds/query: simplify data sources lookup for queries and expressions (#41172)

2021-11-05 08:12:55 -07:00
parent c8b7373016
commit 3489721ed6
16 changed files with 255 additions and 224 deletions
@@ -259,7 +259,7 @@ func (dc *dashConditionsJSON) GetNew(orgID int64) (*ngmodels.Condition, error) {
 	ccAlertQuery := ngmodels.AlertQuery{
 		RefID:         ccRefID,
 		Model:         exprModelJSON,
-		DatasourceUID: expr.DatasourceUID,
+		DatasourceUID: expr.OldDatasourceUID,
 	}

 	ngCond.Data = append(ngCond.Data, ccAlertQuery)