From b22649bf8db3a2153a162354c09ed577ceb0fac2 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Mon, 27 Apr 2020 21:17:28 +0200 Subject: [PATCH] Dashboard: Handle min refresh interval when importing dashboard (#23959) If refresh interval is lower than minimum refresh interval when importing dashboard, use the minimum refresh interval instead of returning error. Fixes #23099 --- pkg/services/dashboards/dashboard_service.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/services/dashboards/dashboard_service.go b/pkg/services/dashboards/dashboard_service.go index 84012e6a522..c8342f09306 100644 --- a/pkg/services/dashboards/dashboard_service.go +++ b/pkg/services/dashboards/dashboard_service.go @@ -323,6 +323,11 @@ func (dr *dashboardServiceImpl) deleteDashboard(dashboardId int64, orgId int64, } func (dr *dashboardServiceImpl) ImportDashboard(dto *SaveDashboardDTO) (*models.Dashboard, error) { + if err := validateDashboardRefreshInterval(dto.Dashboard); err != nil { + dr.log.Warn("Changing refresh interval for imported dashboard to minimum refresh interval", "dashboardUid", dto.Dashboard.Uid, "dashboardTitle", dto.Dashboard.Title, "minRefreshInterval", setting.MinRefreshInterval) + dto.Dashboard.Data.Set("refresh", setting.MinRefreshInterval) + } + cmd, err := dr.buildSaveDashboardCommand(dto, false, true) if err != nil { return nil, err