floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: agent enroll failed (#15)

This commit is contained in:
Hardy 2024-12-07 17:13:32 +08:00 committed by GitHub
parent 9812249268
commit 356f710e4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/agent/api/elasticsearch.go
View File

@ -31,6 +31,7 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"github.com/buger/jsonparser"
log "github.com/cihub/seelog" log "github.com/cihub/seelog"
"infini.sh/console/plugin/managed/server" "infini.sh/console/plugin/managed/server"
httprouter "infini.sh/framework/core/api/router" httprouter "infini.sh/framework/core/api/router"
@ -661,6 +662,9 @@ func (h *APIHandler) getESNodeInfoViaProxy(esHost string, esSchema string, auth
func (h *APIHandler) getESNodeInfoViaProxyWithConfig(cfg *elastic.ElasticsearchConfig, auth *model.BasicAuth, endpoint string) (success, tryAgain bool, info *elastic.LocalNodeInfo) { func (h *APIHandler) getESNodeInfoViaProxyWithConfig(cfg *elastic.ElasticsearchConfig, auth *model.BasicAuth, endpoint string) (success, tryAgain bool, info *elastic.LocalNodeInfo) {
body := util.MustToJSONBytes(cfg) body := util.MustToJSONBytes(cfg)
if cfg.BasicAuth != nil {
body, _ = jsonparser.Set(body, []byte(`"`+cfg.BasicAuth.Password.Get()+`"`), "basic_auth", "password")
}
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10) ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
defer cancel() defer cancel()
req := &util.Request{ req := &util.Request{