diff --git a/pkg/api/dtos/plugins.go b/pkg/api/dtos/plugins.go index fbdf8d4e0ea..7d46cc9d348 100644 --- a/pkg/api/dtos/plugins.go +++ b/pkg/api/dtos/plugins.go @@ -48,6 +48,6 @@ func (slice PluginList) Swap(i, j int) { type ImportDashboardCommand struct { PluginId string `json:"pluginId"` Path string `json:"path"` - Reinstall bool `json:"reinstall"` + Overwrite bool `json:"overwrite"` Inputs []plugins.ImportDashboardInput `json:"inputs"` } diff --git a/pkg/api/plugins.go b/pkg/api/plugins.go index 6446f7fee33..ad81d438978 100644 --- a/pkg/api/plugins.go +++ b/pkg/api/plugins.go @@ -156,11 +156,12 @@ func GetPluginReadme(c *middleware.Context) Response { func ImportDashboard(c *middleware.Context, apiCmd dtos.ImportDashboardCommand) Response { cmd := plugins.ImportDashboardCommand{ - OrgId: c.OrgId, - UserId: c.UserId, - PluginId: apiCmd.PluginId, - Path: apiCmd.Path, - Inputs: apiCmd.Inputs, + OrgId: c.OrgId, + UserId: c.UserId, + PluginId: apiCmd.PluginId, + Path: apiCmd.Path, + Inputs: apiCmd.Inputs, + Overwrite: apiCmd.Overwrite, } if err := bus.Dispatch(&cmd); err != nil { diff --git a/pkg/plugins/dashboard_importer.go b/pkg/plugins/dashboard_importer.go index 834bfabd048..4d2757b9a0e 100644 --- a/pkg/plugins/dashboard_importer.go +++ b/pkg/plugins/dashboard_importer.go @@ -11,12 +11,13 @@ import ( ) type ImportDashboardCommand struct { - Path string `json:"string"` - Inputs []ImportDashboardInput `json:"inputs"` + Path string + Inputs []ImportDashboardInput + Overwrite bool - OrgId int64 `json:"-"` - UserId int64 `json:"-"` - PluginId string `json:"-"` + OrgId int64 + UserId int64 + PluginId string Result *PluginDashboardInfoDTO } @@ -67,6 +68,7 @@ func ImportDashboard(cmd *ImportDashboardCommand) error { Dashboard: generatedDash, OrgId: cmd.OrgId, UserId: cmd.UserId, + Overwrite: cmd.Overwrite, } if err := bus.Dispatch(&saveCmd); err != nil { diff --git a/public/app/features/plugins/import_list/import_list.html b/public/app/features/plugins/import_list/import_list.html index acb6654d520..86534f1adc7 100644 --- a/public/app/features/plugins/import_list/import_list.html +++ b/public/app/features/plugins/import_list/import_list.html @@ -15,16 +15,16 @@ v{{dash.revision}} - - - Imported v{{dash.installedRevision}} + +  (Imported v{{dash.installedRevision}}) +