From 43d0f8d0115faf579a6d4668a15291a544ddfd29 Mon Sep 17 00:00:00 2001 From: like Date: Fri, 21 Jul 2023 14:56:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20PrometheusRule=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.go | 2 +- src/service/alert_rules.go | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main.go b/src/main.go index c304ef6..6751c14 100644 --- a/src/main.go +++ b/src/main.go @@ -85,7 +85,7 @@ func initConfig() { SmsTemplateLogin: util.SetEnvStr("SMS_TEMPLATE_LOGIN", "SMS_212925130"), // 短信验证码模板 SmsWorkOrderTemplate: util.SetEnvStr("SMS_TEMPLATE_LOGIN", "SMS_462020767"), // 短信工单下发模板 SmsSignName: util.SetEnvStr("SMS_SIGN_NAME", "比格数据"), // 签名 - AweRestURL: util.SetEnvStr("AWE_REST_URL", "http://awecloud-rest/awecloud/rest"), // awecloud-rest + AweRestURL: util.SetEnvStr("AWE_REST_URL", "http://awecloud-rest.beagle-system/awecloud/rest"), // awecloud-rest KubernetesToken: util.SetEnvStr("AWE_REST_K8S_TOKEN", "eyJhbGciOiJSUzI1NiIsImtpZCI6InJ1alJzNEVGamN5UC0wRU1rS1BKQ0JZVUtNNWpzR0t2bmlrSlJhY2Q3R00ifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJiZWFnbGUtc3lzdGVtIiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZWNyZXQubmFtZSI6InJvb3QiLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC5uYW1lIjoicm9vdCIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6IjRlMDM0OTI3LTc0ZTMtNDQ5Yy1hN2RlLWExMGE3MjU1NGYyMCIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDpiZWFnbGUtc3lzdGVtOnJvb3QifQ.YPLE_E2kIeo-YFQtKScBt5p4KhnniJF9n3iWN2i9UMYS06lIsq2-2wBrgON-YsJihWJupYyDQRiZ9h8bUWTrQzhnpsnuJ_aUclKyAw3QOT9rjvZhJp7qP--27dmdspSHncKtvIiprWE7UTUKzvF33WsMB0fSYFqYXOggNFMoT-fXmWwUXjgar3op0iOl3c3deJ_GeBzFyLSHEuGM7OVdjU8032aUmTen0Kji_P1yB4-O3Iqd0OdVs33BQy_tycjbxhQ8TDEpqrqhLnXjAwJCprLDEpFMx7ODZbjB9Wmuns8yJhaRDxTO47rTME7ZIAxjZ-zLR_QybtW97rlwnUTaNw"), // k8s token OpenSearchAddresses: util.SetEnvStr("Open_Search_Addresses", "https://so-opensearch.wodcloud.com"), // 短信验证码模板 OpenSearchUserName: util.SetEnvStr("Open_Search_User_Name", ""), // 短信验证码模板 diff --git a/src/service/alert_rules.go b/src/service/alert_rules.go index 51506a1..b8598c5 100644 --- a/src/service/alert_rules.go +++ b/src/service/alert_rules.go @@ -97,13 +97,13 @@ func (a *AlertRulesSvc) Add(req request.AddAlertRules) (err error) { var item response.AlertRulesItem item, err = a.GetDataById(request.DetailAlertRules{Id: data.Id}) // 查询完整数据 prSvc := PrometheusRuleSvc{User: a.User} // 插入数据到 prometheus.yml --> rule_files - err = prSvc.Create(item) - if err != nil { + createErr := prSvc.Create(item) + if createErr != nil { _, err = db.Delete(&data) if err != nil { return err } - return + return createErr } return nil } @@ -191,18 +191,18 @@ func (a *AlertRulesSvc) Update(req request.UpdateAlertRules) (err error) { { // 删除PrometheusRule - err = prSvc.Delete(item) - if err != nil { - return + deleteErr := prSvc.Delete(item) + if deleteErr != nil { + return deleteErr } // 再次创建PrometheusRule - err = prSvc.Create(item) - if err != nil { + createErr := prSvc.Create(item) + if createErr != nil { _, err = db.Delete(&data) if err != nil { return err } - return + return createErr } } -- 2.26.0