fix

2024-04-11 10:59:56 +02:00
parent 0ad9715154
commit c25e5e7718
18 changed files with 1116 additions and 1095 deletions
--- a/meta/domain-monitor/apps.tf
+++ b/meta/domain-monitor/apps.tf
@@ -46,87 +46,87 @@ locals {
      "class"      = var.storage.volume.class
    }
    grafana = merge(local.global,{ for k, v in var.grafana : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.grafana, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.grafana, "backups", {}))
      storage = merge({ for k, v in lookup(var.grafana, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.grafana, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.grafana, "storage", {}), "volume", {}))
      })
    })
    prometheus = merge(local.global,{ for k, v in var.prometheus : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.prometheus, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.prometheus, "backups", {}))
      storage = merge({ for k, v in lookup(var.prometheus, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.prometheus, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.prometheus, "storage", {}), "volume", {}))
      })
    })
    alertmanager = merge(local.global,{ for k, v in var.alertmanager : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.alertmanager, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.alertmanager, "backups", {}))
      storage = merge({ for k, v in lookup(var.alertmanager, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.alertmanager, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.alertmanager, "storage", {}), "volume", {}))
      })
    })
    loki = merge(local.global,{ for k, v in var.loki : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.loki, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.loki, "backups", {}))
      storage = merge({ for k, v in lookup(var.loki, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.loki, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.loki, "storage", {}), "volume", {}))
      })
    })
    promtail = merge(local.global,{ for k, v in var.promtail : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.promtail, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.promtail, "backups", {}))
      storage = merge({ for k, v in lookup(var.promtail, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.promtail, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.promtail, "storage", {}), "volume", {}))
      })
    })
    alerts-core = merge(local.global,{ for k, v in var.alerts-core : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.alerts-core, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.alerts-core, "backups", {}))
      storage = merge({ for k, v in lookup(var.alerts-core, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.alerts-core, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.alerts-core, "storage", {}), "volume", {}))
      })
    })
    alerts-containers = merge(local.global,{ for k, v in var.alerts-containers : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.alerts-containers, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.alerts-containers, "backups", {}))
      storage = merge({ for k, v in lookup(var.alerts-containers, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.alerts-containers, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.alerts-containers, "storage", {}), "volume", {}))
      })
    })
    nodeExporter = merge(local.global,{ for k, v in var.node-exporter : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.node-exporter, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.node-exporter, "backups", {}))
      storage = merge({ for k, v in lookup(var.node-exporter, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.node-exporter, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.node-exporter, "storage", {}), "volume", {}))
      })
    })
    kubeStateMetrics = merge(local.global,{ for k, v in var.kube-state-metrics : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.kube-state-metrics, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.kube-state-metrics, "backups", {}))
      storage = merge({ for k, v in lookup(var.kube-state-metrics, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.kube-state-metrics, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.kube-state-metrics, "storage", {}), "volume", {}))
      })
    })
    monitorControlPlan = merge(local.global,{ for k, v in var.monitor-control-plan : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.monitor-control-plan, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.monitor-control-plan, "backups", {}))
      storage = merge({ for k, v in lookup(var.monitor-control-plan, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.monitor-control-plan, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.monitor-control-plan, "storage", {}), "volume", {}))
      })
    })
    dashboards-cluster = merge(local.global,{ for k, v in var.dashboards-cluster : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.dashboards-cluster, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.dashboards-cluster, "backups", {}))
      storage = merge({ for k, v in lookup(var.dashboards-cluster, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.dashboards-cluster, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.dashboards-cluster, "storage", {}), "volume", {}))
      })
    })
    dashboards-minimal = merge(local.global,{ for k, v in var.dashboards-minimal : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.dashboards-minimal, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.dashboards-minimal, "backups", {}))
      storage = merge({ for k, v in lookup(var.dashboards-minimal, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.dashboards-minimal, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.dashboards-minimal, "storage", {}), "volume", {}))
      })
    })
    dashboards-namespace = merge(local.global,{ for k, v in var.dashboards-namespace : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.dashboards-namespace, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.dashboards-namespace, "backups", {}))
      storage = merge({ for k, v in lookup(var.dashboards-namespace, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.dashboards-namespace, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.dashboards-namespace, "storage", {}), "volume", {}))
      })
    })
    dashboards-workload = merge(local.global,{ for k, v in var.dashboards-workload : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.dashboards-workload, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.dashboards-workload, "backups", {}))
      storage = merge({ for k, v in lookup(var.dashboards-workload, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.dashboards-workload, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.dashboards-workload, "storage", {}), "volume", {}))
      })
    })
 }
