diff --git a/modules/agent/api/init.go b/modules/agent/api/init.go index 166da6e6..9dc23296 100644 --- a/modules/agent/api/init.go +++ b/modules/agent/api/init.go @@ -17,14 +17,14 @@ func Init() { api.HandleAPIMethod(api.DELETE, "/host/:host_id", handler.deleteHost) //bind agent with nodes + api.HandleAPIMethod(api.GET, "/instance/:instance_id/node/_discovery", handler.RequirePermission(handler.getESNodesInfo, enum.PermissionAgentInstanceRead)) 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, "/auto_associate", handler.RequirePermission(handler.autoAssociateESNode, enum.PermissionAgentInstanceWrite)) //api.HandleAPIMethod(api.POST, "/instance/:instance_id/node/_auth", handler.RequirePermission(handler.authESNode, enum.PermissionAgentInstanceWrite)) - api.HandleAPIMethod(api.DELETE, "/instance/:instance_id/_nodes", handler.RequirePermission(handler.deleteESNode, enum.PermissionAgentInstanceWrite)) - api.HandleAPIMethod(api.GET, "/instance/:instance_id/_nodes", handler.RequirePermission(handler.getESNodesInfo, enum.PermissionAgentInstanceRead)) + //api.HandleAPIMethod(api.DELETE, "/instance/:instance_id/_nodes", handler.RequirePermission(handler.deleteESNode, enum.PermissionAgentInstanceWrite)) //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)) diff --git a/modules/agent/api/tod.go b/modules/agent/api/tod.go index 38811fef..a101b391 100644 --- a/modules/agent/api/tod.go +++ b/modules/agent/api/tod.go @@ -347,24 +347,6 @@ func (h *APIHandler) enrollESNode(w http.ResponseWriter, req *http.Request, ps h return } - //settings, err := common2.GetAgentSettings(instID, 0) - //if err != nil { - // log.Error(err) - // h.WriteError(w, err.Error(), http.StatusInternalServerError) - // return - //} - //setting := pickAgentSettings(settings, node) - //if setting == nil { - // setting, err = getAgentTaskSetting(instID, node) - // if err != nil { - // log.Error("get agent task setting error: ", err) - // } - // err = orm.Create(nil, setting) - // if err != nil { - // log.Error("save agent task setting error: ", err) - // } - //} - h.WriteAckOKJSON(w) }