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

8789be76 · Torkel Ödegaard · fe46410c · df4d5ea8 · 8789be76
Commit 8789be76 authored Oct 08, 2015 by Torkel Ödegaard
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

public/app/plugins/datasource/kairosdb/datasource.js
+4 -0

No files found.
--- a/public/app/plugins/datasource/kairosdb/datasource.js
+++ b/public/app/plugins/datasource/kairosdb/datasource.js
@@ -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,