Update UoM for APPUiO Cloud usage

appuio · Jan 15, 2024 · b89fdbf · b89fdbf
1 parent 0e7a737
commit b89fdbf
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 50 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -610,7 +610,7 @@ parameters:
               cpu_ratio: "5333057536" # 5086 MiB / core
         instance_id_pattern: '%(cluster_id)s-%(namespace)s'
         item_group_description_pattern: 'APPUiO Cloud - Zone: %(cluster_id)s / Namespace: %(namespace)s'
-        unit_id: uom_uom_180_8459f204 # MiB - Minute
+        unit_id: uom_uom_196_8b86c0c5 # MiB - Minute
         query_pattern: |
           # Sum values over one hour.
           sum_over_time(
@@ -717,7 +717,7 @@ parameters:
               zone: c-appuio-exoscale-ch-gva-2-0
         instance_id_pattern: '%(cluster_id)s-%(namespace)s'
         item_group_description_pattern: 'APPUiO Cloud - Zone: %(cluster_id)s / Namespace: %(namespace)s'
-        unit_id: uom_uom_180_8459f204 # MiB - Minute
+        unit_id: uom_uom_196_8b86c0c5 # MiB - Minute
         query_pattern: |
           # Sum values over one hour.
           sum_over_time(

diff --git a/tests/golden/defaults/appuio-reporting/appuio-reporting/11_backfill.yaml b/tests/golden/defaults/appuio-reporting/appuio-reporting/11_backfill.yaml
@@ -147,7 +147,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -309,7 +309,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -471,7 +471,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -729,7 +729,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -874,7 +874,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -1019,7 +1019,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -1164,7 +1164,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -1309,7 +1309,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1

diff --git a/tests/golden/external-secret/appuio-reporting/appuio-reporting/11_backfill.yaml b/tests/golden/external-secret/appuio-reporting/appuio-reporting/11_backfill.yaml
@@ -147,7 +147,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -318,7 +318,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -489,7 +489,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -765,7 +765,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -919,7 +919,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -1073,7 +1073,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -1227,7 +1227,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -1381,7 +1381,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1

diff --git a/tests/golden/suspended-cronjobs/appuio-reporting/appuio-reporting/11_backfill.yaml b/tests/golden/suspended-cronjobs/appuio-reporting/appuio-reporting/11_backfill.yaml
@@ -147,7 +147,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -309,7 +309,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -471,7 +471,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -729,7 +729,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -874,7 +874,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -1019,7 +1019,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -1164,7 +1164,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -1309,7 +1309,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1

diff --git a/tests/golden/test-mode/appuio-reporting/appuio-reporting/11_backfill.yaml b/tests/golden/test-mode/appuio-reporting/appuio-reporting/11_backfill.yaml
@@ -148,7 +148,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -311,7 +311,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -474,7 +474,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -734,7 +734,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -880,7 +880,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -1026,7 +1026,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -1172,7 +1172,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1
@@ -1318,7 +1318,7 @@ spec:
                   value: 'local labels = std.extVar("labels"); "APPUiO Cloud - Zone:
                     %(cluster_id)s / Namespace: %(namespace)s" % labels'
                 - name: AR_UNIT_ID
-                  value: uom_uom_180_8459f204
+                  value: uom_uom_196_8b86c0c5
                 - name: AR_ORG_ID
                   value: appuio-cloud-metering-c-appuio-cloudscale-lpg-2|appuio-cloud-metering-c-appuio-exoscale-ch-gva-2-0
               image: ghcr.io/appuio/appuio-reporting:v0.2.1