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

Add leftover metrics for FolderID (#81246)

Browse Source
This commit is contained in:
idafurjes
2024-01-25 12:14:18 +01:00
committed by GitHub
parent 85429f7bd0
commit 0880a239f8
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/dashboardimport/service/service.go
View File

@@ -84,7 +84,7 @@ func (s *ImportDashboardService) ImportDashboard(ctx context.Context, req *dashb
generatedDash.Del("__inputs")
generatedDash.Del("__requires")
metrics.MFolderIDsServiceCount.WithLabelValues("dashboardimport").Inc()
metrics.MFolderIDsServiceCount.WithLabelValues(metrics.DashboardImport).Inc()
// here we need to get FolderId from FolderUID if it present in the request, if both exist, FolderUID would overwrite FolderID
if req.FolderUid != "" {
folder, err := s.folderService.Get(ctx, &folder.GetFolderQuery{
@@ -139,7 +139,7 @@ func (s *ImportDashboardService) ImportDashboard(ctx context.Context, req *dashb
return nil, err
}
metrics.MFolderIDsServiceCount.WithLabelValues("dashboardimport").Inc()
metrics.MFolderIDsServiceCount.WithLabelValues(metrics.DashboardImport).Inc()
// nolint:staticcheck
err = s.libraryPanelService.ImportLibraryPanelsForDashboard(ctx, req.User, libraryElements, generatedDash.Get("panels").MustArray(), req.FolderId)
if err != nil {
@@ -152,7 +152,7 @@ func (s *ImportDashboardService) ImportDashboard(ctx context.Context, req *dashb
}
revision := savedDashboard.Data.Get("revision").MustInt64(0)
metrics.MFolderIDsServiceCount.WithLabelValues("dashboardimport").Inc()
metrics.MFolderIDsServiceCount.WithLabelValues(metrics.DashboardImport).Inc()
return &dashboardimport.ImportDashboardResponse{
UID: savedDashboard.UID,
PluginId: req.PluginId,