From 42ff1e33a116f5328f38193e67b45e8aeeea68db Mon Sep 17 00:00:00 2001
From: Jan Eitzinger <jan.treibig@gmail.com>
Date: Wed, 21 Sep 2022 15:24:48 +0200
Subject: [PATCH] Update and fix schema

---
 datastructures/cluster.schema.json         | 6 ++++--
 datastructures/job-meta.schema.json        | 6 +++---
 datastructures/job-metric-data.schema.json | 2 +-
 datastructures/unit.schema.json            | 7 ++++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/datastructures/cluster.schema.json b/datastructures/cluster.schema.json
index 0291b65..d20cf2a 100644
--- a/datastructures/cluster.schema.json
+++ b/datastructures/cluster.schema.json
@@ -77,7 +77,8 @@
                     "scope",
                     "timestep"
                 ]
-            }
+            },
+            "minItems": 1
         },
         "subClusters": {
             "description": "Array of cluster hardware partitions",
@@ -222,7 +223,8 @@
                     "flopRateSimd",
                     "memoryBandwidth"
                 ]
-            }
+            },
+            "minItems": 1
         }
     },
     "required":[
diff --git a/datastructures/job-meta.schema.json b/datastructures/job-meta.schema.json
index 39b258e..835fdd7 100644
--- a/datastructures/job-meta.schema.json
+++ b/datastructures/job-meta.schema.json
@@ -214,15 +214,15 @@
                     "description": "CPU power consumption",
                     "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json"
                 },
-                "gpu_used": {
+                "acc_used": {
                     "description": "GPU utilization",
                     "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json"
                 },
-                "gpu_mem_used": {
+                "acc_mem_used": {
                     "description": "GPU memory capacity used",
                     "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json"
                 },
-                "gpu_power": {
+                "acc_power": {
                     "description": "GPU power consumption",
                     "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json"
                 },
diff --git a/datastructures/job-metric-data.schema.json b/datastructures/job-metric-data.schema.json
index 8200864..c04d547 100644
--- a/datastructures/job-metric-data.schema.json
+++ b/datastructures/job-metric-data.schema.json
@@ -163,7 +163,7 @@
                         "type": "string"
                     },
                     "id": {
-                        "type": "integer"
+                        "type": "string"
                     },
                     "statistics": {
                         "type": "object",
diff --git a/datastructures/unit.schema.json b/datastructures/unit.schema.json
index 25dfb98..e055e02 100644
--- a/datastructures/unit.schema.json
+++ b/datastructures/unit.schema.json
@@ -15,10 +15,11 @@
                 "F/s",
                 "CPI",
                 "IPC",
-                "cpu_used",
-                "cpu_load",
+                "load",
                 "Hz",
-                "W"
+                "W",
+                "°C",
+                ""
             ]
         },
         "prefix": {