From dc6ea54945823c186a81b20df5f370628ad42d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Tue, 23 Jan 2024 16:34:58 +0100 Subject: [PATCH] fix --- monitor/grafana/datas.tf | 4 +- monitor/grafana/index.yaml | 98 +++++++++++++++++++------------------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/monitor/grafana/datas.tf b/monitor/grafana/datas.tf index 593fe10..0d1f8a8 100644 --- a/monitor/grafana/datas.tf +++ b/monitor/grafana/datas.tf @@ -61,8 +61,8 @@ data "kustomization_overlay" "data" { } patch = <<-EOF - op: replace - path: /spec/endpoints/0/relabelings/0/replacement - value: "${var.namespace}/$1" + path: /spec/namespaceSelector/matchNames/0 + value: "${var.namespace}" EOF } } diff --git a/monitor/grafana/index.yaml b/monitor/grafana/index.yaml index 3dc85fe..fcc277c 100644 --- a/monitor/grafana/index.yaml +++ b/monitor/grafana/index.yaml @@ -6,11 +6,60 @@ metadata: name: grafana description: null options: + 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 + admin_name: + default: grafana_admin + examples: + - grafana_admin + type: string + ingress-class: + default: traefik + examples: + - traefik + type: string + app-group: + default: monitor + examples: + - monitor + type: string + volume: + default: + accessMode: ReadWriteOnce + size: 10Gi + examples: + - accessMode: ReadWriteOnce + size: 10Gi + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 10Gi + type: string + type: object images: default: busybox: @@ -108,55 +157,6 @@ options: type: string type: object type: object - admin_name: - default: grafana_admin - examples: - - grafana_admin - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - app-group: - default: monitor - examples: - - monitor - type: string - volume: - default: - accessMode: ReadWriteOnce - size: 10Gi - examples: - - accessMode: ReadWriteOnce - size: 10Gi - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 10Gi - type: string - type: object - sub-domain: - default: grafana - examples: - - grafana - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string - domain-name: - default: your_company.com - examples: - - your_company.com - type: string dependencies: [] providers: kubernetes: true