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

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

diff --git a/monitor/grafana/config.tf b/monitor/grafana/config.tf
index e1af4e0..0c93c97 100644
--- a/monitor/grafana/config.tf
+++ b/monitor/grafana/config.tf
@@ -4,7 +4,6 @@ resource "kubernetes_config_map_v1" "config" {
     namespace = var.namespace
     labels = local.common-labels
   }
-
   data = {
     "grafana.ini" = <<-EOF
 [analytics]
@@ -25,7 +24,7 @@ root_url = 'https://${local.dns-name}/'
 enabled = true
 client_id = '${module.oauth2.client_id}'
 client_secret = '${module.oauth2.client_secret}'
-auth_url = '${module.oauth2.sso_configuration_url}'
+auth_url = '${module.oauth2.sso_authorize}'
 api_url	= '${module.oauth2.sso_userinfo}'
   EOF
   }
diff --git a/monitor/grafana/index.yaml b/monitor/grafana/index.yaml
index c047f94..a00771c 100644
--- a/monitor/grafana/index.yaml
+++ b/monitor/grafana/index.yaml
@@ -6,10 +6,20 @@ metadata:
   name: grafana
   description: null
 options:
-  sub-domain:
-    default: grafana
+  issuer:
+    default: letsencrypt-prod
     examples:
-    - grafana
+    - letsencrypt-prod
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  app-group:
+    default: monitor
+    examples:
+    - monitor
     type: string
   images:
     default:
@@ -108,15 +118,10 @@ options:
             type: string
         type: object
     type: object
-  ingress-class:
-    default: traefik
+  sub-domain:
+    default: grafana
     examples:
-    - traefik
-    type: string
-  admin_name:
-    default: grafana_admin
-    examples:
-    - grafana_admin
+    - grafana
     type: string
   volume:
     default:
@@ -137,25 +142,20 @@ options:
         default: 10Gi
         type: string
     type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   domain-name:
     default: your_company.com
     examples:
     - your_company.com
     type: string
-  app-group:
-    default: monitor
+  admin_name:
+    default: grafana_admin
     examples:
-    - monitor
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
+    - grafana_admin
     type: string
 dependencies: []
 providers: