From 55072f411f03450b009a2058172dcf8c10617c10 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:41:32 +0100
Subject: [PATCH] fix

---
 monitor/grafana/config.tf  | 60 +++++++++++++++++++-------------------
 monitor/grafana/index.yaml | 56 +++++++++++++++++------------------
 2 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/monitor/grafana/config.tf b/monitor/grafana/config.tf
index 6142c96..e1af4e0 100644
--- a/monitor/grafana/config.tf
+++ b/monitor/grafana/config.tf
@@ -1,32 +1,32 @@
-resource "kubectl_manifest" "config" {
-  yaml_body  = <<-EOF
-    apiVersion: v1
-    kind: ConfigMap
-    metadata:
-      name: grafana
-      namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
-    data:
-      grafana.ini: |
-        [analytics]
-        check_for_updates = true
-        [grafana_net]
-        url = https://grafana.net
-        [log]
-        mode = console
-        [paths]
-        data = /var/lib/grafana/
-        logs = /var/log/grafana
-        plugins = /var/lib/grafana/plugins
-        provisioning = /etc/grafana/provisioning
-        [server]
-        domain = ''
-        root_url = 'https://${local.dns-name}/'
-        [auth.generic_oauth]
-        enabled = true
-        client_id = '${module.oauth2.client_id}'
-        client_secret = '${module.oauth2.client_secret}'
-        auth_url = '${module.oauth2.sso_configuration_url}'
-        api_url	= '${module.oauth2.sso_userinfo}'
+resource "kubernetes_config_map_v1" "config" {
+  metadata {
+    name = "grafana"
+    namespace = var.namespace
+    labels = local.common-labels
+  }
+
+  data = {
+    "grafana.ini" = <<-EOF
+[analytics]
+check_for_updates = true
+[grafana_net]
+url = https://grafana.net
+[log]
+mode = console
+[paths]
+data = /var/lib/grafana/
+logs = /var/log/grafana
+plugins = /var/lib/grafana/plugins
+provisioning = /etc/grafana/provisioning
+[server]
+domain = ''
+root_url = 'https://${local.dns-name}/'
+[auth.generic_oauth]
+enabled = true
+client_id = '${module.oauth2.client_id}'
+client_secret = '${module.oauth2.client_secret}'
+auth_url = '${module.oauth2.sso_configuration_url}'
+api_url	= '${module.oauth2.sso_userinfo}'
   EOF
+  }
 }
diff --git a/monitor/grafana/index.yaml b/monitor/grafana/index.yaml
index 5c9e0e5..c047f94 100644
--- a/monitor/grafana/index.yaml
+++ b/monitor/grafana/index.yaml
@@ -6,31 +6,6 @@ metadata:
   name: grafana
   description: null
 options:
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  app-group:
-    default: monitor
-    examples:
-    - monitor
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
   sub-domain:
     default: grafana
     examples:
@@ -133,6 +108,16 @@ options:
             type: string
         type: object
     type: object
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  admin_name:
+    default: grafana_admin
+    examples:
+    - grafana_admin
+    type: string
   volume:
     default:
       accessMode: ReadWriteOnce
@@ -152,10 +137,25 @@ options:
         default: 10Gi
         type: string
     type: object
-  admin_name:
-    default: grafana_admin
+  domain-name:
+    default: your_company.com
     examples:
-    - grafana_admin
+    - your_company.com
+    type: string
+  app-group:
+    default: monitor
+    examples:
+    - monitor
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
     type: string
 dependencies: []
 providers: