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

Merge branch Grafana v5 'develop' branch

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-12-15 12:06:09 +01:00
parent 11fd401fad 8905c8e5fb
commit c395237710
522 changed files with 31990 additions and 10112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,10 +80,11 @@ func (n *notificationService) uploadImage(context *EvalContext) (err error) {
}
renderOpts := &renderer.RenderOpts{
Width: "800",
Height: "400",
Timeout: "30",
OrgId: context.Rule.OrgId,
Width: "800",
Height: "400",
Timeout: "30",
OrgId: context.Rule.OrgId,
IsAlertContext: true,
}
if slug, err := context.GetDashboardSlug(); err != nil {