Skip to content

Commit fcac599

Browse files
authored
Merge pull request #1068 from utmstack/bugfix/10.6.1/improve-log-explorer-ui
Remove azure docker registry
2 parents c9a7faf + 3fce58e commit fcac599

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

Diff for: installer/docker.go

-5
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ func InitSwarm(mainIP string) error {
4343
if err := utils.RunCmd("docker", "swarm", "init", "--advertise-addr", mainIP); err != nil {
4444
return err
4545
}
46-
47-
if err := utils.RunCmd("docker", "login", "-u", "client", "-p", "4xYkVIAH8kdAH7mP/9BBhbb2ByzLGm4F", "utmstack.azurecr.io"); err != nil {
48-
return err
49-
}
50-
5146
return nil
5247
}
5348

Diff for: installer/search.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ func InitOpenSearch() error {
1111
for intent := 0; intent <= 10; intent++ {
1212
time.Sleep(1 * time.Minute)
1313

14-
_, err := grequests.Get(baseURL+"_cluster/healt", &grequests.RequestOptions{
14+
_, err := grequests.Get(baseURL+"_cluster/health", &grequests.RequestOptions{
1515
Params: map[string]string{
1616
"wait_for_status": "green",
1717
"timeout": "50s",
@@ -31,8 +31,8 @@ func InitOpenSearch() error {
3131
JSON: map[string]interface{}{
3232
"type": "fs",
3333
"settings": map[string]interface{}{
34-
"location": "/usr/share/opensearch/.utm-geoip/",
35-
"readonly": true,
34+
"location": "/usr/share/opensearch/.utm_geoip/",
35+
"compress": true,
3636
},
3737
},
3838
})
@@ -56,9 +56,10 @@ func InitOpenSearch() error {
5656
return err
5757
}
5858

59-
_, err = grequests.Post(baseURL+"_snapshot/.utm_geoip/.utm-geoip/_restore?wait_for_completion=true", &grequests.RequestOptions{
59+
_, err = grequests.Post(baseURL+"_snapshot/.utm_geoip/.utm_geoip/_restore", &grequests.RequestOptions{
6060
JSON: map[string]interface{}{
61-
"indices": ".utm-geoip",
61+
"indices": ".utm-geoip",
62+
"include_global_state": false,
6263
},
6364
})
6465
if err != nil {

0 commit comments

Comments
 (0)