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

Alerting: Fix labels suggestions Grafana-managed rules (#73983)

Browse Source
This commit is contained in:
Konrad Lalik 2023-08-29 14:05:03 +02:00 committed by GitHub
parent 43be03a2d8
commit 45a8ca3111
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx
View File

@ -312,6 +312,13 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
prevCondition && setValue('condition', prevCondition);
} else {
setValue('type', RuleFormType.cloudAlerting);
// dataSourceName is used only by Mimir/Loki alerting and recording rules
// It should be empty for Grafana managed alert rules
const newDsName = getDataSourceSrv().getInstanceSettings(queries[0].datasourceUid)?.name;
if (newDsName) {
setValue('dataSourceName', newDsName);
}
updateExpressionAndDatasource(queries);
const expressions = queries.filter((query) => query.datasourceUid === ExpressionDatasourceUID);
@ -549,11 +556,9 @@ const useSetExpressionAndDataSource = () => {
if (!dataSourceSettings) {
throw new Error('The Data source has not been defined.');
}
setValue('dataSourceName', dataSourceSettings.name);
if (isPromOrLokiQuery(query.model)) {
const expression = query.model.expr;
setValue('expression', expression);
}
};