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

style(mqe): improve code

Browse Source
This commit is contained in:
bergquist 2016-11-17 08:48:13 +01:00
parent 23387bd39b
commit 0a0f558c48
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/tsdb/mqe/mqe.go
View File

@ -14,6 +14,16 @@ import (
"github.com/grafana/grafana/pkg/tsdb" "github.com/grafana/grafana/pkg/tsdb"
) )
/*
TODO:
* response serie names
* response serie names with tags
* response serie names with wildcards
* real caching
*/
type MQEExecutor struct { type MQEExecutor struct {
*tsdb.DataSourceInfo *tsdb.DataSourceInfo
QueryParser *MQEQueryParser QueryParser *MQEQueryParser

20
pkg/tsdb/mqe/response_parser.go
View File

@ -13,11 +13,6 @@ import (
"github.com/grafana/grafana/pkg/tsdb" "github.com/grafana/grafana/pkg/tsdb"
) )
// wildcard as alias
// add host to alias
// add app to alias
// regular alias
func NewResponseParser() *MQEResponseParser { func NewResponseParser() *MQEResponseParser {
return &MQEResponseParser{ return &MQEResponseParser{
log: log.New("tsdb.mqe"), log: log.New("tsdb.mqe"),
@ -68,7 +63,7 @@ func (parser *MQEResponseParser) Parse(res *http.Response) (*tsdb.QueryResult, e
var data *MQEResponse = &MQEResponse{} var data *MQEResponse = &MQEResponse{}
err = json.Unmarshal(body, data) err = json.Unmarshal(body, data)
if err != nil { if err != nil {
parser.log.Info("Failed to unmarshal graphite response", "error", err, "status", res.Status, "body", string(body)) parser.log.Info("Failed to unmarshal mqe response", "error", err, "status", res.Status, "body", string(body))
return nil, err return nil, err
} }
@ -77,20 +72,17 @@ func (parser *MQEResponseParser) Parse(res *http.Response) (*tsdb.QueryResult, e
} }
var series tsdb.TimeSeriesSlice var series tsdb.TimeSeriesSlice
for _, v := range data.Body { for _, body := range data.Body {
for _, k := range v.Series { for _, mqeSerie := range body.Series {
serie := &tsdb.TimeSeries{ serie := &tsdb.TimeSeries{Name: body.Name}
Name: v.Name,
}
for i, value := range k.Values { for i, value := range mqeSerie.Values {
timestamp := v.TimeRange.Start + int64(i)*v.TimeRange.Resolution timestamp := body.TimeRange.Start + int64(i)*body.TimeRange.Resolution
serie.Points = append(serie.Points, tsdb.NewTimePoint(value, float64(timestamp))) serie.Points = append(serie.Points, tsdb.NewTimePoint(value, float64(timestamp)))
} }
series = append(series, serie) series = append(series, serie)
} }
} }
return &tsdb.QueryResult{Series: series}, nil return &tsdb.QueryResult{Series: series}, nil