fix

monitor/alertmanager/index.yaml

@@ -6,7 +6,7 @@ metadata:
   name: alertmanager
   description: null
 options:
-  sub-domain:
+  sub_domain:
     default: alertmanager
     examples:
     - alertmanager
@@ -16,7 +16,7 @@ options:
     examples:
     - letsencrypt-prod
     type: string
-  app-group:
+  app_group:
     default: monitor
     examples:
     - monitor
@@ -65,7 +65,7 @@ options:
     examples:
     - info
     type: string
-  domain-name:
+  domain_name:
     default: your_company.com
     examples:
     - your_company.com
@@ -75,7 +75,7 @@ options:
     examples:
     - 120h
     type: string
-  ingress-class:
+  ingress_class:
     default: traefik
     examples:
     - traefik

monitor/alertmanager/presentation.tf

@@ -1,7 +1,7 @@
 locals {
-  dns-name = "${var.sub-domain}.${var.domain-name}"
-  dns-names = [local.dns-name]
-  app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
+  dns_name = "${var.sub_domain}.${var.domain_name}"
+  dns_names = [local.dns_name]
+  app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
   icon              = "favicon.ico"
   request_headers = {
     "Content-Type"  = "application/json"
@@ -21,10 +21,10 @@ module "ingress" {
   instance          = var.instance
   namespace         = var.namespace
   issuer            = var.issuer
-  ingress_class     = var.ingress-class
+  ingress_class     = var.ingress_class
   labels            = local.common-labels
-  dns_names         = local.dns-names
-  middlewares       = ["forward-${local.app-name}"]
+  dns_names         = local.dns_names
+  middlewares       = ["forward-${local.app_name}"]
   services          = [local.service]
   providers = {
     kubectl = kubectl
@@ -35,8 +35,8 @@ module "application" {
   source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application"
   component         = var.component
   instance          = var.instance
-  app_group         = var.app-group
-  dns_name          = local.dns-name
+  app_group         = var.app_group
+  dns_name          = local.dns_name
   icon              = local.icon
   protocol_provider = module.forward.provider-id
   providers = {
@@ -60,9 +60,9 @@ module "forward" {
   instance          = var.instance
   domain            = var.domain
   namespace         = var.namespace
-  ingress_class     = var.ingress-class
+  ingress_class     = var.ingress_class
   labels            = local.common-labels
-  dns_names         = local.dns-names
+  dns_names         = local.dns_names
   service           = local.service
   icon              = local.icon
   request_headers   = local.request_headers

monitor/grafana/config.tf

@@ -19,7 +19,7 @@ plugins = /var/lib/grafana/plugins
 provisioning = /etc/grafana/provisioning
 [server]
 domain = ''
-root_url = 'https://${local.dns-name}/'
+root_url = 'https://${local.dns_name}/'
 [users]
 auto_assign_org = true
 auto_assign_org_id = 1

monitor/grafana/index.yaml

@@ -25,7 +25,7 @@ options:
         default: 10Gi
         type: string
     type: object
-  sub-domain:
+  sub_domain:
     default: grafana
     examples:
     - grafana
@@ -132,7 +132,7 @@ options:
             type: string
         type: object
     type: object
-  ingress-class:
+  ingress_class:
     default: traefik
     examples:
     - traefik
@@ -147,12 +147,12 @@ options:
     examples:
     - grafana_admin
     type: string
-  app-group:
+  app_group:
     default: monitor
     examples:
     - monitor
     type: string
-  domain-name:
+  domain_name:
     default: your_company.com
     examples:
     - your_company.com

monitor/grafana/presentation.tf

@@ -1,7 +1,7 @@
 locals {
-  dns-name = "${var.sub-domain}.${var.domain-name}"
-  dns-names = [local.dns-name]
-  app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
+  dns_name = "${var.sub_domain}.${var.domain_name}"
+  dns_names = [local.dns_name]
+  app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
   icon              = "public/img/grafana_icon.svg"
   request_headers = {
     "Content-Type"  = "application/json"
@@ -21,9 +21,9 @@ module "ingress" {
   instance          = var.instance
   namespace         = var.namespace
   issuer            = var.issuer
-  ingress_class     = var.ingress-class
+  ingress_class     = var.ingress_class
   labels            = local.common-labels
-  dns_names         = local.dns-names
+  dns_names         = local.dns_names
   middlewares       = []
   services          = [local.service]
   providers = {
@@ -35,8 +35,8 @@ module "ingress" {
   source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application"
   component         = var.component
   instance          = var.instance
-  app_group         = var.app-group
-  dns_name          = local.dns-name
+  app_group         = var.app_group
+  dns_name          = local.dns_name
   icon              = local.icon
   sub_groups        = ["admin"]
   protocol_provider = module.oauth2.provider-id
@@ -52,7 +52,7 @@ module "oauth2" {
   namespace         = var.namespace
   domain            = var.domain
   labels            = local.common-labels
-  dns_name          = local.dns-name
+  dns_name          = local.dns_name
   redirect_path     = "login/generic_oauth"
   providers = {
     kubernetes = kubernetes

monitor/prometheus/index.yaml

@@ -16,12 +16,12 @@ options:
     examples:
     - 10d
     type: string
-  sub-domain:
+  sub_domain:
     default: prometheus
     examples:
     - prometheus
     type: string
-  ingress-class:
+  ingress_class:
     default: traefik
     examples:
     - traefik
@@ -80,12 +80,12 @@ options:
     examples:
     - 1
     type: integer
-  domain-name:
+  domain_name:
     default: your_company.com
     examples:
     - your_company.com
     type: string
-  app-group:
+  app_group:
     default: monitor
     examples:
     - monitor

monitor/prometheus/presentation.tf

@@ -1,7 +1,7 @@
 locals {
-  dns-name = "${var.sub-domain}.${var.domain-name}"
-  dns-names = [local.dns-name]
-  app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
+  dns_name = "${var.sub_domain}.${var.domain_name}"
+  dns_names = [local.dns_name]
+  app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
   icon              = "favicon.ico"
   request_headers = {
     "Content-Type"  = "application/json"
@@ -21,10 +21,10 @@ module "ingress" {
   instance          = var.instance
   namespace         = var.namespace
   issuer            = var.issuer
-  ingress_class     = var.ingress-class
+  ingress_class     = var.ingress_class
   labels            = local.common-labels
-  dns_names         = local.dns-names
-  middlewares       = ["forward-${local.app-name}"]
+  dns_names         = local.dns_names
+  middlewares       = ["forward-${local.app_name}"]
   services          = [local.service]
   providers = {
     kubectl = kubectl
@@ -35,8 +35,8 @@ module "application" {
   source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application"
   component         = var.component
   instance          = var.instance
-  app_group         = var.app-group
-  dns_name          = local.dns-name
+  app_group         = var.app_group
+  dns_name          = local.dns_name
   icon              = local.icon
   protocol_provider = module.forward.provider-id
   providers = {
@@ -60,9 +60,9 @@ module "forward" {
   instance          = var.instance
   domain            = var.domain
   namespace         = var.namespace
-  ingress_class     = var.ingress-class
+  ingress_class     = var.ingress_class
   labels            = local.common-labels
-  dns_names         = local.dns-names
+  dns_names         = local.dns_names
   service           = local.service
   icon              = local.icon
   request_headers   = local.request_headers