public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v11.3.x] Alerting: Fix setting datasource uid, when datasource is string in old version (#96273)

Browse Source 
Alerting: Fix setting datasource uid, when datasource is string in old version (#96085)

fix setting datasource uid, when datasource is string in old versions rules

(cherry picked from commit 2f58311eea)

Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-11-12 14:23:44 +01:00
committed by GitHub
parent 5cc78ea219
commit 58333e0507
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx
View File

@@ -98,7 +98,18 @@ export const QueryWrapper = ({
// It's unclear as to why this happens, but we need better visibility on why this happens,
// so we log when it does, and make the query model datasource UID match the datasource UID
// We already elsewhere work under the assumption that the datasource settings are fetched from the datasourceUid property
queryWithDefaults.datasource.uid = query.datasourceUid;
// This check is necessary for some few cases where the datasource might be an string instead of an object
// see: https://github.com/grafana/grafana/issues/96040 for more context
if (typeof queryWithDefaults.datasource === 'object' && Boolean(queryWithDefaults.datasource)) {
queryWithDefaults.datasource.uid = query.datasourceUid;
} else {
// if the datasource is a string, we need to convert it to an object, and populate the fields from the query model
queryWithDefaults.datasource = {};
queryWithDefaults.datasource.uid = query.datasourceUid;
queryWithDefaults.datasource.type = query.model.datasource?.type;
queryWithDefaults.datasource.apiVersion = query.model.datasource?.apiVersion;
}
}
function SelectingDataSourceTooltip() {