Config: Fixes bug where timeouts for alerting was not parsed correctly (#16784)

* Fix parsing of the config

* Remove unnecessary conversion

* Remove timeout modification

Co-Authored-By: aocenas <mr.ocenas@gmail.com>

* Remove unused import
This commit is contained in:
Andrej Ocenas
2019-04-30 12:05:38 +02:00
committed by GitHub
parent fef3638018
commit 0433af6385
2 changed files with 5 additions and 4 deletions

View File

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