opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-21 07:23:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Lower the default timerange (#34280)

Browse Source 
* use a custom default

* use default function
This commit is contained in:
Peter Holmberg
2021-05-19 09:42:40 +02:00
committed by GitHub
parent c30f6fe8fe
commit 26638c23c3
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-data/src/types/time.ts
View File

@ -67,7 +67,7 @@ export function getDefaultTimeRange(): TimeRange {
*/ */
export function getDefaultRelativeTimeRange(): RelativeTimeRange { export function getDefaultRelativeTimeRange(): RelativeTimeRange {
return { return {
from: 21600, from: 600,
to: 0, to: 0,
}; };
} }

7
public/app/features/alerting/unified/utils/rule-form.ts
View File

@ -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 { getDataSourceSrv } from '@grafana/runtime';
import { contextSrv } from 'app/core/services/context_srv'; import { contextSrv } from 'app/core/services/context_srv';
import { getNextRefIdChar } from 'app/core/utils/query'; import { getNextRefIdChar } from 'app/core/utils/query';
@ -22,6 +22,7 @@ import { isGrafanaRulesSource } from './datasource';
import { arrayToRecord, recordToArray } from './misc'; import { arrayToRecord, recordToArray } from './misc';
import { isAlertingRulerRule, isGrafanaRulerRule } from './rules'; import { isAlertingRulerRule, isGrafanaRulerRule } from './rules';
import { parseInterval } from './time'; import { parseInterval } from './time';
import { getDefaultRelativeTimeRange } from '../../../../../../packages/grafana-data';
export const getDefaultFormValues = (): RuleFormValues => export const getDefaultFormValues = (): RuleFormValues =>
Object.freeze({ Object.freeze({
@ -140,9 +141,7 @@ export const getDefaultQueries = (): GrafanaQuery[] => {
if (!dataSource) { if (!dataSource) {
return [getDefaultExpression('A')]; return [getDefaultExpression('A')];
} }
const relativeTimeRange = getDefaultRelativeTimeRange();
const timeRange = getDefaultTimeRange();
const relativeTimeRange = rangeUtil.timeRangeToRelative(timeRange);
return [ return [
{ {