mirror of
https://github.com/ccfos/nightingale.git
synced 2026-03-03 06:29:16 +00:00
Compare commits
4 Commits
homeimg
...
release-11
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8ce021c458 | ||
|
|
72d8ac9e30 | ||
|
|
9173bf1668 | ||
|
|
d2ff106ac8 |
@@ -141,6 +141,7 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
|
||||
}
|
||||
|
||||
if e.blockEventNotify(rule, event) {
|
||||
logger.Infof("block event notify: rule_id:%d event:%+v", rule.Id, event)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -192,9 +193,10 @@ func (e *Dispatch) blockEventNotify(rule *models.AlertRule, event *models.AlertC
|
||||
}
|
||||
|
||||
// 规则配置是否改变
|
||||
if event.RuleHash != rule.Hash() {
|
||||
return true
|
||||
}
|
||||
// TODO: 这里后面加一个配置项控制,先注释掉
|
||||
// if event.RuleHash != rule.Hash() {
|
||||
// return true
|
||||
// }
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -12,7 +12,6 @@ import (
|
||||
"github.com/ccfos/nightingale/v6/pkg/poster"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/toolkits/pkg/logger"
|
||||
"github.com/toolkits/pkg/net/httplib"
|
||||
"github.com/toolkits/pkg/str"
|
||||
)
|
||||
|
||||
@@ -104,14 +103,13 @@ func (h HTTP) NewReq(reqUrl *string) (req *http.Request, err error) {
|
||||
|
||||
func (h HTTP) ParseUrl() (target *url.URL, err error) {
|
||||
urls := h.GetUrls()
|
||||
for i := 0; i < len(urls); i++ {
|
||||
if target, err = url.Parse(urls[i]); err != nil {
|
||||
continue
|
||||
}
|
||||
if len(urls) == 0 {
|
||||
return nil, errors.New("no urls")
|
||||
}
|
||||
|
||||
if _, err = httplib.Get(urls[i]).SetTimeout(time.Duration(h.Timeout) * time.Millisecond).Response(); err == nil {
|
||||
return
|
||||
}
|
||||
target, err = url.Parse(urls[0])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@@ -585,9 +585,9 @@ func CanMigrateBg(ctx *ctx.Context) bool {
|
||||
}
|
||||
|
||||
if maxGroupId == 0 {
|
||||
log.Println("migration bgid has been completed.")
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user