diff --git a/public/app/features/alerting/unified/api/alertRuleApi.ts b/public/app/features/alerting/unified/api/alertRuleApi.ts index 35569448d9b..aaee307716b 100644 --- a/public/app/features/alerting/unified/api/alertRuleApi.ts +++ b/public/app/features/alerting/unified/api/alertRuleApi.ts @@ -192,12 +192,20 @@ export const alertRuleApi = alertingApi.injectEndpoints({ excludeAlerts, }) => { const queryParams: Record = { - rule_group: groupName, - rule_name: ruleName, dashboard_uid: dashboardUid, // Supported only by Grafana managed rules panel_id: panelId?.toString(), // Supported only by Grafana managed rules }; + if (groupName) { + queryParams[PrometheusAPIFilters.RuleGroup] = groupName; + queryParams[PrometheusAPIFilters.RuleGroupVanilla] = groupName; + } + + if (ruleName) { + queryParams[PrometheusAPIFilters.RuleName] = ruleName; + queryParams[PrometheusAPIFilters.RuleNameVanilla] = ruleName; + } + if (namespace) { if (isGrafanaRulesSource(ruleSourceName)) { queryParams[PrometheusAPIFilters.FolderUID] = namespace;