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

fix: Alerting rendering timeout was 30 seconds, same as alert rule eval timeout, this should be much lower so the rendering timeout does not timeout the rule context, fixes #12151 (#12903)

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-08-13 15:38:28 +02:00 committed by GitHub
parent fd032c1111
commit f2b1fabd5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/alerting/notifier.go
View File

@ -3,7 +3,6 @@ package alerting
import ( import (
"errors" "errors"
"fmt" "fmt"
"time"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
@ -81,7 +80,7 @@ func (n *notificationService) uploadImage(context *EvalContext) (err error) {
renderOpts := rendering.Opts{ renderOpts := rendering.Opts{
Width: 1000, Width: 1000,
Height: 500, Height: 500,
Timeout: time.Second * 30, Timeout: alertTimeout / 2,
OrgId: context.Rule.OrgId, OrgId: context.Rule.OrgId,
OrgRole: m.ROLE_ADMIN, OrgRole: m.ROLE_ADMIN,
} }