Merge branch 'main' of github.com:ccfos/nightingale

shengjian-tech · Aug 2, 2023 · 5b811b7 · 5b811b7
2 parents 55d670f + ac3a5e5
commit 5b811b7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/center/center.go b/center/center.go
@@ -8,6 +8,7 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/alert/process"
 	"github.com/ccfos/nightingale/v6/center/cconf"
+	"github.com/ccfos/nightingale/v6/center/cstats"
 	"github.com/ccfos/nightingale/v6/center/metas"
 	"github.com/ccfos/nightingale/v6/center/sso"
 	"github.com/ccfos/nightingale/v6/conf"
@@ -44,6 +45,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	}
 
 	i18nx.Init()
+	cstats.Init()
 
 	db, err := storage.New(config.DB)
 	if err != nil {

diff --git a/center/sso/init.go b/center/sso/init.go
@@ -29,6 +29,8 @@ Port = 389
 BaseDn = 'dc=example,dc=org'
 BindUser = 'cn=manager,dc=example,dc=org'
 BindPass = '*******'
+# openldap format e.g. (&(uid=%s))
+# AD format e.g. (&(sAMAccountName=%s))
 AuthFilter = '(&(uid=%s))'
 CoverAttributes = true
 TLS = false

diff --git a/pkg/poster/post.go b/pkg/poster/post.go
@@ -165,6 +165,9 @@ func PostJSON(url string, timeout time.Duration, v interface{}, retries ...int)
 	}
 
 	req, err := http.NewRequest("POST", url, bf)
+	if err != nil {
+		return
+	}
 	req.Header.Set("Content-Type", "application/json")
 
 	var resp *http.Response