--- a/meta/domain-monitor/index.yaml
+++ b/meta/domain-monitor/index.yaml
@@ -6,7 +6,7 @@ metadata:
  name: domain-monitor
  description: null
 options:
-  grafana:
+  alertmanager:
    default:
      enable: true
    examples:
@@ -17,79 +17,7 @@ options:
        type: boolean
    type: object
    x-vynil-category: monitor
-    x-vynil-package: grafana
-  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
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  dashboards-cluster:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: dashboards-cluster
-  storage:
-    default:
-      volume:
-        accessMode: ReadWriteOnce
-        class: ''
-    examples:
-    - volume:
-        accessMode: ReadWriteOnce
-        class: ''
-    properties:
-      volume:
-        default:
-          accessMode: ReadWriteOnce
-          class: ''
-        properties:
-          accessMode:
-            default: ReadWriteOnce
-            type: string
-          class:
-            default: ''
-            type: string
-        type: object
-    type: object
-  sso_vynil:
-    default: true
-    examples:
-    - true
-    type: boolean
-  distributions:
-    default:
-      core: core
-      domain: domain
-    examples:
-    - core: core
-      domain: domain
-    properties:
-      core:
-        default: core
-        type: string
-      domain:
-        default: domain
-        type: string
-    type: object
+    x-vynil-package: alertmanager
  alerts-containers:
    default:
      enable: true
@@ -102,7 +30,7 @@ options:
    type: object
    x-vynil-category: monitor
    x-vynil-package: alerts-containers
-  node-exporter:
+  alerts-core:
    default:
      enable: true
    examples:
@@ -113,24 +41,7 @@ options:
        type: boolean
    type: object
    x-vynil-category: monitor
-    x-vynil-package: node-exporter
-  dashboards-workload:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: dashboards-workload
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
+    x-vynil-package: alerts-core
  app_group:
    default: monitor
    examples:
@@ -176,22 +87,7 @@ options:
        default: false
        type: boolean
    type: object
-  language:
-    default: fr_FR
-    examples:
-    - fr_FR
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  timezone:
-    default: Europe/Paris
-    examples:
-    - Europe/Paris
-    type: string
-  alerts-core:
+  dashboards-cluster:
    default:
      enable: true
    examples:
@@ -202,43 +98,7 @@ options:
        type: boolean
    type: object
    x-vynil-category: monitor
-    x-vynil-package: alerts-core
-  promtail:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: promtail
-  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
-  alertmanager:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: alertmanager
+    x-vynil-package: dashboards-cluster
  dashboards-minimal:
    default:
      enable: true
@@ -263,11 +123,82 @@ options:
    type: object
    x-vynil-category: monitor
    x-vynil-package: dashboards-namespace
+  dashboards-workload:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: dashboards-workload
+  distributions:
+    default:
+      core: core
+      domain: domain
+    examples:
+    - core: core
+      domain: domain
+    properties:
+      core:
+        default: core
+        type: string
+      domain:
+        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
+  grafana:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: grafana
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    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
+  language:
+    default: fr_FR
+    examples:
+    - fr_FR
+    type: string
  loki:
    default:
      enable: true
@@ -280,6 +211,30 @@ options:
    type: object
    x-vynil-category: monitor
    x-vynil-package: loki
+  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
+  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
  prometheus:
    default:
      enable: true
@@ -292,12 +247,58 @@ options:
    type: object
    x-vynil-category: monitor
    x-vynil-package: prometheus
+  promtail:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: promtail
+  sso_vynil:
+    default: true
+    examples:
+    - true
+    type: boolean
+  storage:
+    default:
+      volume:
+        accessMode: ReadWriteOnce
+        class: ''
+    examples:
+    - volume:
+        accessMode: ReadWriteOnce
+        class: ''
+    properties:
+      volume:
+        default:
+          accessMode: ReadWriteOnce
+          class: ''
+        properties:
+          accessMode:
+            default: ReadWriteOnce
+            type: string
+          class:
+            default: ''
+            type: string
+        type: object
+    type: object
+  timezone:
+    default: Europe/Paris
+    examples:
+    - Europe/Paris
+    type: string
 dependencies: []
 providers:
  kubernetes: true
  authentik: null
  kubectl: true
  postgresql: null
+  mysql: null
  restapi: null
  http: null
  gitea: null