mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
dashfolders: allows phantomjs rendering for alerting
Makes the alerting user an admin when rendering a png for emails
This commit is contained in:
parent
691ff32ae9
commit
446104d120
@ -21,14 +21,15 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type RenderOpts struct {
|
type RenderOpts struct {
|
||||||
Path string
|
Path string
|
||||||
Width string
|
Width string
|
||||||
Height string
|
Height string
|
||||||
Timeout string
|
Timeout string
|
||||||
OrgId int64
|
OrgId int64
|
||||||
UserId int64
|
UserId int64
|
||||||
OrgRole models.RoleType
|
OrgRole models.RoleType
|
||||||
Timezone string
|
Timezone string
|
||||||
|
IsAlertContext bool
|
||||||
}
|
}
|
||||||
|
|
||||||
var rendererLog log.Logger = log.New("png-renderer")
|
var rendererLog log.Logger = log.New("png-renderer")
|
||||||
@ -75,7 +76,11 @@ func RenderToPng(params *RenderOpts) (string, error) {
|
|||||||
pngPath, _ := filepath.Abs(filepath.Join(setting.ImagesDir, util.GetRandomString(20)))
|
pngPath, _ := filepath.Abs(filepath.Join(setting.ImagesDir, util.GetRandomString(20)))
|
||||||
pngPath = pngPath + ".png"
|
pngPath = pngPath + ".png"
|
||||||
|
|
||||||
renderKey := middleware.AddRenderAuthKey(params.OrgId, params.UserId, params.OrgRole)
|
orgRole := params.OrgRole
|
||||||
|
if params.IsAlertContext {
|
||||||
|
orgRole = models.ROLE_ADMIN
|
||||||
|
}
|
||||||
|
renderKey := middleware.AddRenderAuthKey(params.OrgId, params.UserId, orgRole)
|
||||||
defer middleware.RemoveRenderAuthKey(renderKey)
|
defer middleware.RemoveRenderAuthKey(renderKey)
|
||||||
|
|
||||||
cmdArgs := []string{
|
cmdArgs := []string{
|
||||||
|
@ -79,10 +79,11 @@ func (n *notificationService) uploadImage(context *EvalContext) (err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
renderOpts := &renderer.RenderOpts{
|
renderOpts := &renderer.RenderOpts{
|
||||||
Width: "800",
|
Width: "800",
|
||||||
Height: "400",
|
Height: "400",
|
||||||
Timeout: "30",
|
Timeout: "30",
|
||||||
OrgId: context.Rule.OrgId,
|
OrgId: context.Rule.OrgId,
|
||||||
|
IsAlertContext: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
if slug, err := context.GetDashboardSlug(); err != nil {
|
if slug, err := context.GetDashboardSlug(); err != nil {
|
||||||
|
Loading…
Reference in New Issue
Block a user