IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 08:05:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-10-08 13:30:11 +02:00
commit 8789be7671
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/kairosdb/datasource.js
View File

@ -284,6 +284,10 @@ function (angular, _, dateMath, kbn) {
query.aggregators = [];
if (target.downsampling !== '(NONE)') {
if (target.downsampling === undefined) {
target.downsampling = 'avg';
target.sampling = '10s';
}
query.aggregators.push({
name: target.downsampling,
align_sampling: true,