public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v11.0.x] Provisioning: Fix regression when dashboardProvisioner is accessed before being initialised (#86186)

Browse Source 
Provisioning: Fix regression when dashboardProvisioner is accessed before being initialised (#85011)

* Provisioning: Fix regression when dashboardProvisioner is accessed before being initialized

* Set dashboard provisioner in the provider

(cherry picked from commit 5ebf2d08f6)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-04-15 16:29:23 +01:00
committed by GitHub
co-authored by Sofia Papagiannaki
parent facb6f63eb
commit 3547c55b52
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/dashboard/access/sql_dashboards.go
+2 -1
View File
@@ -322,8 +322,9 @@ func (a *dashboardSqlAccess) scanRow(rows *sql.Rows) (*dashboardRow, error) {
if origin_name.Valid {
ts := time.Unix(origin_ts.Int64, 0)
resolvedPath := a.provisioning.GetDashboardProvisionerResolvedPath(origin_name.String)
originPath, err := filepath.Rel(
a.provisioning.GetDashboardProvisionerResolvedPath(origin_name.String),
resolvedPath,
origin_path.String,
)
if err != nil {