diff --git a/installer/docker.go b/installer/docker.go index 46b058363..437d6d21a 100644 --- a/installer/docker.go +++ b/installer/docker.go @@ -43,11 +43,6 @@ func InitSwarm(mainIP string) error { if err := utils.RunCmd("docker", "swarm", "init", "--advertise-addr", mainIP); err != nil { return err } - - if err := utils.RunCmd("docker", "login", "-u", "client", "-p", "4xYkVIAH8kdAH7mP/9BBhbb2ByzLGm4F", "utmstack.azurecr.io"); err != nil { - return err - } - return nil } diff --git a/installer/search.go b/installer/search.go index 9553bcb06..e8628bf4d 100644 --- a/installer/search.go +++ b/installer/search.go @@ -11,7 +11,7 @@ func InitOpenSearch() error { for intent := 0; intent <= 10; intent++ { time.Sleep(1 * time.Minute) - _, err := grequests.Get(baseURL+"_cluster/healt", &grequests.RequestOptions{ + _, err := grequests.Get(baseURL+"_cluster/health", &grequests.RequestOptions{ Params: map[string]string{ "wait_for_status": "green", "timeout": "50s", @@ -31,8 +31,8 @@ func InitOpenSearch() error { JSON: map[string]interface{}{ "type": "fs", "settings": map[string]interface{}{ - "location": "/usr/share/opensearch/.utm-geoip/", - "readonly": true, + "location": "/usr/share/opensearch/.utm_geoip/", + "compress": true, }, }, }) @@ -56,9 +56,10 @@ func InitOpenSearch() error { return err } - _, err = grequests.Post(baseURL+"_snapshot/.utm_geoip/.utm-geoip/_restore?wait_for_completion=true", &grequests.RequestOptions{ + _, err = grequests.Post(baseURL+"_snapshot/.utm_geoip/.utm_geoip/_restore", &grequests.RequestOptions{ JSON: map[string]interface{}{ - "indices": ".utm-geoip", + "indices": ".utm-geoip", + "include_global_state": false, }, }) if err != nil {