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

etc/webapi.conf

@@ -93,6 +93,8 @@ AuthFilter = "(&(uid=%s))"
 CoverAttributes = true
 TLS = false
 StartTLS = true
+# ldap user default roles
+DefaultRoles = ["Standard"]
 
 [LDAP.Attributes]
 Nickname = "cn"

src/models/user.go

@@ -259,10 +259,14 @@ func LdapLogin(username, pass string) (*User, error) {
 
 	now := time.Now().Unix()
 
+	if len(config.C.LDAP.DefaultRoles) == 0 {
+		config.C.LDAP.DefaultRoles = []string{"Standard"}
+	}
+
 	user.Password = "******"
 	user.Portrait = ""
-	user.Roles = "Standard"
+	user.Roles = strings.Join(config.C.LDAP.DefaultRoles, " ")
-	user.RolesLst = []string{"Standard"}
+	user.RolesLst = config.C.LDAP.DefaultRoles
 	user.Contacts = []byte("{}")
 	user.CreateAt = now
 	user.UpdateAt = now

src/pkg/ldapx/ldapx.go

@@ -19,6 +19,7 @@ type LdapSection struct {
 	CoverAttributes bool
 	TLS             bool
 	StartTLS        bool
+	DefaultRoles    []string
 }
 
 type LdapAttributes struct {

src/webapi/router/router.go

@@ -238,5 +238,13 @@ func configRoute(r *gin.Engine, version string) {
 	{
 		service.Any("/prometheus/*url", prometheusProxy)
 		service.POST("/users", userAddPost)
+
+		service.GET("/targets", targetGets)
+		service.DELETE("/targets", targetDel)
+		service.GET("/targets/tags", targetGetTags)
+		service.POST("/targets/tags", targetBindTags)
+		service.DELETE("/targets/tags", targetUnbindTags)
+		service.PUT("/targets/note", targetUpdateNote)
+		service.PUT("/targets/bgid", targetUpdateBgid)
 	}
 }