Merge branch 'release-11' into fix-proxy-urls

alert/dispatch/dispatch.go

@@ -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
 	}
 
@@ -191,8 +192,8 @@ func (e *Dispatch) blockEventNotify(rule *models.AlertRule, event *models.AlertC
 		}
 	}
 
-	// 规则配置是否改变
-	if event.RuleHash != rule.Hash() {
+	// 恢复通知，检测规则配置是否改变
+	if event.IsRecovered && event.RuleHash != rule.Hash() {
 		return true
 	}
 

models/datasource.go

@@ -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
 }