From 26638c23c364a1b8f985a03bcb86ec608b20047b Mon Sep 17 00:00:00 2001
From: Peter Holmberg <peterholmberg@users.noreply.github.com>
Date: Wed, 19 May 2021 09:42:40 +0200
Subject: [PATCH] Alerting: Lower the default timerange (#34280)

* use a custom default

* use default function
---
 packages/grafana-data/src/types/time.ts                 | 2 +-
 public/app/features/alerting/unified/utils/rule-form.ts | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/grafana-data/src/types/time.ts b/packages/grafana-data/src/types/time.ts
index 6d75574d092..603e9a2abdd 100644
--- a/packages/grafana-data/src/types/time.ts
+++ b/packages/grafana-data/src/types/time.ts
@@ -67,7 +67,7 @@ export function getDefaultTimeRange(): TimeRange {
  */
 export function getDefaultRelativeTimeRange(): RelativeTimeRange {
   return {
-    from: 21600,
+    from: 600,
     to: 0,
   };
 }
diff --git a/public/app/features/alerting/unified/utils/rule-form.ts b/public/app/features/alerting/unified/utils/rule-form.ts
index 0891689748d..4f967b06f78 100644
--- a/public/app/features/alerting/unified/utils/rule-form.ts
+++ b/public/app/features/alerting/unified/utils/rule-form.ts
@@ -1,4 +1,4 @@
-import { DataQuery, getDefaultTimeRange, rangeUtil, RelativeTimeRange } from '@grafana/data';
+import { DataQuery, rangeUtil, RelativeTimeRange } from '@grafana/data';
 import { getDataSourceSrv } from '@grafana/runtime';
 import { contextSrv } from 'app/core/services/context_srv';
 import { getNextRefIdChar } from 'app/core/utils/query';
@@ -22,6 +22,7 @@ import { isGrafanaRulesSource } from './datasource';
 import { arrayToRecord, recordToArray } from './misc';
 import { isAlertingRulerRule, isGrafanaRulerRule } from './rules';
 import { parseInterval } from './time';
+import { getDefaultRelativeTimeRange } from '../../../../../../packages/grafana-data';
 
 export const getDefaultFormValues = (): RuleFormValues =>
   Object.freeze({
@@ -140,9 +141,7 @@ export const getDefaultQueries = (): GrafanaQuery[] => {
   if (!dataSource) {
     return [getDefaultExpression('A')];
   }
-
-  const timeRange = getDefaultTimeRange();
-  const relativeTimeRange = rangeUtil.timeRangeToRelative(timeRange);
+  const relativeTimeRange = getDefaultRelativeTimeRange();
 
   return [
     {