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 12:51:20 +00: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/api/annotations.go
+1 -11
View File
@@ -54,17 +54,7 @@ func (hs *HTTPServer) GetAnnotations(c *contextmodel.ReqContext) response.Respon
query.Limit = defaultAnnotationsLimit
}
// When dashboard UID present in the request, we ignore dashboard ID
if query.DashboardUID != "" {
dq := dashboards.GetDashboardQuery{UID: query.DashboardUID, OrgID: c.GetOrgID()}
dqResult, err := hs.DashboardService.GetDashboard(c.Req.Context(), &dq)
if err != nil {
return response.Error(http.StatusBadRequest, "Invalid dashboard UID in annotation request", err)
} else {
query.DashboardID = dqResult.ID // nolint:staticcheck
}
}
// When dashboard ID exists without UID, find the UID from dashboards api
if query.DashboardID != 0 && query.DashboardUID == "" { // nolint:staticcheck
dq := dashboards.GetDashboardQuery{ID: query.DashboardID, OrgID: c.GetOrgID()} // nolint:staticcheck
dqResult, err := hs.DashboardService.GetDashboard(c.Req.Context(), &dq)