Merge branch 'alerting_definitions' into alert_ui_take2

pull/5622/head
bergquist 9 years ago
commit 1e4761854e
  1. 2
      pkg/services/alerting/executor.go

@ -136,7 +136,7 @@ func (e *ExecutorImpl) GetRequestForAlertRule(rule *AlertRule, datasource *m.Dat
From: "-" + strconv.Itoa(rule.QueryRange) + "s", From: "-" + strconv.Itoa(rule.QueryRange) + "s",
To: "now", To: "now",
}, },
Queries: tsdb.QuerySlice{ Queries: []*tsdb.Query{
{ {
RefId: rule.QueryRefId, RefId: rule.QueryRefId,
Query: rule.Query, Query: rule.Query,

Loading…
Cancel
Save