allow 90 percent of alertTimeout for rendering to complete vs 50 percent

This commit is contained in:
Brian Gann
2019-02-12 23:52:26 -06:00
parent 1310d356fc
commit c98b00c302

View File

@ -3,6 +3,7 @@ package alerting
import ( import (
"errors" "errors"
"fmt" "fmt"
"time"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/imguploader" "github.com/grafana/grafana/pkg/components/imguploader"
@ -126,7 +127,7 @@ func (n *notificationService) uploadImage(context *EvalContext) (err error) {
renderOpts := rendering.Opts{ renderOpts := rendering.Opts{
Width: 1000, Width: 1000,
Height: 500, Height: 500,
Timeout: alertTimeout / 2, Timeout: time.Duration(float64(alertTimeout) * 0.9),
OrgId: context.Rule.OrgId, OrgId: context.Rule.OrgId,
OrgRole: m.ROLE_ADMIN, OrgRole: m.ROLE_ADMIN,
ConcurrentLimit: setting.AlertingRenderLimit, ConcurrentLimit: setting.AlertingRenderLimit,