PluginManager: Make Plugins, Renderer and DataSources non-global (#31866)

* PluginManager: Make Plugins and DataSources non-global Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix integration tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Replace outdated command Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * DashboardService: Ensure it gets constructed with necessary parameters Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix build Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * DashboardService: Ensure it gets constructed with necessary parameters Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove dead code Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove FocusConvey Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove dead code Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Undo interface changes Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Backend: Move tsdbifaces.RequestHandler to plugins.DataRequestHandler Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Rename to DataSourceCount Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Consolidate dashboard interfaces into one Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix dashboard integration tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2025-02-25 18:55:37 -06:00 · 2021-03-17 16:06:10 +01:00
parent f1df32ac03
commit 87c3a2b790
95 changed files with 2455 additions and 2426 deletions
--- a/pkg/models/alert.go
+++ b/pkg/models/alert.go
@@ -209,18 +209,3 @@ type AlertStateInfoDTO struct {
 	State        AlertStateType `json:"state"`
 	NewStateDate time.Time      `json:"newStateDate"`
 }
-
-// "Internal" commands
-
-type UpdateDashboardAlertsCommand struct {
-	OrgId     int64
-	Dashboard *Dashboard
-	User      *SignedInUser
-}
-
-type ValidateDashboardAlertsCommand struct {
-	UserId    int64
-	OrgId     int64
-	Dashboard *Dashboard
-	User      *SignedInUser
-}
--- a/pkg/models/dashboard_acl.go
+++ b/pkg/models/dashboard_acl.go
@@ -95,15 +95,6 @@ func (dto *DashboardAclInfoDTO) IsDuplicateOf(other *DashboardAclInfoDTO) bool {
 	return dto.hasSameRoleAs(other) || dto.hasSameUserAs(other) || dto.hasSameTeamAs(other)
 }

-//
-// COMMANDS
-//
-
-type UpdateDashboardAclCommand struct {
-	DashboardID int64
-	Items       []*DashboardAcl
-}
-
 //
 // QUERIES
 //
--- a/pkg/models/dashboards.go
+++ b/pkg/models/dashboards.go
@@ -367,13 +367,6 @@ type DeleteDashboardCommand struct {
 	OrgId int64
 }

-type ValidateDashboardBeforeSaveCommand struct {
-	OrgId     int64
-	Dashboard *Dashboard
-	Overwrite bool
-	Result    *ValidateDashboardBeforeSaveResult
-}
-
 type DeleteOrphanedProvisionedDashboardsCommand struct {
 	ReaderNames []string
 }
@@ -430,11 +423,6 @@ type GetProvisionedDashboardDataByIdQuery struct {
 	Result      *DashboardProvisioning
 }

-type GetProvisionedDashboardDataQuery struct {
-	Name   string
-	Result []*DashboardProvisioning
-}
-
 type GetDashboardsBySlugQuery struct {
 	OrgId int64
 	Slug  string
--- a/pkg/models/folders.go
+++ b/pkg/models/folders.go
@@ -32,23 +32,6 @@ type Folder struct {
 	HasAcl    bool
 }

-// GetDashboardModel turns the command into the saveable model
-func (cmd *CreateFolderCommand) GetDashboardModel(orgId int64, userId int64) *Dashboard {
-	dashFolder := NewDashboardFolder(strings.TrimSpace(cmd.Title))
-	dashFolder.OrgId = orgId
-	dashFolder.SetUid(strings.TrimSpace(cmd.Uid))
-
-	if userId == 0 {
-		userId = -1
-	}
-
-	dashFolder.CreatedBy = userId
-	dashFolder.UpdatedBy = userId
-	dashFolder.UpdateSlug()
-
-	return dashFolder
-}
-
 // UpdateDashboardModel updates an existing model from command into model for update
 func (cmd *UpdateFolderCommand) UpdateDashboardModel(dashFolder *Dashboard, orgId int64, userId int64) {
 	dashFolder.OrgId = orgId
--- a/pkg/models/plugin_settings.go
+++ b/pkg/models/plugin_settings.go
@@ -53,10 +53,6 @@ func (cmd *UpdatePluginSettingCmd) GetEncryptedJsonData() securejsondata.SecureJ

 // ---------------------
 // QUERIES
-type GetPluginSettingsQuery struct {
-	OrgId  int64
-	Result []*PluginSettingInfoDTO
-}

 type PluginSettingInfoDTO struct {
 	OrgId         int64