IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 19:00:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: s3 image uploads to us-east-1 (us standard) did not return correct image urls so images shared to slack and other services was not correct, fixes #8444

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-05-23 15:50:22 +02:00
parent 423ad4d36e
commit befc15c5a1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -4,7 +4,7 @@
"company": "Coding Instinct AB"
},
"name": "grafana",
"version": "4.3.0",
"version": "4.3.1",
"repository": {
"type": "git",
"url": "http://github.com/grafana/grafana.git"

6
pkg/components/imguploader/s3uploader.go
View File

@ -78,5 +78,9 @@ func (u *S3Uploader) Upload(imageDiskPath string) (string, error) {
return "", err
}
return "https://" + u.bucket + ".s3-" + u.region + ".amazonaws.com/" + key, nil
if u.region == "us-east-1" {
return "https://" + u.bucket + ".s3.amazonaws.com/" + key, nil
} else {
return "https://" + u.bucket + ".s3-" + u.region + ".amazonaws.com/" + key, nil
}
}