fix

monitor/grafana/config.tf

@@ -22,7 +22,7 @@ domain = ''
 root_url = 'https://${local.dns-name}/'
 [users]
 auto_assign_org = true
-auto_assign_org_id = 0
+auto_assign_org_id = 1
 [auth]
 oauth_allow_insecure_email_lookup = true
 signout_redirect_url = '${module.oauth2.sso_signout_url}'
@@ -31,7 +31,7 @@ oauth_auto_login = true
 enabled = true
 name = vynil
 scopes = openid profile email
-${var.issuer=="letsencrypt-prod"?"#":""}tls_client_ca = /etc/local-certs/ca.crt
+${var.issuer=="letsencrypt-prod"?";":""}tls_client_ca = /etc/local-certs/ca.crt
 client_id = '${module.oauth2.client_id}'
 client_secret = '${module.oauth2.client_secret}'
 auth_url = '${module.oauth2.sso_authorize_url}'

monitor/grafana/index.yaml

@@ -6,41 +6,6 @@ metadata:
   name: grafana
   description: null
 options:
-  admin_name:
-    default: grafana_admin
-    examples:
-    - grafana_admin
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  sub-domain:
-    default: grafana
-    examples:
-    - grafana
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  app-group:
-    default: monitor
-    examples:
-    - monitor
-    type: string
   images:
     default:
       busybox:
@@ -138,6 +103,16 @@ options:
             type: string
         type: object
     type: object
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  sub-domain:
+    default: grafana
+    examples:
+    - grafana
+    type: string
   volume:
     default:
       accessMode: ReadWriteOnce
@@ -157,6 +132,31 @@ options:
         default: 10Gi
         type: string
     type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  app-group:
+    default: monitor
+    examples:
+    - monitor
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  admin_name:
+    default: grafana_admin
+    examples:
+    - grafana_admin
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
 dependencies: []
 providers:
   kubernetes: true