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

fix parameter format

Browse Source
This commit is contained in:
Mitsuhiro Tanda
2017-09-24 12:25:52 +09:00
parent fe1d395d79
commit 8243ac39c2
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ func (e *CloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, queryCo
} }
currentlyExecuting++ currentlyExecuting++
go func(refId string, index int) { go func(refId string, index int) {
queryRes, err := e.executeQuery(ctx, queryContext.Queries[index].Model.Get("parameters"), queryContext) queryRes, err := e.executeQuery(ctx, queryContext.Queries[index].Model, queryContext)
currentlyExecuting-- currentlyExecuting--
if err != nil { if err != nil {
errCh <- err errCh <- err

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

@@ -48,14 +48,13 @@ 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 { return _.extend({
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,
type: 'timeSeriesQuery', type: 'timeSeriesQuery',
parameters: item }, 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.
@@ -147,15 +146,14 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
from: range.from, from: range.from,
to: range.to, to: range.to,
queries: [ queries: [
{ _.extend({
refId: 'metricFindQuery', refId: 'metricFindQuery',
intervalMs: 1, // dummy intervalMs: 1, // dummy
maxDataPoints: 1, // dummy maxDataPoints: 1, // dummy
datasourceId: this.instanceSettings.id, datasourceId: this.instanceSettings.id,
type: 'metricFindQuery', type: 'metricFindQuery',
subtype: subtype, subtype: subtype
parameters: parameters }, parameters)
}
] ]
}).then(function (r) { return transformSuggestDataFromTable(r); }); }).then(function (r) { return transformSuggestDataFromTable(r); });
}; };

13
public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
View File

@@ -1,4 +1,3 @@
import "../datasource"; import "../datasource";
import {describe, beforeEach, it, expect, angularMocks} from 'test/lib/common'; import {describe, beforeEach, it, expect, angularMocks} from 'test/lib/common';
import helpers from 'test/specs/helpers'; import helpers from 'test/specs/helpers';
@@ -76,11 +75,11 @@ describe('CloudWatchDatasource', function() {
it('should generate the correct query', function(done) { it('should generate the correct query', function(done) {
ctx.ds.query(query).then(function() { ctx.ds.query(query).then(function() {
var params = requestParams.queries[0]; var params = requestParams.queries[0];
expect(params.parameters.namespace).to.be(query.targets[0].namespace); expect(params.namespace).to.be(query.targets[0].namespace);
expect(params.parameters.metricName).to.be(query.targets[0].metricName); expect(params.metricName).to.be(query.targets[0].metricName);
expect(params.parameters.dimensions['InstanceId']).to.be('i-12345678'); expect(params.dimensions['InstanceId']).to.be('i-12345678');
expect(params.parameters.statistics).to.eql(query.targets[0].statistics); expect(params.statistics).to.eql(query.targets[0].statistics);
expect(params.parameters.period).to.be(query.targets[0].period); expect(params.period).to.be(query.targets[0].period);
done(); done();
}); });
ctx.$rootScope.$apply(); ctx.$rootScope.$apply();
@@ -110,7 +109,7 @@ describe('CloudWatchDatasource', function() {
ctx.ds.query(query).then(function() { ctx.ds.query(query).then(function() {
var params = requestParams.queries[0]; var params = requestParams.queries[0];
expect(params.parameters.period).to.be(600); expect(params.period).to.be(600);
done(); done();
}); });
ctx.$rootScope.$apply(); ctx.$rootScope.$apply();