From 484042b5fabe54c9e939aca17049bb4b15c8e896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Wed, 24 Jan 2024 15:56:08 +0100 Subject: [PATCH] fix --- monitor/grafana/config.tf | 6 ++++ monitor/grafana/index.yaml | 70 +++++++++++++++++++------------------- 2 files changed, 41 insertions(+), 35 deletions(-) diff --git a/monitor/grafana/config.tf b/monitor/grafana/config.tf index 0c93c97..9f668cd 100644 --- a/monitor/grafana/config.tf +++ b/monitor/grafana/config.tf @@ -20,6 +20,12 @@ provisioning = /etc/grafana/provisioning [server] domain = '' root_url = 'https://${local.dns-name}/' +[auth] +oauth_allow_insecure_email_lookup = true +[auth.anonymous] +enabled = true +org_name = Main Org. +org_role = Viewer [auth.generic_oauth] enabled = true client_id = '${module.oauth2.client_id}' diff --git a/monitor/grafana/index.yaml b/monitor/grafana/index.yaml index 9d15a2e..15f47c5 100644 --- a/monitor/grafana/index.yaml +++ b/monitor/grafana/index.yaml @@ -6,6 +6,41 @@ metadata: name: grafana description: null options: + sub-domain: + default: grafana + examples: + - grafana + type: string + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + admin_name: + default: grafana_admin + examples: + - grafana_admin + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + 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 @@ -25,21 +60,6 @@ options: default: 10Gi type: string type: object - admin_name: - default: grafana_admin - examples: - - grafana_admin - type: string - app-group: - default: monitor - examples: - - monitor - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string images: default: busybox: @@ -137,26 +157,6 @@ options: type: string type: object type: object - 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 dependencies: [] providers: kubernetes: true