Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow specifying default UID for dashboards #1699

Closed
wants to merge 1 commit into from
Closed

Allow specifying default UID for dashboards #1699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions api/v1beta1/grafanadashboard_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,10 @@ type GrafanaDashboardSpec struct {
// +optional
Datasources []GrafanaDashboardDatasource `json:"datasources,omitempty"`

// Allows specifying the UID of a dashboard if one is not provided, defaults to metadata.uid
// +optional
DefaultUID *string `json:"defaultUID,omitempty"`

// allow to import this resources from an operator in a different namespace
// +optional
AllowCrossNamespaceImport *bool `json:"allowCrossNamespaceImport,omitempty"`
Expand Down
6 changes: 5 additions & 1 deletion controllers/dashboard_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,11 @@ func (r *GrafanaDashboardReconciler) getDashboardModel(cr *v1beta1.GrafanaDashbo

uid, _ := dashboardModel["uid"].(string) //nolint:errcheck
if uid == "" {
uid = string(cr.UID)
if cr.Spec.DefaultUID != nil && *cr.Spec.DefaultUID != "" {
uid = *cr.Spec.DefaultUID
} else {
uid = string(cr.UID)
}
}

dashboardModel["uid"] = uid
Expand Down