From c0697b99d611c79b103e389fe1bc64929f913774 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 29 Aug 2016 15:49:25 +0200
Subject: [PATCH] fix(alerting): adds support for basic auth

closes #5897
---
 pkg/services/alerting/conditions/query.go | 14 ++++++++++----
 pkg/tsdb/graphite/graphite.go             |  9 +++++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkg/services/alerting/conditions/query.go b/pkg/services/alerting/conditions/query.go
index d94c2d468f2..0a661e8aaab 100644
--- a/pkg/services/alerting/conditions/query.go
+++ b/pkg/services/alerting/conditions/query.go
@@ -106,10 +106,16 @@ func (c *QueryCondition) getRequestForAlertRule(datasource *m.DataSource) *tsdb.
 				RefId: "A",
 				Query: c.Query.Model.Get("target").MustString(),
 				DataSource: &tsdb.DataSourceInfo{
-					Id:       datasource.Id,
-					Name:     datasource.Name,
-					PluginId: datasource.Type,
-					Url:      datasource.Url,
+					Id:                datasource.Id,
+					Name:              datasource.Name,
+					PluginId:          datasource.Type,
+					Url:               datasource.Url,
+					User:              datasource.User,
+					Password:          datasource.Password,
+					Database:          datasource.Database,
+					BasicAuth:         datasource.BasicAuth,
+					BasicAuthUser:     datasource.BasicAuthUser,
+					BasicAuthPassword: datasource.BasicAuthPassword,
 				},
 			},
 		},
diff --git a/pkg/tsdb/graphite/graphite.go b/pkg/tsdb/graphite/graphite.go
index 2a68b23df71..68f92d7527e 100644
--- a/pkg/tsdb/graphite/graphite.go
+++ b/pkg/tsdb/graphite/graphite.go
@@ -43,12 +43,17 @@ func (e *GraphiteExecutor) Execute(queries tsdb.QuerySlice, context *tsdb.QueryC
 	}
 
 	client := http.Client{Timeout: time.Duration(10 * time.Second)}
-	res, err := client.PostForm(e.Url+"/render?", params)
+	req, _ := http.NewRequest(http.MethodPost, e.Url+"/render?", strings.NewReader(params.Encode()))
+	if e.BasicAuth {
+		req.SetBasicAuth("carl", "carl")
+	}
+
+	res, err := client.Do(req)
+	defer res.Body.Close()
 	if err != nil {
 		result.Error = err
 		return result
 	}
-	defer res.Body.Close()
 
 	body, err := ioutil.ReadAll(res.Body)
 	if err != nil {