fix

meta/domain-monitor/apps.tf

@@ -8,7 +8,7 @@ locals {
     }
     global = {
         "domain"        = var.namespace
-        "domain-name"   = "admin.${var.domain-name}"
+        "domain-name"   = "monitor.${var.domain-name}"
         "issuer"        = var.issuer
         "ingress-class" = var.ingress-class
         "backups"       = var.backups
@@ -16,6 +16,8 @@ locals {
     }
     prometheus = { for k, v in var.prometheus : k => v if k!="enable" }
     alertmanager = { for k, v in var.alertmanager : k => v if k!="enable" }
+    alerts-core = { for k, v in var.alerts-core : k => v if k!="enable" }
+    alerts-containers = { for k, v in var.alerts-containers : k => v if k!="enable" }
     nodeExporter = { for k, v in var.node-exporter : k => v if k!="enable" }
     kubeStateMetrics = merge({"cluster-admin" = true}, { for k, v in var.kube-state-metrics : k => v if k!="enable" })
     monitorControlPlan = merge({"cluster-admin" = true}, { for k, v in var.monitor-control-plan : k => v if k!="enable" })
@@ -117,3 +119,38 @@ resource "kubectl_manifest" "monitorControlPlan" {
       options: ${jsonencode(merge(local.global, local.monitorControlPlan))}
   EOF
 }
+
+resource "kubectl_manifest" "alerts-core" {
+  count = var.alerts-core.enable ? 1 : 0
+  depends_on = [kubernetes_namespace_v1.monitor-ns]
+  yaml_body  = <<-EOF
+    apiVersion: "vynil.solidite.fr/v1"
+    kind: "Install"
+    metadata:
+      name: "alerts-core"
+      namespace: "${kubernetes_namespace_v1.monitor-ns[0].metadata[0].name}"
+      labels: ${jsonencode(local.common-labels)}
+    spec:
+      distrib: "${var.distributions.domain}"
+      category: "monitor"
+      component: "alerts-core"
+      options: ${jsonencode(merge(local.global, local.alerts-core))}
+  EOF
+}
+resource "kubectl_manifest" "alerts-containers" {
+  count = var.alerts-containers.enable ? 1 : 0
+  depends_on = [kubernetes_namespace_v1.monitor-ns]
+  yaml_body  = <<-EOF
+    apiVersion: "vynil.solidite.fr/v1"
+    kind: "Install"
+    metadata:
+      name: "alerts-containers"
+      namespace: "${kubernetes_namespace_v1.monitor-ns[0].metadata[0].name}"
+      labels: ${jsonencode(local.common-labels)}
+    spec:
+      distrib: "${var.distributions.domain}"
+      category: "monitor"
+      component: "alerts-containers"
+      options: ${jsonencode(merge(local.global, local.alerts-containers))}
+  EOF
+}

meta/domain-monitor/index.yaml

@@ -6,11 +6,91 @@ metadata:
   name: domain-monitor
   description: null
 options:
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    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
+  alertmanager:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: alertmanager
+  alerts-core:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: alerts-core
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  prometheus:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: prometheus
+  monitor-control-plan:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: monitor-control-plan
+  kube-state-metrics:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: kube-state-metrics
   storage-classes:
     default:
       BlockReadWriteMany: ''
@@ -36,12 +116,7 @@ options:
         default: ''
         type: string
     type: object
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  alertmanager:
+  alerts-containers:
     default:
       enable: true
     examples:
@@ -52,7 +127,19 @@ options:
         type: boolean
     type: object
     x-vynil-category: monitor
-    x-vynil-package: alertmanager
+    x-vynil-package: alerts-containers
+  node-exporter:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: node-exporter
   backups:
     default:
       enable: false
@@ -83,59 +170,6 @@ options:
         default: backup-settings
         type: string
     type: object
-  app-group:
-    default: infra
-    examples:
-    - infra
-    type: string
-  kube-state-metrics:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: kube-state-metrics
-  monitor-control-plan:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: monitor-control-plan
-  prometheus:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: prometheus
-  node-exporter:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: node-exporter
   distributions:
     default:
       core: core
@@ -151,16 +185,6 @@ options:
         default: domain
         type: string
     type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
 dependencies: []
 providers:
   kubernetes: true