IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(alerting): fixed s3 upload issue, progress on alerting on null/missing data, updated ini package to get the support for line continuations

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-09-07 10:11:00 +02:00
parent fc8f0721cd
commit 50b41130ca
23 changed files with 2423 additions and 1439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,9 +19,9 @@ func NewImageUploader() (ImageUploader, error) {
return nil, err
}
bucket := s3sec.Key("secret_key").String()
accessKey := s3sec.Key("access_key").String()
secretKey := s3sec.Key("secret_key").String()
bucket := s3sec.Key("bucket_url").MustString("")
accessKey := s3sec.Key("access_key").MustString("")
secretKey := s3sec.Key("secret_key").MustString("")
if bucket == "" {
return nil, fmt.Errorf("Could not find bucket setting for image.uploader.s3")