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

allow to directly enroll

This commit is contained in:
medcl 2023-10-27 16:33:25 +08:00
parent 0cae6007a1
commit 1403499c27
3 changed files with 119 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,12 +52,12 @@ func GetEnrolledNodesByAgent(instance *model.Instance) (map[string]BindingItem,
if ok { if ok {
item := BindingItem{} item := BindingItem{}
item.ClusterID = util.ToString(f["cluster_id"]) item.ClusterID = util.ToString(f["cluster_id"])
item.ClusterName = util.ToString(f["cluster_name"]) //item.ClusterName = util.ToString(f["cluster_name"])
item.ClusterUUID = util.ToString(f["cluster_uuid"]) item.ClusterUUID = util.ToString(f["cluster_uuid"])
item.PublishAddress = util.ToString(f["publish_address"]) //item.PublishAddress = util.ToString(f["publish_address"])
item.NodeName = util.ToString(f["node_name"]) //item.NodeName = util.ToString(f["node_name"])
item.PathHome = util.ToString(f["path_home"]) //item.PathHome = util.ToString(f["path_home"])
item.PathLogs = util.ToString(f["path_logs"]) //item.PathLogs = util.ToString(f["path_logs"])
item.NodeUUID = nodeID item.NodeUUID = nodeID
t, ok := v["updated"] t, ok := v["updated"]
@ -132,7 +132,12 @@ func refreshNodesInfo(inst *model.Instance) (*elastic.DiscoveryResult, error) {
continue continue
} }
nodeInfo=nodeInfos[0] //get node information
nodeInfo, ok = nodeInfos[v.NodeUUID]
if !ok {
log.Error("node info not found:", v.ClusterID, ",", v.NodeUUID, ",", err)
continue
}
//get cluster information //get cluster information
clusterInfo, err = metadata.GetClusterInformation(v.ClusterID) clusterInfo, err = metadata.GetClusterInformation(v.ClusterID)
@ -191,16 +196,17 @@ func GetElasticsearchNodesViaAgent(ctx context.Context, instance *model.Instance
} }
type BindingItem struct { type BindingItem struct {
ClusterName string `json:"cluster_name"` ClusterID string `json:"cluster_id"`
ClusterUUID string `json:"cluster_uuid"` ClusterUUID string `json:"cluster_uuid"`
NodeUUID string `json:"node_uuid"` NodeUUID string `json:"node_uuid"`
PublishAddress string `json:"publish_address"`
NodeName string `json:"node_name"` //PublishAddress string `json:"publish_address"`
PathLogs string `json:"path_logs"` //NodeName string `json:"node_name"`
PathHome string `json:"path_home"` //PathLogs string `json:"path_logs"`
//PathHome string `json:"path_home"`
//ClusterName string `json:"cluster_name"`
//infini system assigned id //infini system assigned id
ClusterID string `json:"cluster_id"`
Updated int64 `json:"updated"` Updated int64 `json:"updated"`
} }
@ -255,8 +261,9 @@ func GetElasticLogFileContent(ctx context.Context, instance *model.Instance, bod
} }
func (h *APIHandler) getLogFilesByNode(w http.ResponseWriter, req *http.Request, ps httprouter.Params) { func (h *APIHandler) getLogFilesByNode(w http.ResponseWriter, req *http.Request, ps httprouter.Params) {
clusterID := ps.MustGetParameter("id")
nodeID := ps.MustGetParameter("node_id") nodeID := ps.MustGetParameter("node_id")
inst, pathLogs, err := getAgentByNodeID(nodeID) inst, pathLogs, err := getAgentByNodeID(clusterID, nodeID)
if err != nil { if err != nil {
h.WriteError(w, err.Error(), http.StatusInternalServerError) h.WriteError(w, err.Error(), http.StatusInternalServerError)
log.Error(err) log.Error(err)
@ -283,8 +290,9 @@ func (h *APIHandler) getLogFilesByNode(w http.ResponseWriter, req *http.Request,
} }
func (h *APIHandler) getLogFileContent(w http.ResponseWriter, req *http.Request, ps httprouter.Params) { func (h *APIHandler) getLogFileContent(w http.ResponseWriter, req *http.Request, ps httprouter.Params) {
clusterID := ps.MustGetParameter("id")
nodeID := ps.MustGetParameter("node_id") nodeID := ps.MustGetParameter("node_id")
inst, pathLogs, err := getAgentByNodeID(nodeID) inst, pathLogs, err := getAgentByNodeID(clusterID, nodeID)
if err != nil { if err != nil {
h.WriteError(w, err.Error(), http.StatusInternalServerError) h.WriteError(w, err.Error(), http.StatusInternalServerError)
log.Error(err) log.Error(err)
@ -318,12 +326,13 @@ func (h *APIHandler) getLogFileContent(w http.ResponseWriter, req *http.Request,
} }
//instance, pathLogs //instance, pathLogs
func getAgentByNodeID(nodeID string) (*model.Instance, string, error) { func getAgentByNodeID(clusterID, nodeID string) (*model.Instance, string, error) {
q := orm.Query{ q := orm.Query{
Size: 1000, Size: 1000,
Conds: orm.And(orm.Eq("metadata.category", "node_settings"), Conds: orm.And(orm.Eq("metadata.category", "node_settings"),
orm.Eq("metadata.name", "agent"), orm.Eq("metadata.name", "agent"),
orm.Eq("payload.cluster_id", clusterID),
orm.Eq("payload.node_uuid", nodeID), orm.Eq("payload.node_uuid", nodeID),
), ),
} }
@ -333,17 +342,25 @@ func getAgentByNodeID(nodeID string) (*model.Instance, string, error) {
return nil, "", err return nil, "", err
} }
nodeInfo,err:=metadata.GetNodeConfig(clusterID, nodeID)
if err!=nil||nodeInfo==nil{
log.Error("node info is nil")
return nil, "", err
}
pathLogs := nodeInfo.Payload.NodeInfo.GetPathLogs()
for _, row := range result.Result { for _, row := range result.Result {
v, ok := row.(map[string]interface{}) v, ok := row.(map[string]interface{})
if ok { if ok {
pathLogs := "" //payload, ok := v["payload"]
payload, ok := v["payload"] //if ok {
if ok { // payloadMap, ok := payload.(map[string]interface{})
payloadMap, ok := payload.(map[string]interface{}) // if ok {
if ok { // pathLogs = util.ToString(payloadMap["path_logs"])
pathLogs = util.ToString(payloadMap["path_logs"]) // }
} //}
}
x, ok := v["metadata"] x, ok := v["metadata"]
if ok { if ok {
@ -417,6 +434,15 @@ func (h *APIHandler) discoveryESNodesInfo(w http.ResponseWriter, req *http.Reque
for _, clusterID := range clusterInfo.ClusterIDs { for _, clusterID := range clusterInfo.ClusterIDs {
meta := elastic.GetMetadata(clusterID) meta := elastic.GetMetadata(clusterID)
if meta != nil { if meta != nil {
states,err:=elastic.GetClient(clusterID).GetClusterState()
if err!=nil||states==nil{
log.Error(err)
continue
}
clusterUUID:=states.ClusterUUID
if meta.Config.AgentCredentialID != "" { if meta.Config.AgentCredentialID != "" {
auth, err := common.GetAgentBasicAuth(meta.Config) auth, err := common.GetAgentBasicAuth(meta.Config)
if err != nil { if err != nil {
@ -440,6 +466,32 @@ func (h *APIHandler) discoveryESNodesInfo(w http.ResponseWriter, req *http.Reque
if success { if success {
log.Debug("connect to es node success:", nodeHost, ", pid: ", node.PID) log.Debug("connect to es node success:", nodeHost, ", pid: ", node.PID)
discoveredPIDs[node.PID] = nodeInfo discoveredPIDs[node.PID] = nodeInfo
if nodeInfo.ClusterInfo.ClusterUUID!=clusterUUID{
log.Error("cluster uuid not match, cluster id: ", clusterID, ", cluster uuid: ", clusterUUID, ", node cluster uuid: ", nodeInfo.ClusterInfo.ClusterUUID)
continue
}
//enroll this node
item := BindingItem{
ClusterID: clusterID,
ClusterUUID: nodeInfo.ClusterInfo.ClusterUUID,
//ClusterName: nodeInfo.ClusterInfo.ClusterName,
//NodeName: nodeInfo.NodeInfo.Name,
NodeUUID: nodeInfo.NodeUUID,
//PathHome: nodeInfo.NodeInfo.,
}
settings := NewNodeAgentSettings(instance.ID, &item)
err = orm.Update(&orm.Context{
Refresh: "wait_for",
}, settings)
if err == nil {
nodeInfo.ClusterID = clusterID
nodeInfo.Enrolled = true
}
break break
} }
} }
@ -543,13 +595,14 @@ func NewNodeAgentSettings(instanceID string, item *BindingItem) *model.Setting {
settings.Payload = util.MapStr{ settings.Payload = util.MapStr{
"cluster_id": item.ClusterID, "cluster_id": item.ClusterID,
"cluster_name": item.ClusterName,
"cluster_uuid": item.ClusterUUID, "cluster_uuid": item.ClusterUUID,
"node_uuid": item.NodeUUID, "node_uuid": item.NodeUUID,
"publish_address": item.PublishAddress,
"node_name": item.NodeName, //"cluster_name": item.ClusterName,
"path_home": item.PathHome, //"publish_address": item.PublishAddress,
"path_logs": item.PathLogs, //"node_name": item.NodeName,
//"path_home": item.PathHome,
//"path_logs": item.PathLogs,
} }
return &settings return &settings

2
modules/agent/api/init.go
View File

@ -28,8 +28,6 @@ func Init() {
api.HandleAPIMethod(api.POST, "/instance/:instance_id/node/_enroll", handler.RequirePermission(handler.enrollESNode, enum.PermissionAgentInstanceWrite)) api.HandleAPIMethod(api.POST, "/instance/:instance_id/node/_enroll", handler.RequirePermission(handler.enrollESNode, enum.PermissionAgentInstanceWrite))
api.HandleAPIMethod(api.POST, "/instance/:instance_id/node/_revoke", handler.RequirePermission(handler.revokeESNode, enum.PermissionAgentInstanceWrite)) api.HandleAPIMethod(api.POST, "/instance/:instance_id/node/_revoke", handler.RequirePermission(handler.revokeESNode, enum.PermissionAgentInstanceWrite))
//api.HandleAPIMethod(api.POST, "/auto_associate", handler.RequirePermission(handler.autoAssociateESNode, enum.PermissionAgentInstanceWrite))
//get elasticsearch node logs, direct fetch or via stored logs(TODO) //get elasticsearch node logs, direct fetch or via stored logs(TODO)
api.HandleAPIMethod(api.GET, "/elasticsearch/:id/node/:node_id/logs/_list", handler.RequirePermission(handler.getLogFilesByNode, enum.PermissionAgentInstanceRead)) api.HandleAPIMethod(api.GET, "/elasticsearch/:id/node/:node_id/logs/_list", handler.RequirePermission(handler.getLogFilesByNode, enum.PermissionAgentInstanceRead))
api.HandleAPIMethod(api.POST, "/elasticsearch/:id/node/:node_id/logs/_read", handler.RequirePermission(handler.getLogFileContent, enum.PermissionAgentInstanceRead)) api.HandleAPIMethod(api.POST, "/elasticsearch/:id/node/:node_id/logs/_read", handler.RequirePermission(handler.getLogFileContent, enum.PermissionAgentInstanceRead))

17
modules/agent/api/remote_config.go
View File

@ -15,6 +15,7 @@ import (
"infini.sh/framework/core/orm" "infini.sh/framework/core/orm"
"infini.sh/framework/core/util" "infini.sh/framework/core/util"
common2 "infini.sh/framework/modules/elastic/common" common2 "infini.sh/framework/modules/elastic/common"
metadata2 "infini.sh/framework/modules/elastic/metadata"
"infini.sh/framework/plugins/managed/common" "infini.sh/framework/plugins/managed/common"
"time" "time"
) )
@ -192,12 +193,22 @@ func getAgentIngestConfigs(instance string, items map[string]BindingItem) (strin
} }
} }
if v.PublishAddress==""{ nodeInfo,err:=metadata2.GetNodeConfig(v.ClusterID,v.NodeUUID)
if err!=nil{
log.Error(err)
continue
}
publishAddress:=nodeInfo.Payload.NodeInfo.GetHttpPublishHost()
if publishAddress==""{
log.Errorf("publish address is empty: %v",v.NodeUUID) log.Errorf("publish address is empty: %v",v.NodeUUID)
continue continue
} }
nodeEndPoint := metadata.PrepareEndpoint(v.PublishAddress) nodeEndPoint := metadata.PrepareEndpoint(publishAddress)
pathLogs:=nodeInfo.Payload.NodeInfo.GetPathLogs()
if v.Updated > latestVersion { if v.Updated > latestVersion {
latestVersion = v.Updated latestVersion = v.Updated
@ -217,7 +228,7 @@ func getAgentIngestConfigs(instance string, items map[string]BindingItem) (strin
"CLUSTER_LEVEL_TASKS_ENABLED: %v\n "+ "CLUSTER_LEVEL_TASKS_ENABLED: %v\n "+
"NODE_LEVEL_TASKS_ENABLED: %v\n "+ "NODE_LEVEL_TASKS_ENABLED: %v\n "+
"NODE_LOGS_PATH: \"%v\"\n\n\n", taskID, taskID, "NODE_LOGS_PATH: \"%v\"\n\n\n", taskID, taskID,
v.ClusterID,v.ClusterUUID,v.NodeUUID, nodeEndPoint, username, password, clusterLevelEnabled, nodeLevelEnabled, v.PathLogs))) v.ClusterID,v.ClusterUUID,v.NodeUUID, nodeEndPoint, username, password, clusterLevelEnabled, nodeLevelEnabled, pathLogs)))
} }
hash := util.MD5digest(buffer.String()) hash := util.MD5digest(buffer.String())