From c490eac79903b9a9a456350a6d5ebedb2e16e062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Wed, 24 Jan 2024 16:01:53 +0100
Subject: [PATCH] fix

---
 monitor/grafana/config.tf  |  1 +
 monitor/grafana/index.yaml | 50 +++++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/monitor/grafana/config.tf b/monitor/grafana/config.tf
index 9f668cd..0b93418 100644
--- a/monitor/grafana/config.tf
+++ b/monitor/grafana/config.tf
@@ -28,6 +28,7 @@ org_name = Main Org.
 org_role = Viewer
 [auth.generic_oauth]
 enabled = true
+scopes = openid email nickname
 client_id = '${module.oauth2.client_id}'
 client_secret = '${module.oauth2.client_secret}'
 auth_url = '${module.oauth2.sso_authorize}'
diff --git a/monitor/grafana/index.yaml b/monitor/grafana/index.yaml
index 8ca51e9..a916aa6 100644
--- a/monitor/grafana/index.yaml
+++ b/monitor/grafana/index.yaml
@@ -6,6 +6,16 @@ metadata:
   name: grafana
   description: null
 options:
+  sub-domain:
+    default: grafana
+    examples:
+    - grafana
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
   images:
     default:
       busybox:
@@ -108,36 +118,11 @@ options:
     examples:
     - grafana_admin
     type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  sub-domain:
-    default: grafana
-    examples:
-    - grafana
-    type: string
   domain-name:
     default: your_company.com
     examples:
     - your_company.com
     type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  app-group:
-    default: monitor
-    examples:
-    - monitor
-    type: string
   volume:
     default:
       accessMode: ReadWriteOnce
@@ -157,6 +142,21 @@ options:
         default: 10Gi
         type: string
     type: object
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  app-group:
+    default: monitor
+    examples:
+    - monitor
+    type: string
 dependencies: []
 providers:
   kubernetes: true