From c41e87d834d0560663157f12ab6ceea58f81014b Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 18 May 2022 04:46:32 -0400 Subject: [PATCH] Alerting: Do not serve alerting images from root (#49022) (#49135) Manually tested with serve_from_sub_path = true and a custom pathUrl (cherry picked from commit 0a44fbdd42936a59015ce3e969e7d497361ba8a9) Co-authored-by: Gilles De Mey --- .../components/rule-editor/rule-types/GrafanaManagedAlert.tsx | 2 +- .../components/rule-editor/rule-types/MimirOrLokiAlert.tsx | 2 +- .../rule-editor/rule-types/MimirOrLokiRecordingRule.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app/features/alerting/unified/components/rule-editor/rule-types/GrafanaManagedAlert.tsx b/public/app/features/alerting/unified/components/rule-editor/rule-types/GrafanaManagedAlert.tsx index b1558560c96..2826b7910f3 100644 --- a/public/app/features/alerting/unified/components/rule-editor/rule-types/GrafanaManagedAlert.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/rule-types/GrafanaManagedAlert.tsx @@ -15,7 +15,7 @@ const GrafanaManagedRuleType: FC = ({ selected = false, disabled, o Transform data with expressions. } - image="/public/img/grafana_icon.svg" + image="public/img/grafana_icon.svg" selected={selected} disabled={disabled} value={RuleFormType.grafana} diff --git a/public/app/features/alerting/unified/components/rule-editor/rule-types/MimirOrLokiAlert.tsx b/public/app/features/alerting/unified/components/rule-editor/rule-types/MimirOrLokiAlert.tsx index 61e40c358ca..9bab434ac87 100644 --- a/public/app/features/alerting/unified/components/rule-editor/rule-types/MimirOrLokiAlert.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/rule-types/MimirOrLokiAlert.tsx @@ -21,7 +21,7 @@ const MimirFlavoredType: FC = ({ selected = false, disabled = false, onCl Expressions are not supported. } - image="/public/img/alerting/mimir_logo.svg" + image="public/img/alerting/mimir_logo.svg" selected={selected} disabled={disabled} value={RuleFormType.cloudAlerting} diff --git a/public/app/features/alerting/unified/components/rule-editor/rule-types/MimirOrLokiRecordingRule.tsx b/public/app/features/alerting/unified/components/rule-editor/rule-types/MimirOrLokiRecordingRule.tsx index 05519e7dcd1..b1ec4dfb82f 100644 --- a/public/app/features/alerting/unified/components/rule-editor/rule-types/MimirOrLokiRecordingRule.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/rule-types/MimirOrLokiRecordingRule.tsx @@ -17,7 +17,7 @@ const RecordingRuleType: FC = ({ selected = false, disabled = false Should be combined with an alert rule. } - image="/public/img/alerting/mimir_logo_recording.svg" + image="public/img/alerting/mimir_logo_recording.svg" selected={selected} disabled={disabled} value={RuleFormType.cloudRecording}