public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v4.3.x'

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-05-23 15:52:24 +02:00
parent 3695337980 befc15c5a1
commit 330cb92b24
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/components/imguploader/s3uploader.go
+5 -1
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
}
}