Merge pull request #13945 from bergquist/alerting_increase_default_duration

alerting: increase default duration for queries

public/app/features/alerting/AlertTabCtrl.ts

@@ -166,7 +166,7 @@ export class AlertTabCtrl {
 
 
     alert.noDataState = alert.noDataState || config.alertingNoDataOrNullValues;
     alert.noDataState = alert.noDataState || config.alertingNoDataOrNullValues;
     alert.executionErrorState = alert.executionErrorState || config.alertingErrorOrTimeout;
     alert.executionErrorState = alert.executionErrorState || config.alertingErrorOrTimeout;
-    alert.frequency = alert.frequency || '60s';
+    alert.frequency = alert.frequency || '1m';
     alert.handler = alert.handler || 1;
     alert.handler = alert.handler || 1;
     alert.notifications = alert.notifications || [];
     alert.notifications = alert.notifications || [];
 
 
@@ -217,7 +217,7 @@ export class AlertTabCtrl {
   buildDefaultCondition() {
   buildDefaultCondition() {
     return {
     return {
       type: 'query',
       type: 'query',
-      query: { params: ['A', '5m', 'now'] },
+      query: { params: ['A', '15m', 'now'] },
       reducer: { type: 'avg', params: [] },
       reducer: { type: 'avg', params: [] },
       evaluator: { type: 'gt', params: [null] },
       evaluator: { type: 'gt', params: [null] },
       operator: { type: 'and' },
       operator: { type: 'and' },