Merge pull request #21 from Somefive/fix/create-dashboard-wo-id

Fix: delete id for dashboard request
kubevela · Jul 26, 2022 · c3c6d99 · c3c6d99
2 parents 6268967 + 245a784
commit c3c6d99
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/apis/o11y/grafana/v1alpha1/printer.go b/pkg/apis/o11y/grafana/v1alpha1/printer.go
@@ -66,7 +66,7 @@ var (
 		{Name: "Name", Type: "string", Format: "name", Description: "the name of the Grafana"},
 		{Name: "Endpoint", Type: "string", Description: "the endpoint"},
 		{Name: "Credential_Type", Type: "string", Description: "the credential type"},
-		{Name: "Labels", Type: "string", Description: "the labels of the Grafana"},
+		{Name: "Labels", Type: "string", Description: "the labels of the Grafana", Priority: 10},
 		{Name: "Creation_Timestamp", Type: "dateTime", Description: "the creation timestamp of the Grafana", Priority: 10},
 	}
 )

diff --git a/pkg/apis/o11y/grafanadashboard/v1alpha1/conversion.go b/pkg/apis/o11y/grafanadashboard/v1alpha1/conversion.go
@@ -38,6 +38,7 @@ func (in *GrafanaDashboard) ToRequestBody() ([]byte, error) {
 		return nil, err
 	}
 	dashboard["uid"] = subresource.NewCompoundName(in.GetName()).SubResourceName
+	delete(dashboard, "id")
 	data := map[string]interface{}{"dashboard": dashboard}
 	if labels := in.GetLabels(); labels != nil {
 		if raw := labels[grafanaDashboardFolderIdLabelKey]; raw != "" {