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

(cloudwatch) move query parameter to 'parameters'

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2017-09-10 01:36:40 +09:00
parent 110f157621
commit 62d84c1e14
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,9 +62,13 @@ func (e *CloudWatchExecutor) Execute(ctx context.Context, queries tsdb.QuerySlic
currentlyExecuting := 0 currentlyExecuting := 0
for _, model := range queries { for _, model := range queries {
queryType := model.Model.Get("type").MustString()
if queryType != "timeSeriesQuery" {
continue
}
currentlyExecuting++ currentlyExecuting++
go func(refId string) { go func(refId string) {
queryRes, err := e.executeQuery(ctx, model, queryContext) queryRes, err := e.executeQuery(ctx, model.Model.Get("parameters"), queryContext)
currentlyExecuting-- currentlyExecuting--
if err != nil { if err != nil {
errCh <- err errCh <- err
@ -130,8 +134,8 @@ func (e *CloudWatchExecutor) getClient(region string) (*cloudwatch.CloudWatch, e
return client, nil return client, nil
} }
func (e *CloudWatchExecutor) executeQuery(ctx context.Context, model *tsdb.Query, queryContext *tsdb.QueryContext) (*tsdb.QueryResult, error) { func (e *CloudWatchExecutor) executeQuery(ctx context.Context, parameters *simplejson.Json, queryContext *tsdb.QueryContext) (*tsdb.QueryResult, error) {
query, err := parseQuery(model.Model) query, err := parseQuery(parameters)
if err != nil { if err != nil {
return nil, err return nil, err
} }

6
public/app/plugins/datasource/cloudwatch/datasource.js
View File

@ -48,12 +48,14 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
item.dimensions = dimensions; item.dimensions = dimensions;
item.period = self.getPeriod(item, options); item.period = self.getPeriod(item, options);
return _.extend({ return {
refId: item.refId, refId: item.refId,
intervalMs: options.intervalMs, intervalMs: options.intervalMs,
maxDataPoints: options.maxDataPoints, maxDataPoints: options.maxDataPoints,
datasourceId: self.instanceSettings.id, datasourceId: self.instanceSettings.id,
}, item); type: 'timeSeriesQuery',
parameters: item
};
}); });
// No valid targets, return the empty result to save a round trip. // No valid targets, return the empty result to save a round trip.