fix

monitor/grafana/datas.tf

@@ -58,11 +58,11 @@ data "kustomization_overlay" "data" {
           k8up.io/backup: "true"
       spec:
         accessModes:
-        - "${var.volume.accessMode}"
+        - "${var.storage.volume.accessMode}"
         volumeMode: Filesystem
         resources:
           requests:
-            storage: "${var.volume.size}"
+            storage: "${var.storage.volume.size}"
     EOF
   }
   patches {

monitor/grafana/index.yaml

@@ -6,34 +6,20 @@ metadata:
   name: grafana
   description: null
 options:
-  volume:
-    default:
-      accessMode: ReadWriteOnce
-      size: 10Gi
+  domain:
+    default: your-company
     examples:
-    - accessMode: ReadWriteOnce
-      size: 10Gi
-    properties:
-      accessMode:
-        default: ReadWriteOnce
-        enum:
-        - ReadWriteOnce
-        - ReadOnlyMany
-        - ReadWriteMany
-        type: string
-      size:
-        default: 10Gi
-        type: string
-    type: object
-  sub_domain:
-    default: grafana
-    examples:
-    - grafana
+    - your-company
     type: string
-  issuer:
-    default: letsencrypt-prod
+  domain_name:
+    default: your_company.com
     examples:
-    - letsencrypt-prod
+    - your_company.com
+    type: string
+  app_group:
+    default: monitor
+    examples:
+    - monitor
     type: string
   images:
     default:
@@ -132,30 +118,44 @@ options:
             type: string
         type: object
     type: object
-  ingress_class:
-    default: traefik
+  sub_domain:
+    default: grafana
     examples:
-    - traefik
+    - grafana
     type: string
-  domain:
-    default: your-company
+  volume:
+    default:
+      accessMode: ReadWriteOnce
+      size: 10Gi
     examples:
-    - your-company
-    type: string
+    - accessMode: ReadWriteOnce
+      size: 10Gi
+    properties:
+      accessMode:
+        default: ReadWriteOnce
+        enum:
+        - ReadWriteOnce
+        - ReadOnlyMany
+        - ReadWriteMany
+        type: string
+      size:
+        default: 10Gi
+        type: string
+    type: object
   admin_name:
     default: grafana_admin
     examples:
     - grafana_admin
     type: string
-  app_group:
-    default: monitor
+  ingress_class:
+    default: traefik
     examples:
-    - monitor
+    - traefik
     type: string
-  domain_name:
-    default: your_company.com
+  issuer:
+    default: letsencrypt-prod
     examples:
-    - your_company.com
+    - letsencrypt-prod
     type: string
 dependencies: []
 providers:

monitor/loki/datas.tf

@@ -60,11 +60,11 @@ data "kustomization_overlay" "data" {
                 k8up.io/backup: "true"
             spec:
               accessModes:
-              - "${var.volume.accessMode}"
+              - "${var.storage.volume.accessMode}"
               volumeMode: Filesystem
               resources:
                 requests:
-                  storage: "${var.volume.size}"
+                  storage: "${var.storage.volume.size}"
     EOF
   }
 }

monitor/loki/index.yaml

@@ -6,25 +6,6 @@ metadata:
   name: loki
   description: null
 options:
-  volume:
-    default:
-      accessMode: ReadWriteOnce
-      size: 10Gi
-    examples:
-    - accessMode: ReadWriteOnce
-      size: 10Gi
-    properties:
-      accessMode:
-        default: ReadWriteOnce
-        enum:
-        - ReadWriteOnce
-        - ReadOnlyMany
-        - ReadWriteMany
-        type: string
-      size:
-        default: 10Gi
-        type: string
-    type: object
   images:
     default:
       loki:
@@ -64,6 +45,25 @@ options:
             type: string
         type: object
     type: object
+  volume:
+    default:
+      accessMode: ReadWriteOnce
+      size: 10Gi
+    examples:
+    - accessMode: ReadWriteOnce
+      size: 10Gi
+    properties:
+      accessMode:
+        default: ReadWriteOnce
+        enum:
+        - ReadWriteOnce
+        - ReadOnlyMany
+        - ReadWriteMany
+        type: string
+      size:
+        default: 10Gi
+        type: string
+    type: object
   alertmanager:
     default: alertmanager-alertmanager
     examples: