feat(alerting): requests looks to be working again

pkg/tsdb/graphite/graphite.go

@@ -0,0 +1,81 @@
+package graphite
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"time"
+
+	"github.com/Unknwon/log"
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/tsdb"
+)
+
+type GraphiteExecutor struct {
+	*tsdb.DataSourceInfo
+}
+
+func NewGraphiteExecutor(dsInfo *tsdb.DataSourceInfo) tsdb.Executor {
+	return &GraphiteExecutor{dsInfo}
+}
+
+func init() {
+	tsdb.RegisterExecutor("graphite", NewGraphiteExecutor)
+}
+
+func (e *GraphiteExecutor) Execute(queries tsdb.QuerySlice, context *tsdb.QueryContext) *tsdb.BatchResult {
+	result := &tsdb.BatchResult{}
+
+	params := url.Values{
+		"from":          []string{context.TimeRange.From},
+		"until":         []string{context.TimeRange.To},
+		"format":        []string{"json"},
+		"maxDataPoints": []string{"500"},
+	}
+
+	for _, query := range queries {
+		params["target"] = []string{
+			getTargetFromQuery(query.Query),
+		}
+	}
+
+	client := http.Client{Timeout: time.Duration(10 * time.Second)}
+	res, err := client.PostForm(e.Url+"/render?", params)
+	if err != nil {
+		result.Error = err
+		return result
+	}
+	defer res.Body.Close()
+
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		result.Error = err
+		return result
+	}
+
+	var data []TargetResponseDTO
+	err = json.Unmarshal(body, &data)
+	if err != nil {
+		log.Info("Error: %v", string(body))
+		result.Error = err
+		return result
+	}
+
+	result.QueryResults = make(map[string]*tsdb.QueryResult)
+	queryRes := &tsdb.QueryResult{}
+	for _, series := range data {
+		queryRes.Series = append(queryRes.Series, &tsdb.TimeSeries{
+			Name:   series.Target,
+			Points: series.DataPoints,
+		})
+	}
+
+	result.QueryResults["A"] = queryRes
+	return result
+}
+
+func getTargetFromQuery(query string) string {
+	json, _ := simplejson.NewJson([]byte(query))
+	return json.Get("target").MustString()
+}

pkg/tsdb/graphite/graphite_test.go

@@ -0,0 +1,31 @@
+package graphite
+
+import (
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+
+	"github.com/grafana/grafana/pkg/tsdb"
+)
+
+func TestGraphite(t *testing.T) {
+
+	Convey("When executing graphite query", t, func() {
+		executor := NewGraphiteExecutor(&tsdb.DataSourceInfo{
+			Url: "http://localhost:8080",
+		})
+
+		queries := tsdb.QuerySlice{
+			&tsdb.Query{Query: "apps.backend.*.counters.requests.count"},
+		}
+		context := tsdb.NewQueryContext(queries, tsdb.TimeRange{})
+
+		result := executor.Execute(queries, context)
+		So(result.Error, ShouldBeNil)
+
+		Convey("Should return series", func() {
+			So(result.QueryResults, ShouldNotBeEmpty)
+		})
+	})
+
+}

pkg/tsdb/graphite/types.go

@@ -0,0 +1,6 @@
+package graphite
+
+type TargetResponseDTO struct {
+	Target     string       `json:"target"`
+	DataPoints [][2]float64 `json:"datapoints"`
+}