public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(cloudwatch) move query parameter to 'parameters'

Browse Source
This commit is contained in:
Mitsuhiro Tanda
2017-09-29 13:44:01 +09:00
parent 110f157621
commit 62d84c1e14
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/cloudwatch/cloudwatch.go
+7 -3
View File
@@ -62,9 +62,13 @@ func (e *CloudWatchExecutor) Execute(ctx context.Context, queries tsdb.QuerySlic
currentlyExecuting := 0
for _, model := range queries {
queryType := model.Model.Get("type").MustString()
if queryType != "timeSeriesQuery" {
continue
}
currentlyExecuting++
go func(refId string) {
queryRes, err := e.executeQuery(ctx, model, queryContext)
queryRes, err := e.executeQuery(ctx, model.Model.Get("parameters"), queryContext)
currentlyExecuting--
if err != nil {
errCh <- err
@@ -130,8 +134,8 @@ func (e *CloudWatchExecutor) getClient(region string) (*cloudwatch.CloudWatch, e
return client, nil
}
func (e *CloudWatchExecutor) executeQuery(ctx context.Context, model *tsdb.Query, queryContext *tsdb.QueryContext) (*tsdb.QueryResult, error) {
query, err := parseQuery(model.Model)
func (e *CloudWatchExecutor) executeQuery(ctx context.Context, parameters *simplejson.Json, queryContext *tsdb.QueryContext) (*tsdb.QueryResult, error) {
query, err := parseQuery(parameters)
if err != nil {
return nil, err
}