diff --git a/config/initialization.tpl b/config/initialization.tpl index 6e284740..a87f8cd0 100644 --- a/config/initialization.tpl +++ b/config/initialization.tpl @@ -61,7 +61,6 @@ PUT _ilm/policy/ilm_$[[INDEX_PREFIX]]metrics-30days-retention "min_age": "30d", "actions": { "delete": { - "delete_searchable_snapshot": true } } } diff --git a/plugin/api/gateway/api.go b/plugin/api/gateway/api.go index d41a9524..e37d444a 100644 --- a/plugin/api/gateway/api.go +++ b/plugin/api/gateway/api.go @@ -13,7 +13,7 @@ type GatewayAPI struct { api.Handler } -func init() { +func InitAPI() { gateway:=GatewayAPI{} api.HandleAPIMethod(api.POST, "/gateway/instance/try_connect", gateway.RequireLogin(gateway.tryConnect)) api.HandleAPIMethod(api.GET, "/gateway/instance/:instance_id", gateway.RequirePermission(gateway.getInstance, enum.PermissionGatewayInstanceRead)) diff --git a/plugin/api/init.go b/plugin/api/init.go index 72818baf..aff72102 100644 --- a/plugin/api/init.go +++ b/plugin/api/init.go @@ -3,7 +3,9 @@ package api import ( "infini.sh/console/config" "infini.sh/console/plugin/api/alerting" + "infini.sh/console/plugin/api/gateway" "infini.sh/console/plugin/api/index_management" + "infini.sh/console/plugin/api/insight" "infini.sh/framework/core/api" "infini.sh/framework/core/api/rbac/enum" "path" @@ -62,4 +64,6 @@ func Init(cfg *config.AppConfig) { alertAPI.Init() + gateway.InitAPI() + insight.InitAPI() } diff --git a/plugin/api/insight/api.go b/plugin/api/insight/api.go index cba24a23..f050a45e 100644 --- a/plugin/api/insight/api.go +++ b/plugin/api/insight/api.go @@ -10,7 +10,7 @@ type InsightAPI struct { api.Handler } -func init() { +func InitAPI() { insight := InsightAPI{} api.HandleAPIMethod(api.POST, "/elasticsearch/:id/visualization/metadata", insight.HandleGetMetadata) api.HandleAPIMethod(api.POST, "/elasticsearch/:id/visualization/data", insight.HandleGetMetricData) diff --git a/plugin/setup/setup.go b/plugin/setup/setup.go index c39c1da0..abed8e99 100644 --- a/plugin/setup/setup.go +++ b/plugin/setup/setup.go @@ -387,7 +387,7 @@ func (module *Module) initialize(w http.ResponseWriter, r *http.Request, ps http if request.BootstrapUsername!=""&&request.BootstrapPassword!=""{ //Save bootstrap user user:=rbac.User{} - user.ID="default_user_"+util.GetUUID() + user.ID="default_user_"+request.BootstrapUsername user.Name=request.BootstrapUsername user.NickName=request.BootstrapUsername var hash []byte @@ -421,7 +421,6 @@ func (module *Module) initialize(w http.ResponseWriter, r *http.Request, ps http } //处理 ILM - //处理默认用户信息 //callback InvokeSetupCallback()