diff --git a/public/app/features/alerting/unified/components/rule-editor/AlertRuleNameInput.tsx b/public/app/features/alerting/unified/components/rule-editor/AlertRuleNameInput.tsx index 02859af1b86..5aaf8a6f09e 100644 --- a/public/app/features/alerting/unified/components/rule-editor/AlertRuleNameInput.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/AlertRuleNameInput.tsx @@ -72,7 +72,7 @@ export const AlertRuleNameAndMetric = () => { pattern: recordingRuleNameValidationPattern(RuleFormType.grafanaRecording), })} aria-label="metric" - placeholder={`Give your metric a name`} + placeholder={`Give the name of the new recorded metric`} /> )} diff --git a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/descriptions.tsx b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/descriptions.tsx index 861b4fd9f96..0f661f9807d 100644 --- a/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/descriptions.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/descriptions.tsx @@ -13,14 +13,14 @@ export const DESCRIPTIONS: Record = { helpLabel: 'Define your recording rule', helpContent: 'Pre-compute frequently needed or computationally expensive expressions and save their result as a new set of time series.', - helpLink: '', + helpLink: 'https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-recording-rules/', }, [RuleFormType.grafanaRecording]: { sectionTitle: 'Define recording rule', helpLabel: 'Define your recording rule', helpContent: 'Pre-compute frequently needed or computationally expensive expressions and save their result as a new set of time series.', - helpLink: '', + helpLink: 'https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-recording-rules/', }, [RuleFormType.grafana]: { sectionTitle: 'Define query and alert condition', diff --git a/public/app/features/alerting/unified/components/rules/RuleDetails.tsx b/public/app/features/alerting/unified/components/rules/RuleDetails.tsx index 7c7659a5e32..ab593b12b1c 100644 --- a/public/app/features/alerting/unified/components/rules/RuleDetails.tsx +++ b/public/app/features/alerting/unified/components/rules/RuleDetails.tsx @@ -7,7 +7,7 @@ import { CombinedRule } from 'app/types/unified-alerting'; import { usePendingPeriod } from '../../hooks/rules/usePendingPeriod'; import { useCleanAnnotations } from '../../utils/annotations'; -import { isGrafanaRecordingRule } from '../../utils/rules'; +import { isGrafanaRecordingRule, isRecordingRule, isRecordingRulerRule } from '../../utils/rules'; import { isNullDate } from '../../utils/time'; import { AlertLabels } from '../AlertLabels'; import { DetailsField } from '../DetailsField'; @@ -53,9 +53,15 @@ export const RuleDetails = ({ rule }: Props) => { - - - + {!( + isRecordingRulerRule(rule.rulerRule) || + isRecordingRule(rule.promRule) || + isGrafanaRecordingRule(rule.rulerRule) + ) && ( + + + + )} ); };