From 344fc6fdef791d986afff55e1e4df53793a24e3e Mon Sep 17 00:00:00 2001
From: Jan Eitzinger <jan.treibig@gmail.com>
Date: Mon, 29 Nov 2021 10:26:00 +0100
Subject: [PATCH] Rework schema

* Change cpu to hwthread and gpu to accelerator
* Change sampletime to timestep
* Add Metric Data repository to cluster
---
 schema/json/cluster.schema.json         | 35 ++++++++++++++++++++++---
 schema/json/job-data.schema.json        |  1 +
 schema/json/job-meta.schema.json        | 14 +++++-----
 schema/json/job-metric-data.schema.json |  6 +++--
 schema/json/unit.schema.json            |  2 +-
 5 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/schema/json/cluster.schema.json b/schema/json/cluster.schema.json
index e84f529..6a8e6c9 100644
--- a/schema/json/cluster.schema.json
+++ b/schema/json/cluster.schema.json
@@ -36,6 +36,24 @@
             "description": "Theoretical node peak memory bandwidth in GB/s",
             "type": "integer"
         },
+        "metric_data_repository": {
+            "description": "Type of the metric data repository for this cluster",
+            "type": "object",
+            "properties": {
+                "kind": {
+                    "type": "string",
+                    "enum": [
+                        "influxdb-v1",
+                        "influxdb-v2",
+                        "prometheus",
+                        "cc-metric-store"
+                    ]
+                },
+                "url": {
+                    "type": "string"
+                }
+            }
+        },
         "metric_config": {
             "description": "Metric specifications",
             "type": "array",
@@ -50,7 +68,7 @@
                         "description": "Metric unit",
                         "type": "string"
                     },
-                    "sampletime": {
+                    "timestep": {
                         "description": "Frequency of timeseries points",
                         "type": "integer"
                     },
@@ -67,7 +85,16 @@
                         "type": "number"
                     }
                 }
-            }
+            },
+            "required":[
+                "name",
+                "unit",
+                "timestep",
+                "peak",
+                "normal",
+                "caution",
+                "alert"
+            ]
         }
     },
     "required":[
@@ -78,6 +105,8 @@
         "threads_per_core",
         "flop_rate_scalar",
         "flop_rate_simd",
-        "memory_bandwidth"
+        "memory_bandwidth",
+        "metric_data_repository",
+        "metric_config"
     ]
 }
diff --git a/schema/json/job-data.schema.json b/schema/json/job-data.schema.json
index 37f66be..0870f72 100644
--- a/schema/json/job-data.schema.json
+++ b/schema/json/job-data.schema.json
@@ -126,6 +126,7 @@
         }
     },
     "required": [
+        "cpu_used",
         "mem_used",
         "flops_any",
         "mem_bw",
diff --git a/schema/json/job-meta.schema.json b/schema/json/job-meta.schema.json
index ca5d24d..da65f2d 100644
--- a/schema/json/job-meta.schema.json
+++ b/schema/json/job-meta.schema.json
@@ -24,7 +24,7 @@
             "description": "The queue to which the job was submitted",
             "type": "string"
         },
-        "array_id": {
+        "array_job_id": {
             "description": "The unique identifier of an array job",
             "type": "integer"
         },
@@ -38,14 +38,14 @@
             "type": "integer",
             "exclusiveMinimum": 0
         },
-        "num_gpus": {
-            "description": "Number of GPUs used",
+        "num_accelerators": {
+            "description": "Number of accelerators used",
             "type": "integer",
             "exclusiveMinimum": 0
         },
         "exclusive": {
             "description": "Job uses only exclusive nodes",
-            "type": "boolean"
+            "type": "integer"
         },
         "smt": {
             "description": "Job uses smt feature",
@@ -91,16 +91,16 @@
                     "hostname": {
                         "type": "string"
                     },
-                    "cpus": {
+                    "hwthreads": {
                         "type": "array",
                         "description": "List of OS processor ids",
                         "items": {
                             "type": "integer"
                         }
                     },
-                    "gpus": {
+                    "accelerators": {
                         "type": "array",
-                        "description": "List of of gpu device addresses",
+                        "description": "List of of accelerator device addresses",
                         "items": {
                             "type": "integer"
                         }
diff --git a/schema/json/job-metric-data.schema.json b/schema/json/job-metric-data.schema.json
index 03ad00f..24c7e8f 100644
--- a/schema/json/job-metric-data.schema.json
+++ b/schema/json/job-metric-data.schema.json
@@ -11,9 +11,11 @@
             "type": "string",
             "enum": [
                 "node",
-                "cpu",
+                "hwthread",
+                "memory",
+                "die",
                 "socket",
-                "gpu"
+                "accelerator"
             ]
         },
         "timestep": {
diff --git a/schema/json/unit.schema.json b/schema/json/unit.schema.json
index 1917361..884cbc2 100644
--- a/schema/json/unit.schema.json
+++ b/schema/json/unit.schema.json
@@ -14,7 +14,7 @@
                 "F/s",
                 "CPI",
                 "IPC",
-                "Hz",
+                "Hz"
             ]
         },
         "prefix": {