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

Annotations: Exclude internal dashboard id when saved via UID (#111535)

Browse Source
This commit is contained in:
Ryan McKinley
2025-09-24 15:51:20 +03:00
committed by GitHub
parent 7aed0da22c
commit 305dab3a54
4 changed files with 23 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/annotations/annotationsimpl/xorm_store.go
+3 -6
View File
@@ -299,16 +299,13 @@ func (r *xormRepositoryImpl) Get(ctx context.Context, query annotations.ItemQuer
params = append(params, query.AlertUID, query.OrgID)
}
// nolint: staticcheck
if query.DashboardID != 0 {
sql.WriteString(` AND a.dashboard_id = ?`)
params = append(params, query.DashboardID)
}
// note: orgID is already required above
if query.DashboardUID != "" {
sql.WriteString(` AND a.dashboard_uid = ?`)
params = append(params, query.DashboardUID)
} else if query.DashboardID != 0 { // nolint: staticcheck
sql.WriteString(` AND a.dashboard_id = ?`)
params = append(params, query.DashboardID) // nolint: staticcheck
}
if query.PanelID != 0 {