IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 08:05:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10150 from jomenxiao/jomenxiao/render_setting_lang

Browse Source 
[render image]add encoding param
This commit is contained in:
Carl Bergquist 2017-12-11 10:36:38 +01:00 committed by GitHub
commit 5d70a36ad8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/render.go
View File

@ -24,6 +24,7 @@ func RenderToPng(c *middleware.Context) {
OrgId: c.OrgId, OrgId: c.OrgId,
Timeout: queryReader.Get("timeout", "60"), Timeout: queryReader.Get("timeout", "60"),
Timezone: queryReader.Get("tz", ""), Timezone: queryReader.Get("tz", ""),
Encoding: queryReader.Get("encoding", ""),
} }
pngPath, err := renderer.RenderToPng(renderOpts) pngPath, err := renderer.RenderToPng(renderOpts)

5
pkg/components/renderer/renderer.go
View File

@ -27,6 +27,7 @@ type RenderOpts struct {
Timeout string Timeout string
OrgId int64 OrgId int64
Timezone string Timezone string
Encoding string
} }
var ErrTimeout = errors.New("Timeout error. You can set timeout in seconds with &timeout url parameter") var ErrTimeout = errors.New("Timeout error. You can set timeout in seconds with &timeout url parameter")
@ -95,6 +96,10 @@ func RenderToPng(params *RenderOpts) (string, error) {
"renderKey=" + renderKey, "renderKey=" + renderKey,
} }
if params.Encoding != "" {
cmdArgs = append([]string{fmt.Sprintf("--output-encoding=%s", params.Encoding)}, cmdArgs...)
}
cmd := exec.Command(binPath, cmdArgs...) cmd := exec.Command(binPath, cmdArgs...)
stdout, err := cmd.StdoutPipe() stdout, err := cmd.StdoutPipe()