feat(annotations): working on alert annotations, #5694

This commit is contained in:
Torkel Ödegaard
2016-08-01 10:07:00 +02:00
parent c5e90b1801
commit 357358898d
17 changed files with 161 additions and 70 deletions

View File

@@ -4,7 +4,6 @@ import (
"io/ioutil"
"net/http"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/util"
"github.com/kr/s3/s3util"
)
@@ -31,8 +30,6 @@ func (u *S3Uploader) Upload(path string) (string, error) {
s3util.DefaultConfig.AccessKey = u.accessKey
s3util.DefaultConfig.SecretKey = u.secretKey
log.Info("AccessKey: %s", u.accessKey)
log.Info("SecretKey: %s", u.secretKey)
header := make(http.Header)
header.Add("x-amz-acl", "public-read")