From dbe68c860d004f1294b1ca111ddf99b4d15a39a7 Mon Sep 17 00:00:00 2001 From: like Date: Mon, 24 Jul 2023 10:52:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=8C=E6=AD=A5PrometheusRule?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/alert_rules.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/service/alert_rules.go b/src/service/alert_rules.go index 393417b..bef4732 100644 --- a/src/service/alert_rules.go +++ b/src/service/alert_rules.go @@ -94,7 +94,7 @@ func (a *AlertRulesSvc) Add(req request.AddAlertRules) (err error) { } } - err = a.CreatePrometheusRule(req.IsEnabled, data.Id, db) + err = a.CreatePrometheusRule(req.IsEnabled, data.Id, db, "") return nil } @@ -175,11 +175,11 @@ func (a *AlertRulesSvc) Update(req request.UpdateAlertRules) (err error) { } } - err = a.CreatePrometheusRule(req.IsEnabled, data.Id, db) + err = a.CreatePrometheusRule(req.IsEnabled, data.Id, db, "update") return nil } -func (a *AlertRulesSvc) CreatePrometheusRule(isEnabled int, id string, db *xorm.Engine) (err error) { +func (a *AlertRulesSvc) CreatePrometheusRule(isEnabled int, id string, db *xorm.Engine, operate string) (err error) { if isEnabled == 1 { var item response.AlertRulesItem item, err = a.GetDataById(request.DetailAlertRules{Id: id}) // 查询完整数据 @@ -190,6 +190,9 @@ func (a *AlertRulesSvc) CreatePrometheusRule(isEnabled int, id string, db *xorm. _, exist, _ := prSvc.Get(item) if exist { deleteErr := prSvc.Delete(item) + if operate == "update" { + return deleteErr + } if deleteErr != nil { _, err = db.ID(id).Delete(&entity.AlertRules{}) if err != nil { @@ -201,6 +204,9 @@ func (a *AlertRulesSvc) CreatePrometheusRule(isEnabled int, id string, db *xorm. createErr := prSvc.Create(item) if createErr != nil { + if operate == "update" { + return createErr + } _, err = db.ID(id).Delete(&entity.AlertRules{}) if err != nil { return -- 2.26.0