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

Small fix to graphiteDatasource and sending cacheTimeout undefined, reintroduced this bug yesterday, added unit test so it should not appear again

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-09-03 16:48:48 +02:00
parent 917cd35005
commit 65af872ec6
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/services/graphite/graphiteDatasource.js
View File

@ -251,7 +251,9 @@ function (angular, _, $, config, kbn, moment) {
_.each(options, function (value, key) { _.each(options, function (value, key) {
if ($.inArray(key, graphite_options) === -1) { return; } if ($.inArray(key, graphite_options) === -1) { return; }
if (value) {
clean_options.push(key + "=" + encodeURIComponent(value)); clean_options.push(key + "=" + encodeURIComponent(value));
}
}); });
return clean_options; return clean_options;

7
src/test/specs/graphiteDatasource-specs.js
View File

@ -18,7 +18,7 @@ define([
var query = { var query = {
range: { from: 'now-1h', to: 'now' }, range: { from: 'now-1h', to: 'now' },
targets: [{ target: 'prod1.count' }, {target: 'prod2.count'}], targets: [{ target: 'prod1.count' }, {target: 'prod2.count'}],
maxDataPoints: 500 maxDataPoints: 500,
}; };
var response = [{ target: 'prod1.count', points: [[10, 1], [12,1]], }]; var response = [{ target: 'prod1.count', points: [[10, 1], [12,1]], }];
@ -46,6 +46,11 @@ define([
expect(params).to.contain('until=now'); expect(params).to.contain('until=now');
}); });
it('should exclude undefined params', function() {
var params = request.split('&');
expect(params).to.not.contain('cacheTimeout=undefined');
});
it('should return series list', function() { it('should return series list', function() {
expect(results.data.length).to.be(1); expect(results.data.length).to.be(1);
expect(results.data[0].target).to.be('prod1.count'); expect(results.data[0].target).to.be('prod1.count');