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) fix cloudwatch query error over 24h (#9536)

Browse Source 
fix cloudwatch query error over 24h
This commit is contained in:
Mitsuhiro Tanda 2017-10-16 15:31:05 +09:00 committed by Carl Bergquist
parent 2d840f12e0
commit 7edc95cc35
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) {
item.namespace = templateSrv.replace(item.namespace, options.scopedVars);
item.metricName = templateSrv.replace(item.metricName, options.scopedVars);
item.dimensions = self.convertDimensionFormat(item.dimensions, options.scopeVars);
item.period = self.getPeriod(item, options);
item.period = String(self.getPeriod(item, options)); // use string format for period in graph query, and alerting
return _.extend({
refId: item.refId,

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

@ -37,7 +37,7 @@ describe('CloudWatchDatasource', function() {
InstanceId: 'i-12345678'
},
statistics: ['Average'],
period: 300
period: '300'
}
]
};
@ -109,7 +109,7 @@ describe('CloudWatchDatasource', function() {
ctx.ds.query(query).then(function() {
var params = requestParams.queries[0];
expect(params.period).to.be(600);
expect(params.period).to.be('600');
done();
});
ctx.$rootScope.$apply();