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

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,