IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

UAlerting: Increase default max datapoints (#34223)

Browse Source 
Change const value from 100 to 43200 (12 hours at 1sec interval)
This commit is contained in:
Kyle Brandt 2021-05-17 12:46:52 -04:00 committed by GitHub
parent 31c1fc3e6e
commit 331991ca10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/ngalert/models/alert_query.go
View File

@ -9,7 +9,7 @@ import (
"github.com/grafana/grafana/pkg/expr" "github.com/grafana/grafana/pkg/expr"
) )
const defaultMaxDataPoints float64 = 100 const defaultMaxDataPoints float64 = 43200 // 12 hours at 1sec interval
const defaultIntervalMS float64 = 1000 const defaultIntervalMS float64 = 1000
// Duration is a type used for marshalling durations. // Duration is a type used for marshalling durations.

2
pkg/services/ngalert/ngalert.go
View File

@ -109,7 +109,7 @@ func (ng *AlertNG) Init() error {
return nil return nil
} }
// Run starts the scheduler // Run starts the scheduler.
func (ng *AlertNG) Run(ctx context.Context) error { func (ng *AlertNG) Run(ctx context.Context) error {
ng.Log.Debug("ngalert starting") ng.Log.Debug("ngalert starting")
ng.schedule.WarmStateCache(ng.stateManager) ng.schedule.WarmStateCache(ng.stateManager)

6
pkg/tests/api/alerting/api_alertmanager_test.go
View File

@ -863,7 +863,7 @@ func TestAlertRuleCRUD(t *testing.T) {
"model":{ "model":{
"expression":"2 + 3 \u003e 1", "expression":"2 + 3 \u003e 1",
"intervalMs":1000, "intervalMs":1000,
"maxDataPoints":100, "maxDataPoints":43200,
"type":"math" "type":"math"
} }
} }
@ -898,7 +898,7 @@ func TestAlertRuleCRUD(t *testing.T) {
"model":{ "model":{
"expression":"2 + 3 \u003e 1", "expression":"2 + 3 \u003e 1",
"intervalMs":1000, "intervalMs":1000,
"maxDataPoints":100, "maxDataPoints":43200,
"type":"math" "type":"math"
} }
} }
@ -1122,7 +1122,7 @@ func TestAlertRuleCRUD(t *testing.T) {
"model":{ "model":{
"expression":"2 + 3 \u003C 1", "expression":"2 + 3 \u003C 1",
"intervalMs":1000, "intervalMs":1000,
"maxDataPoints":100, "maxDataPoints":43200,
"type":"math" "type":"math"
} }
} }

8
pkg/tests/api/alerting/api_prometheus_test.go
View File

@ -168,7 +168,7 @@ func TestPrometheusRules(t *testing.T) {
"rules": [{ "rules": [{
"state": "inactive", "state": "inactive",
"name": "AlwaysFiring", "name": "AlwaysFiring",
"query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":100,\"type\":\"math\"}}]", "query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":43200,\"type\":\"math\"}}]",
"duration": 10, "duration": 10,
"annotations": { "annotations": {
"annotation1": "val1" "annotation1": "val1"
@ -184,7 +184,7 @@ func TestPrometheusRules(t *testing.T) {
}, { }, {
"state": "inactive", "state": "inactive",
"name": "AlwaysFiringButSilenced", "name": "AlwaysFiringButSilenced",
"query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":100,\"type\":\"math\"}}]", "query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":43200,\"type\":\"math\"}}]",
"labels": null, "labels": null,
"health": "ok", "health": "ok",
"lastError": "", "lastError": "",
@ -223,7 +223,7 @@ func TestPrometheusRules(t *testing.T) {
"rules": [{ "rules": [{
"state": "inactive", "state": "inactive",
"name": "AlwaysFiring", "name": "AlwaysFiring",
"query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":100,\"type\":\"math\"}}]", "query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":43200,\"type\":\"math\"}}]",
"duration": 10, "duration": 10,
"annotations": { "annotations": {
"annotation1": "val1" "annotation1": "val1"
@ -239,7 +239,7 @@ func TestPrometheusRules(t *testing.T) {
}, { }, {
"state": "inactive", "state": "inactive",
"name": "AlwaysFiringButSilenced", "name": "AlwaysFiringButSilenced",
"query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":100,\"type\":\"math\"}}]", "query": "[{\"refId\":\"A\",\"queryType\":\"\",\"relativeTimeRange\":{\"from\":18000,\"to\":10800},\"datasourceUid\":\"-100\",\"model\":{\"expression\":\"2 + 3 \\u003e 1\",\"intervalMs\":1000,\"maxDataPoints\":43200,\"type\":\"math\"}}]",
"labels": null, "labels": null,
"health": "ok", "health": "ok",
"lastError": "", "lastError": "",

6
pkg/tests/api/alerting/api_ruler_test.go
View File

@ -94,7 +94,7 @@ func TestAlertRulePermissions(t *testing.T) {
"model":{ "model":{
"expression":"2 + 3 \u003E 1", "expression":"2 + 3 \u003E 1",
"intervalMs":1000, "intervalMs":1000,
"maxDataPoints":100, "maxDataPoints":43200,
"type":"math" "type":"math"
} }
} }
@ -144,7 +144,7 @@ func TestAlertRulePermissions(t *testing.T) {
"model":{ "model":{
"expression":"2 + 3 \u003E 1", "expression":"2 + 3 \u003E 1",
"intervalMs":1000, "intervalMs":1000,
"maxDataPoints":100, "maxDataPoints":43200,
"type":"math" "type":"math"
} }
} }
@ -216,7 +216,7 @@ func TestAlertRulePermissions(t *testing.T) {
"model":{ "model":{
"expression":"2 + 3 \u003E 1", "expression":"2 + 3 \u003E 1",
"intervalMs":1000, "intervalMs":1000,
"maxDataPoints":100, "maxDataPoints":43200,
"type":"math" "type":"math"
} }
} }