From 8ad641e923200900182a0d6b91bc8166cf5c8c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Mon, 22 Jan 2024 16:09:46 +0100
Subject: [PATCH] fix

---
 meta/domain-monitor/apps.tf     |   6 +-
 meta/domain-monitor/index.yaml  | 192 ++++++++++++++++----------------
 monitor/alertmanager/index.yaml |  59 +++++-----
 monitor/prometheus/index.yaml   |  83 +++++++-------
 4 files changed, 175 insertions(+), 165 deletions(-)

diff --git a/meta/domain-monitor/apps.tf b/meta/domain-monitor/apps.tf
index c8c9295..b731492 100644
--- a/meta/domain-monitor/apps.tf
+++ b/meta/domain-monitor/apps.tf
@@ -42,7 +42,7 @@ resource "kubectl_manifest" "alertmanager" {
       labels: ${jsonencode(local.common-labels)}
     spec:
       distrib: "${var.distributions.domain}"
-      category: "share"
+      category: "monitor"
       component: "alertmanager"
       options: ${jsonencode(merge(local.global, local.alertmanager))}
   EOF
@@ -77,7 +77,7 @@ resource "kubectl_manifest" "nodeExporter" {
     spec:
       distrib: "${var.distributions.domain}"
       category: "monitor"
-      component: "k8s-nodeExporter"
+      component: "node-exporter"
       options: ${jsonencode(merge(local.global, local.nodeExporter))}
   EOF
 }
@@ -95,7 +95,7 @@ resource "kubectl_manifest" "kubeStateMetrics" {
     spec:
       distrib: "${var.distributions.domain}"
       category: "monitor"
-      component: "kubeStateMetrics"
+      component: "kube-state-metrics"
       options: ${jsonencode(merge(local.global, local.kubeStateMetrics))}
   EOF
 }
diff --git a/meta/domain-monitor/index.yaml b/meta/domain-monitor/index.yaml
index f6b9743..fda45d5 100644
--- a/meta/domain-monitor/index.yaml
+++ b/meta/domain-monitor/index.yaml
@@ -6,23 +6,53 @@ metadata:
   name: domain-monitor
   description: null
 options:
-  domain:
-    default: your-company
+  issuer:
+    default: letsencrypt-prod
     examples:
-    - your-company
+    - letsencrypt-prod
     type: string
-  monitor-control-plan:
+  storage-classes:
     default:
-      enable: false
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
     examples:
-    - enable: false
+    - BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    properties:
+      BlockReadWriteMany:
+        default: ''
+        type: string
+      BlockReadWriteOnce:
+        default: ''
+        type: string
+      FilesystemReadWriteMany:
+        default: ''
+        type: string
+      FilesystemReadWriteOnce:
+        default: ''
+        type: string
+    type: object
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  alertmanager:
+    default:
+      enable: true
+    examples:
+    - enable: true
     properties:
       enable:
-        default: false
+        default: true
         type: boolean
     type: object
     x-vynil-category: monitor
-    x-vynil-package: monitor-control-plan
+    x-vynil-package: alertmanager
   backups:
     default:
       enable: false
@@ -53,6 +83,59 @@ 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
@@ -68,99 +151,16 @@ 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
-  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: ''
-      BlockReadWriteOnce: ''
-      FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
-    examples:
-    - BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
-      FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
-    properties:
-      BlockReadWriteMany:
-        default: ''
-        type: string
-      BlockReadWriteOnce:
-        default: ''
-        type: string
-      FilesystemReadWriteMany:
-        default: ''
-        type: string
-      FilesystemReadWriteOnce:
-        default: ''
-        type: string
-    type: object
-  prometheus:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: prometheus
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  app-group:
-    default: infra
-    examples:
-    - infra
-    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
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  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
 dependencies: []
 providers:
   kubernetes: true
diff --git a/monitor/alertmanager/index.yaml b/monitor/alertmanager/index.yaml
index cccda3f..694c0f6 100644
--- a/monitor/alertmanager/index.yaml
+++ b/monitor/alertmanager/index.yaml
@@ -6,26 +6,21 @@ metadata:
   name: alertmanager
   description: null
 options:
-  listenLocal:
-    default: false
+  sub-domain:
+    default: to-be-set
     examples:
-    - false
-    type: boolean
+    - to-be-set
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
-  logLevel:
-    default: info
-    examples:
-    - info
-    type: string
-  retention:
-    default: 120h
-    examples:
-    - 120h
-    type: string
   images:
     default:
       alertmanager:
@@ -65,31 +60,41 @@ options:
             type: string
         type: object
     type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
   replicas:
     default: 1
     examples:
     - 1
     type: integer
-  sub-domain:
-    default: to-be-set
+  retention:
+    default: 120h
     examples:
-    - to-be-set
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
+    - 120h
     type: string
   domain-name:
     default: your_company.com
     examples:
     - your_company.com
     type: string
+  app-group:
+    default: monitor
+    examples:
+    - monitor
+    type: string
+  logLevel:
+    default: info
+    examples:
+    - info
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  listenLocal:
+    default: false
+    examples:
+    - false
+    type: boolean
 dependencies:
 - dist: null
   category: share
diff --git a/monitor/prometheus/index.yaml b/monitor/prometheus/index.yaml
index f5eebe1..5eb1b23 100644
--- a/monitor/prometheus/index.yaml
+++ b/monitor/prometheus/index.yaml
@@ -6,51 +6,41 @@ metadata:
   name: prometheus
   description: null
 options:
+  shards:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  retention:
+    default: 10d
+    examples:
+    - 10d
+    type: string
+  logLevel:
+    default: info
+    examples:
+    - info
+    type: string
   domain-name:
     default: your_company.com
     examples:
     - your_company.com
     type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   listenLocal:
     default: false
     examples:
     - false
     type: boolean
-  enableAdminAPI:
-    default: false
+  ingress-class:
+    default: traefik
     examples:
-    - false
-    type: boolean
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
+    - traefik
     type: string
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  logLevel:
-    default: info
-    examples:
-    - info
-    type: string
-  retention:
-    default: 10d
-    examples:
-    - 10d
-    type: string
-  sub-domain:
-    default: prometheus
-    examples:
-    - prometheus
-    type: string
-  shards:
-    default: 1
-    examples:
-    - 1
-    type: integer
   images:
     default:
       prometheus:
@@ -90,16 +80,31 @@ options:
             type: string
         type: object
     type: object
-  ingress-class:
-    default: traefik
+  app-group:
+    default: monitor
     examples:
-    - traefik
+    - monitor
     type: string
-  domain:
-    default: your-company
+  issuer:
+    default: letsencrypt-prod
     examples:
-    - your-company
+    - letsencrypt-prod
     type: string
+  sub-domain:
+    default: prometheus
+    examples:
+    - prometheus
+    type: string
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  enableAdminAPI:
+    default: false
+    examples:
+    - false
+    type: boolean
 dependencies:
 - dist: null
   category: share