IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-09 23:16:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix alert rule page crashing when datasource contained URL unsafe characters (#51105)

Browse Source 
Any Prometheus datasources that contained URL unsafe characters would crash the application since it fails to find the datasource from the Grafana bootData.
This commit is contained in:
Gilles De Mey 2022-06-20 15:37:22 +02:00 committed by GitHub
parent 87bf0f4315
commit 6a1b8693e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/alerting/unified/RuleViewer.tsx
View File

@ -45,9 +45,10 @@ const pageTitle = 'Alerting / View rule';
export function RuleViewer({ match }: RuleViewerProps) {
const styles = useStyles2(getStyles);
const { id, sourceName } = match.params;
const { id } = match.params;
const identifier = ruleId.tryParse(id, true);
const { loading, error, result: rule } = useCombinedRule(identifier, sourceName);
const { loading, error, result: rule } = useCombinedRule(identifier, identifier?.ruleSourceName);
const runner = useMemo(() => new AlertingQueryRunner(), []);
const data = useObservable(runner.get());
const queries2 = useMemo(() => alertRuleToQueries(rule), [rule]);
@ -86,7 +87,7 @@ export function RuleViewer({ match }: RuleViewerProps) {
);
}, []);
if (!sourceName) {
if (!identifier?.ruleSourceName) {
return (
<RuleViewerLayout title={pageTitle}>
<Alert title={errorTitle}>
@ -96,7 +97,7 @@ export function RuleViewer({ match }: RuleViewerProps) {
);
}
const rulesSource = getRulesSourceByName(sourceName);
const rulesSource = getRulesSourceByName(identifier.ruleSourceName);
if (loading) {
return (