Snapshot: use given key and deleteKey (#16876)

Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>

Snapshot: use given key and deleteKey (#16876)
Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>
7ebbeb09 · zhulongcheng · Torkel Ödegaard · 7b92c560 · 7ebbeb09
Commit 7ebbeb09 authored May 09, 2019 by zhulongcheng Committed by Torkel Ödegaard May 09, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

pkg/api/dashboard_snapshot.go
+8 -2

No files found.
--- a/pkg/api/dashboard_snapshot.go
+++ b/pkg/api/dashboard_snapshot.go
@@ -99,8 +99,14 @@ func CreateDashboardSnapshot(c *m.ReqContext, cmd m.CreateDashboardSnapshotComma

 		metrics.M_Api_Dashboard_Snapshot_External.Inc()
 	} else {
-		cmd.Key = util.GetRandomString(32)
-		cmd.DeleteKey = util.GetRandomString(32)
+		if cmd.Key == "" {
+			cmd.Key = util.GetRandomString(32)
+		}
+
+		if cmd.DeleteKey == "" {
+			cmd.DeleteKey = util.GetRandomString(32)
+		}
+
 		url = setting.ToAbsUrl("dashboard/snapshot/" + cmd.Key)

 		metrics.M_Api_Dashboard_Snapshot_Create.Inc()