From d361c2dbbcdb8e8370725e7db43dfbbe09e404fe Mon Sep 17 00:00:00 2001 From: zhaoxiangchun <1422928955@qq.com> Date: Thu, 8 Apr 2021 18:50:02 +0800 Subject: [PATCH] fix(monitor): alertPanel add dumplicate name check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.重名自动+1 --- pkg/monitor/models/alertpannel.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/monitor/models/alertpannel.go b/pkg/monitor/models/alertpannel.go index 336d00bfa9..34573d3d8e 100644 --- a/pkg/monitor/models/alertpannel.go +++ b/pkg/monitor/models/alertpannel.go @@ -117,11 +117,10 @@ func (man *SAlertPanelManager) ValidateCreateData( } } - name, err := CommonAlertManager.genName(ownerId, data.Name) + name, err := db.GenerateName(man, ownerId, data.Name) if err != nil { return data, err } - data.Name = name alertCreateInput := man.toAlertCreateInput(data) data.AlertCreateInput = alertCreateInput @@ -129,6 +128,8 @@ func (man *SAlertPanelManager) ValidateCreateData( if data.Enabled == nil { data.Enabled = &enable } + + data.Name = name return data, nil }