Use preferences PUT endpoint

Signed-off-by: João Henri <[email protected]> wip: Use PUT endpoint
grafana · Nov 7, 2023 · 8e66ce0 · 8e66ce0
1 parent 9b6cb4e
commit 8e66ce0
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 26 deletions.
diff --git a/api/v1beta1/grafana_types.go b/api/v1beta1/grafana_types.go
@@ -102,9 +102,8 @@ type GrafanaClient struct {
 	PreferIngress *bool `json:"preferIngress,omitempty"`
 }
 
-// GrafanaPreferences holds Grafana preferences settings
+// GrafanaPreferences holds Grafana preferences API settings
 type GrafanaPreferences struct {
-	Theme            string `json:"theme"`
 	HomeDashboardUID string `json:"homeDashboardUid,omitempty"`
 }
 

diff --git a/config/crd/bases/grafana.integreatly.org_grafanas.yaml b/config/crd/bases/grafana.integreatly.org_grafanas.yaml
@@ -3633,10 +3633,6 @@ spec:
                 properties:
                   homeDashboardUid:
                     type: string
-                  theme:
-                    type: string
-                required:
-                - theme
                 type: object
               route:
                 properties:

diff --git a/config/grafana.integreatly.org_grafanas.yaml b/config/grafana.integreatly.org_grafanas.yaml
@@ -9033,10 +9033,6 @@ spec:
                 properties:
                   homeDashboardUid:
                     type: string
-                  theme:
-                    type: string
-                required:
-                - theme
                 type: object
               route:
                 description: Route sets how the ingress object should look like with

diff --git a/controllers/dashboard_controller.go b/controllers/dashboard_controller.go
@@ -258,7 +258,7 @@ func (r *GrafanaDashboardReconciler) Reconcile(ctx context.Context, req ctrl.Req
 			success = false
 		}
 
-		if grafana.Spec.Preferences != nil && grafana.Spec.Preferences.HomeDashboardUID != "" && uid == grafana.Spec.Preferences.HomeDashboardUID {
+		if grafana.Spec.Preferences != nil && uid == grafana.Spec.Preferences.HomeDashboardUID {
 			err = r.UpdateHomeDashboard(ctx, grafana, uid, cr)
 			if err != nil {
 				return ctrl.Result{RequeueAfter: RequeueDelay}, err
@@ -750,10 +750,14 @@ func (r *GrafanaDashboardReconciler) UpdateHomeDashboard(ctx context.Context, gr
 		return err
 	}
 
-	_, err = grafanaClient.UpdateOrgPreferences(grapi.Preferences{
-		Theme:            grafana.Spec.Preferences.Theme,
-		HomeDashboardUID: uid,
-	})
+	p, err := grafanaClient.OrgPreferences()
+	if err != nil {
+		r.Log.Error(err, "unable to fetch org preferences", "namespace", dashboard.Namespace, "name", dashboard.Name)
+		return err
+	}
+
+	p.HomeDashboardUID = uid
+	_, err = grafanaClient.UpdateAllOrgPreferences(p)
 	if err != nil {
 		r.Log.Error(err, "unable to update the home dashboard", "namespace", dashboard.Namespace, "name", dashboard.Name)
 		return err

diff --git a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanas.yaml b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanas.yaml
@@ -3633,10 +3633,6 @@ spec:
                 properties:
                   homeDashboardUid:
                     type: string
-                  theme:
-                    type: string
-                required:
-                - theme
                 type: object
               route:
                 properties:

diff --git a/deploy/kustomize/base/crds.yaml b/deploy/kustomize/base/crds.yaml
@@ -9703,6 +9703,12 @@ spec:
                         type: string
                     type: object
                 type: object
+              preferences:
+                description: Preferences holds the Grafana Preferences settings
+                properties:
+                  homeDashboardUid:
+                    type: string
+                type: object
               route:
                 description: Route sets how the ingress object should look like with
                   your grafana instance, this only works in Openshift.

diff --git a/docs/docs/api.md b/docs/docs/api.md
@@ -15545,13 +15545,6 @@ Preferences holds the Grafana Preferences settings
         </tr>
     </thead>
     <tbody><tr>
-        <td><b>theme</b></td>
-        <td>string</td>
-        <td>
-          <br/>
-        </td>
-        <td>true</td>
-      </tr><tr>
         <td><b>homeDashboardUid</b></td>
         <td>string</td>
         <td>