From 1de04dd30df034fe0392e4e65fe04258d5f51de9 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Thu, 6 Oct 2022 11:17:48 +0200 Subject: [PATCH] Replace URL with local refs and small fixes * Remove stop_time from job meta * make Unit use unit.schema in cluster.json --- datastructures/cluster.schema.json | 4 +- datastructures/job-data.schema.json | 132 +++++++++--------- datastructures/job-meta.schema.json | 72 +++++----- datastructures/job-metric-data.schema.json | 4 +- .../job-metric-statistics.schema.json | 4 +- datastructures/unit.schema.json | 6 +- 6 files changed, 108 insertions(+), 114 deletions(-) diff --git a/datastructures/cluster.schema.json b/datastructures/cluster.schema.json index d20cf2a..503d6b8 100644 --- a/datastructures/cluster.schema.json +++ b/datastructures/cluster.schema.json @@ -1,5 +1,6 @@ { "$schema": "http://json-schema.org/draft/2020-12/schema", + "$id": "cluster.schema.json", "title": "HPC cluster description", "description": "Meta data information of a HPC cluster", "type": "object", @@ -20,7 +21,7 @@ }, "unit": { "description": "Metric unit", - "type": "string" + "$ref": "embedfs://unit.schema.json" }, "scope": { "description": "Native measurement resolution", @@ -37,7 +38,6 @@ "sum", "avg" ] - }, "subClusters": { "description": "Array of cluster hardware partition metric thresholds", diff --git a/datastructures/job-data.schema.json b/datastructures/job-data.schema.json index c88b4ec..1ea3110 100644 --- a/datastructures/job-data.schema.json +++ b/datastructures/job-data.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft/2020-12/schema", - "$id": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-data.schema.json", + "$id": "job-data.schema.json", "title": "Job metric data list", "description": "Collection of metric data of a HPC job", "type": "object", @@ -10,7 +10,7 @@ "type": "object", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -21,19 +21,19 @@ "description": "Total flop rate with DP flops scaled up", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "socket": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "memoryDomain": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "core": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "hwthread": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "minProperties": 1 @@ -42,13 +42,13 @@ "description": "Main memory bandwidth", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "socket": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "memoryDomain": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "minProperties": 1 @@ -58,7 +58,7 @@ "type": "object", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -69,19 +69,19 @@ "description": "Instructions executed per cycle", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "socket": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "memoryDomain": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "core": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "hwthread": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "minProperties": 1 @@ -90,19 +90,19 @@ "description": "CPU active core utilization", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "socket": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "memoryDomain": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "core": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "hwthread": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "minProperties": 1 @@ -111,7 +111,7 @@ "description": "CPU requested core utilization (load 1m)", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -122,19 +122,19 @@ "description": "Double precision flop rate", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "socket": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "memoryDomain": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "core": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "hwthread": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "minProperties": 1 @@ -143,19 +143,19 @@ "description": "Single precision flops rate", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "socket": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "memoryDomain": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "core": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "hwthread": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "minProperties": 1 @@ -164,19 +164,19 @@ "description": "Fraction of arithmetic instructions using SIMD instructions", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "socket": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "memoryDomain": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "core": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "hwthread": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "minProperties": 1 @@ -185,10 +185,10 @@ "description": "CPU power consumption", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "socket": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "minProperties": 1 @@ -197,10 +197,10 @@ "description": "Memory power consumption", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "socket": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "minProperties": 1 @@ -209,7 +209,7 @@ "description": "GPU utilization", "properties": { "accelerator": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -220,7 +220,7 @@ "description": "GPU memory capacity used", "properties": { "accelerator": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -231,7 +231,7 @@ "description": "GPU power consumption", "properties": { "accelerator": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -242,19 +242,19 @@ "description": "Average core frequency", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "socket": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "memoryDomain": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "core": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" }, "hwthread": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "minProperties": 1 @@ -263,7 +263,7 @@ "description": "Ethernet read bandwidth", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -274,7 +274,7 @@ "description": "Ethernet write bandwidth", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -306,7 +306,7 @@ "description": "File system read bandwidth", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -317,7 +317,7 @@ "description": "File system write bandwidth", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -328,7 +328,7 @@ "description": "File system read requests", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -339,7 +339,7 @@ "description": "File system write requests", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -350,7 +350,7 @@ "description": "File system write requests", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -361,7 +361,7 @@ "description": "File system open and close", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -372,7 +372,7 @@ "description": "File system fsync", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -383,7 +383,7 @@ "description": "File system create", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -394,7 +394,7 @@ "description": "File system open", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -405,7 +405,7 @@ "description": "File system close", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -416,7 +416,7 @@ "description": "File system seek", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -438,7 +438,7 @@ "description": "Network interconnect read packets", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -449,7 +449,7 @@ "description": "Network interconnect send packet", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -460,7 +460,7 @@ "description": "Network interconnect read bandwidth", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ @@ -471,7 +471,7 @@ "description": "Network interconnect write bandwidth", "properties": { "node": { - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json" + "$ref": "job-metric-data.schema.json" } }, "required": [ diff --git a/datastructures/job-meta.schema.json b/datastructures/job-meta.schema.json index 835fdd7..bc515ff 100644 --- a/datastructures/job-meta.schema.json +++ b/datastructures/job-meta.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft/2020-12/schema", - "$id": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-meta.schema.json", + "$id": "job-meta.schema.json", "title": "Job meta data", "description": "Meta data information of a HPC job", "type": "object", @@ -84,11 +84,6 @@ "type": "integer", "exclusiveMinimum": 0 }, - "stopTime": { - "description": "Stop epoch time stamp in seconds", - "type": "integer", - "exclusiveMinimum": 0 - }, "duration": { "description": "Duration of job in seconds", "type": "integer", @@ -172,87 +167,87 @@ "properties": { "mem_used": { "description": "Memory capacity used (required)", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "cpu_load": { "description": "CPU requested core utilization (load 1m) (required)", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "flops_any": { "description": "Total flop rate with DP flops scaled up (required)", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "mem_bw": { "description": "Main memory bandwidth (required)", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "net_bw": { "description": "Total fast interconnect network bandwidth (required)", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "file_bw": { "description": "Total file IO bandwidth (required)", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "ipc": { "description": "Instructions executed per cycle", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "cpu_used": { "description": "CPU active core utilization", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "flops_dp": { "description": "Double precision flop rate", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "flops_sp": { "description": "Single precision flops rate", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "rapl_power": { "description": "CPU power consumption", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "acc_used": { "description": "GPU utilization", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "acc_mem_used": { "description": "GPU memory capacity used", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "acc_power": { "description": "GPU power consumption", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "clock": { "description": "Average core frequency", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "eth_read_bw": { "description": "Ethernet read bandwidth", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "eth_write_bw": { "description": "Ethernet write bandwidth", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "ic_rcv_packets": { "description": "Network interconnect read packets", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "ic_send_packets": { "description": "Network interconnect send packet", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "ic_read_bw": { "description": "Network interconnect read bandwidth", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "ic_write_bw": { "description": "Network interconnect write bandwidth", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "filesystems": { "description": "Array of filesystems", @@ -277,47 +272,47 @@ }, "read_bw": { "description": "File system read bandwidth", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "write_bw": { "description": "File system write bandwidth", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "read_req": { "description": "File system read requests", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "write_req": { "description": "File system write requests", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "inodes": { "description": "File system write requests", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "accesses": { "description": "File system open and close", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "fsync": { "description": "File system fsync", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "create": { "description": "File system create", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "open": { "description": "File system open", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "close": { "description": "File system close", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" }, "seek": { "description": "File system seek", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json" + "$ref": "job-metric-statistics.schema.json" } }, "required": [ @@ -349,7 +344,6 @@ "jobState", "duration", "resources", - "tags", "statistics" ] } diff --git a/datastructures/job-metric-data.schema.json b/datastructures/job-metric-data.schema.json index c04d547..081360f 100644 --- a/datastructures/job-metric-data.schema.json +++ b/datastructures/job-metric-data.schema.json @@ -1,13 +1,13 @@ { "$schema": "http://json-schema.org/draft/2020-12/schema", - "$id": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-data.schema.json", + "$id": "job-metric-data.schema.json", "title": "Job metric data", "description": "Metric data of a HPC job", "type": "object", "properties": { "unit": { "description": "Metric unit", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/unit.schema.json" + "$ref": "unit.schema.json" }, "timestep": { "description": "Measurement interval in seconds", diff --git a/datastructures/job-metric-statistics.schema.json b/datastructures/job-metric-statistics.schema.json index 246c35e..321f100 100644 --- a/datastructures/job-metric-statistics.schema.json +++ b/datastructures/job-metric-statistics.schema.json @@ -1,13 +1,13 @@ { "$schema": "http://json-schema.org/draft/2020-12/schema", - "$id": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/job-metric-statistics.schema.json", + "$id": "job-metric-statistics.schema.json", "title": "Job statistics", "description": "Format specification for job metric statistics", "type": "object", "properties": { "unit": { "description": "Metric unit", - "$ref": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/unit.schema.json" + "$ref": "unit.schema.json" }, "avg": { "description": "Job metric average", diff --git a/datastructures/unit.schema.json b/datastructures/unit.schema.json index e055e02..a9dd3ca 100644 --- a/datastructures/unit.schema.json +++ b/datastructures/unit.schema.json @@ -1,11 +1,11 @@ { "$schema": "http://json-schema.org/draft/2020-12/schema", - "$id": "https://raw.githubusercontent.com/ClusterCockpit/cc-specifications/master/datastructures/unit.schema.json", + "$id": "unit.schema.json", "title": "Metric unit", "description": "Format specification for job metric units", "type": "object", "properties": { - "base_unit": { + "base": { "description": "Metric base unit", "type": "string", "enum": [ @@ -36,6 +36,6 @@ } }, "required": [ - "base_unit" + "base" ] }