diff --git a/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx b/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx index 5178df5a685..988649f6b3e 100644 --- a/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx @@ -10,7 +10,6 @@ import { Button, Field, Icon, - IconButton, Input, Label, Modal, @@ -28,7 +27,6 @@ import { alertRuleApi } from '../../api/alertRuleApi'; import { GRAFANA_RULER_CONFIG } from '../../api/featureDiscoveryApi'; import { DEFAULT_GROUP_EVALUATION_INTERVAL } from '../../rule-editor/formDefaults'; import { RuleFormValues } from '../../types/rule-form'; -import { GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasource'; import { isGrafanaAlertingRuleByType, isGrafanaManagedRuleByType, @@ -38,7 +36,7 @@ import { import { parsePrometheusDuration } from '../../utils/time'; import { CollapseToggle } from '../CollapseToggle'; import { ProvisioningBadge } from '../Provisioning'; -import { EditRuleGroupModal, evaluateEveryValidationOptions } from '../rules/EditRuleGroupModal'; +import { evaluateEveryValidationOptions } from '../rules/EditRuleGroupModal'; import { EvaluationGroupQuickPick } from './EvaluationGroupQuickPick'; import { GrafanaAlertStatePicker } from './GrafanaAlertStatePicker'; @@ -160,7 +158,6 @@ export function GrafanaEvaluationBehaviorStep({ const isGrafanaAlertingRule = isGrafanaAlertingRuleByType(type); const isGrafanaRecordingRule = isGrafanaRecordingRuleByType(type); const { currentData: rulerNamespace, isLoading: loadingGroups } = useFetchGroupsForFolder(folder?.uid ?? ''); - const [isEditingGroup, setIsEditingGroup] = useState(false); const groupOptions = useMemo(() => { return rulerNamespace ? namespaceToGroupOptions(rulerNamespace, enableProvisionedGroups) : []; @@ -169,7 +166,6 @@ export function GrafanaEvaluationBehaviorStep({ const existingGroup = Object.values(rulerNamespace ?? {}) .flat() .find((ruleGroup) => ruleGroup.name === group); - const isNewGroup = !existingGroup && !loadingGroups; // synchronize the evaluation interval with the group name when it's an existing group useEffect(() => { @@ -178,11 +174,6 @@ export function GrafanaEvaluationBehaviorStep({ } }, [existingGroup, setValue]); - const closeEditGroupModal = () => setIsEditingGroup(false); - const onOpenEditGroupModal = () => setIsEditingGroup(true); - - const editGroupDisabled = loadingGroups || isNewGroup || !folder?.uid || !group; - const [isCreatingEvaluationGroup, setIsCreatingEvaluationGroup] = useState(false); const handleEvalGroupCreation = (groupName: string, evaluationInterval: string) => { @@ -287,38 +278,15 @@ export function GrafanaEvaluationBehaviorStep({ )} - {folder?.uid && isEditingGroup && ( - closeEditGroupModal()} - intervalEditOnly - hideFolder={true} - /> - )} {folder?.title && group && (
{getValues('group') && getValues('evaluateEvery') && ( - - - All rules in the selected group are evaluated every {{ evaluateEvery }}. - - {!isNewGroup && ( - - )} - + + All rules in the selected group are evaluated every {{ evaluateEvery }}. + )}