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

Update check for invalid percentile statistics

Browse Source
This commit is contained in:
Adam Palaniuk 2018-10-11 14:00:34 -05:00
parent bcdda7b9ad
commit 58a156ba03
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/cloudwatch/datasource.ts
View File

@ -44,7 +44,13 @@ export default class CloudWatchDatasource {
// valid ExtendedStatistics is like p90.00, check the pattern // valid ExtendedStatistics is like p90.00, check the pattern
const hasInvalidStatistics = item.statistics.some(s => { const hasInvalidStatistics = item.statistics.some(s => {
return s.indexOf('p') === 0 && !/p\d{2}\.\d{2}/.test(s); if (s.indexOf('p') === 0) {
const matches = /^p\d{2}(?:\.\d{1,2})?$/.exec(s);
return !matches || matches[0] !== s;
}
return false;
}); });
if (hasInvalidStatistics) { if (hasInvalidStatistics) {
throw { message: 'Invalid extended statistics' }; throw { message: 'Invalid extended statistics' };

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

@ -122,7 +122,7 @@ describe('CloudWatchDatasource', () => {
}); });
}); });
it('should cancel query for invalid extended statistics', () => { it.each(['pNN.NN', 'p9', 'p99.', 'p99.999'])('should cancel query for invalid extended statistics (%s)', stat => {
const query = { const query = {
range: { from: 'now-1h', to: 'now' }, range: { from: 'now-1h', to: 'now' },
rangeRaw: { from: 1483228800, to: 1483232400 }, rangeRaw: { from: 1483228800, to: 1483232400 },
@ -134,7 +134,7 @@ describe('CloudWatchDatasource', () => {
dimensions: { dimensions: {
InstanceId: 'i-12345678', InstanceId: 'i-12345678',
}, },
statistics: ['pNN.NN'], statistics: [stat],
period: '60s', period: '60s',
}, },
], ],