diff --git a/package.json b/package.json index 944094ca101..9f9a4364e33 100644 --- a/package.json +++ b/package.json @@ -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" diff --git a/pkg/components/imguploader/s3uploader.go b/pkg/components/imguploader/s3uploader.go index 2828008e9b7..302420a27f4 100644 --- a/pkg/components/imguploader/s3uploader.go +++ b/pkg/components/imguploader/s3uploader.go @@ -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 + } }