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

Added expire option to dashboard snapshots, #1623

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-03-26 12:00:52 +01:00
parent 722d74a41b
commit b1f85dc8f1
12 changed files with 86 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
pkg/api/dashboard_snapshot.go
View File

@@ -1,10 +1,7 @@
package api
import (
"bytes"
"encoding/json"
"io/ioutil"
"net/http"
"strconv"
"time"
"github.com/grafana/grafana/pkg/api/dtos"
@@ -17,46 +14,24 @@ import (
)
func CreateDashboardSnapshot(c *middleware.Context, cmd m.CreateDashboardSnapshotCommand) {
cmd.Key = util.GetRandomString(32)
if cmd.External {
createExternalSnapshot(c, cmd)
return
cmd.OrgId = -1
metrics.M_Api_Dashboard_Snapshot_External.Inc(1)
} else {
cmd.OrgId = c.OrgId
metrics.M_Api_Dashboard_Snapshot_Create.Inc(1)
}
cmd.Key = util.GetRandomString(32)
if err := bus.Dispatch(&cmd); err != nil {
c.JsonApiErr(500, "Failed to create snaphost", err)
return
}
metrics.M_Api_Dashboard_Snapshot_Create.Inc(1)
c.JSON(200, util.DynMap{"key": cmd.Key, "url": setting.ToAbsUrl("dashboard/snapshot/" + cmd.Key)})
}
func createExternalSnapshot(c *middleware.Context, cmd m.CreateDashboardSnapshotCommand) {
metrics.M_Api_Dashboard_Snapshot_External.Inc(1)
cmd.External = false
json, _ := json.Marshal(cmd)
jsonData := bytes.NewBuffer(json)
client := http.Client{Timeout: time.Duration(5 * time.Second)}
resp, err := client.Post("http://snapshots-origin.raintank.io/api/snapshots", "application/json", jsonData)
if err != nil {
c.JsonApiErr(500, "Failed to publish external snapshot", err)
return
}
c.Header().Set("Content-Type", resp.Header.Get("Content-Type"))
c.WriteHeader(resp.StatusCode)
if resp.ContentLength > 0 {
bytes, _ := ioutil.ReadAll(resp.Body)
c.Write(bytes)
}
}
func GetDashboardSnapshot(c *middleware.Context) {
key := c.Params(":key")
@@ -68,14 +43,24 @@ func GetDashboardSnapshot(c *middleware.Context) {
return
}
snapshot := query.Result
// expired snapshots should also be removed from db
if snapshot.Expires.Before(time.Now()) {
c.JsonApiErr(404, "Snapshot not found", err)
return
}
dto := dtos.Dashboard{
Model: query.Result.Dashboard,
Model: snapshot.Dashboard,
Meta: dtos.DashboardMeta{IsSnapshot: true},
}
metrics.M_Api_Dashboard_Snapshot_Get.Inc(1)
c.Resp.Header().Set("Cache-Control", "public, max-age=31536000")
maxAge := int64(snapshot.Expires.Sub(time.Now()).Seconds())
c.Resp.Header().Set("Cache-Control", "public, max-age="+strconv.FormatInt(maxAge, 10))
c.JSON(200, dto)
}