fix

monitor/alertmanager/index.yaml

@@ -6,56 +6,16 @@ metadata:
   name: alertmanager
   description: null
 options:
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  logLevel:
-    default: info
-    examples:
-    - info
-    type: string
   ingress-class:
     default: traefik
     examples:
     - traefik
     type: string
-  retention:
-    default: 120h
-    examples:
-    - 120h
-    type: string
   app-group:
     default: monitor
     examples:
     - monitor
     type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  listenLocal:
-    default: false
-    examples:
-    - false
-    type: boolean
-  sub-domain:
-    default: alertmanager
-    examples:
-    - alertmanager
-    type: string
   images:
     default:
       alertmanager:
@@ -95,6 +55,46 @@ options:
             type: string
         type: object
     type: object
+  retention:
+    default: 120h
+    examples:
+    - 120h
+    type: string
+  sub-domain:
+    default: alertmanager
+    examples:
+    - alertmanager
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  logLevel:
+    default: info
+    examples:
+    - info
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  listenLocal:
+    default: false
+    examples:
+    - false
+    type: boolean
 dependencies:
 - dist: null
   category: share

monitor/alertmanager/presentation.tf

@@ -35,7 +35,7 @@ module "application" {
   source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application"
   component         = var.component
   instance          = var.instance
-  app-group         = var.app-group
+  app_group         = var.app-group
   dns_name          = local.dns_name
   icon              = local.icon
   protocol_provider = module.forward.provider-id
@@ -60,7 +60,7 @@ 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
   service           = local.service

monitor/grafana/index.yaml

@@ -6,6 +6,11 @@ metadata:
   name: grafana
   description: null
 options:
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   images:
     default:
       busybox:
@@ -103,6 +108,21 @@ options:
             type: string
         type: object
     type: object
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  app-group:
+    default: monitor
+    examples:
+    - monitor
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
   sub-domain:
     default: grafana
     examples:
@@ -113,31 +133,6 @@ options:
     examples:
     - your_company.com
     type: string
-  app-group:
-    default: monitor
-    examples:
-    - monitor
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    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
   storage:
     default:
       volume:
@@ -175,6 +170,11 @@ options:
             type: string
         type: object
     type: object
+  admin_name:
+    default: grafana_admin
+    examples:
+    - grafana_admin
+    type: string
 dependencies: []
 providers:
   kubernetes: true

monitor/grafana/presentation.tf

@@ -21,7 +21,7 @@ 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       = []
@@ -35,7 +35,7 @@ module "ingress" {
   source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application"
   component         = var.component
   instance          = var.instance
-  app-group         = var.app-group
+  app_group         = var.app-group
   dns_name          = local.dns_name
   icon              = local.icon
   sub_groups        = ["admin"]

monitor/prometheus/index.yaml

@@ -6,65 +6,35 @@ metadata:
   name: prometheus
   description: null
 options:
-  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
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  retention:
-    default: 10d
-    examples:
-    - 10d
-    type: string
   replicas:
     default: 1
     examples:
     - 1
     type: integer
-  shards:
-    default: 1
+  logLevel:
+    default: info
     examples:
-    - 1
-    type: integer
-  enableAdminAPI:
-    default: false
-    examples:
-    - false
-    type: boolean
-  alertmanager:
-    default: alertmanager-alertmanager
-    examples:
-    - alertmanager-alertmanager
+    - info
     type: string
   listenLocal:
     default: false
     examples:
     - false
     type: boolean
-  sub-domain:
-    default: prometheus
+  domain:
+    default: your-company
     examples:
-    - prometheus
+    - your-company
     type: string
-  logLevel:
-    default: info
+  retention:
+    default: 10d
     examples:
-    - info
+    - 10d
+    type: string
+  alertmanager:
+    default: alertmanager-alertmanager
+    examples:
+    - alertmanager-alertmanager
     type: string
   images:
     default:
@@ -105,11 +75,41 @@ options:
             type: string
         type: object
     type: object
+  enableAdminAPI:
+    default: false
+    examples:
+    - false
+    type: boolean
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  sub-domain:
+    default: prometheus
+    examples:
+    - prometheus
+    type: string
+  app-group:
+    default: monitor
+    examples:
+    - monitor
+    type: string
+  shards:
+    default: 1
+    examples:
+    - 1
+    type: integer
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
 dependencies:
 - dist: null
   category: share

monitor/prometheus/presentation.tf

@@ -21,7 +21,7 @@ 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}"]
@@ -35,7 +35,7 @@ module "application" {
   source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application"
   component         = var.component
   instance          = var.instance
-  app-group         = var.app-group
+  app_group         = var.app-group
   dns_name          = local.dns_name
   icon              = local.icon
   protocol_provider = module.forward.provider-id
@@ -60,7 +60,7 @@ 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
   service           = local.service