Adjust required properties

This commit is contained in:
Jan Eitzinger 2022-01-14 20:33:18 +01:00
parent 9331b15744
commit ac19c10881
2 changed files with 155 additions and 38 deletions

View File

@ -11,7 +11,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"flops_any": { "flops_any": {
"description": "Total flop rate with DP flops scaled up (required)", "description": "Total flop rate with DP flops scaled up (required)",
@ -31,7 +34,10 @@
"hwthread": { "hwthread": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"mem_bw": { "mem_bw": {
"description": "Main memory bandwidth (required)", "description": "Main memory bandwidth (required)",
@ -45,7 +51,10 @@
"memoryDomain": { "memoryDomain": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"net_bw": { "net_bw": {
"description": "Total fast interconnect network bandwidth (required)", "description": "Total fast interconnect network bandwidth (required)",
@ -54,7 +63,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"file_bw": { "file_bw": {
"description": "Total file IO bandwidth (required)", "description": "Total file IO bandwidth (required)",
@ -63,7 +75,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"ipc": { "ipc": {
"description": "Instructions executed per cycle", "description": "Instructions executed per cycle",
@ -83,7 +98,10 @@
"hwthread": { "hwthread": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"cpu_used": { "cpu_used": {
"description": "CPU active core utilization", "description": "CPU active core utilization",
@ -103,7 +121,10 @@
"hwthread": { "hwthread": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"cpu_load": { "cpu_load": {
"description": "CPU requested core utilization (load 1m)", "description": "CPU requested core utilization (load 1m)",
@ -123,7 +144,10 @@
"hwthread": { "hwthread": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"flops_dp": { "flops_dp": {
"description": "Double precision flop rate", "description": "Double precision flop rate",
@ -143,7 +167,10 @@
"hwthread": { "hwthread": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"flops_sp": { "flops_sp": {
"description": "Single precision flops rate", "description": "Single precision flops rate",
@ -163,7 +190,10 @@
"hwthread": { "hwthread": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"vectorization_ratio": { "vectorization_ratio": {
"description": "Fraction of arithmetic instructions using SIMD instructions", "description": "Fraction of arithmetic instructions using SIMD instructions",
@ -183,7 +213,10 @@
"hwthread": { "hwthread": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"cpu_power": { "cpu_power": {
"description": "CPU power consumption", "description": "CPU power consumption",
@ -194,7 +227,10 @@
"socket": { "socket": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"mem_power": { "mem_power": {
"description": "Memory power consumption", "description": "Memory power consumption",
@ -205,7 +241,10 @@
"socket": { "socket": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"acc_utilization": { "acc_utilization": {
"description": "GPU utilization", "description": "GPU utilization",
@ -213,7 +252,10 @@
"accelerator": { "accelerator": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"acc_mem_used": { "acc_mem_used": {
"description": "GPU memory capacity used", "description": "GPU memory capacity used",
@ -221,7 +263,10 @@
"accelerator": { "accelerator": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"acc_power": { "acc_power": {
"description": "GPU power consumption", "description": "GPU power consumption",
@ -229,7 +274,10 @@
"accelerator": { "accelerator": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"clock": { "clock": {
"description": "Average core frequency", "description": "Average core frequency",
@ -249,7 +297,10 @@
"hwthread": { "hwthread": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"eth_read_bw": { "eth_read_bw": {
"description": "Ethernet read bandwidth", "description": "Ethernet read bandwidth",
@ -257,7 +308,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"eth_write_bw": { "eth_write_bw": {
"description": "Ethernet write bandwidth", "description": "Ethernet write bandwidth",
@ -265,7 +319,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"pfs_read_bw": { "pfs_read_bw": {
"description": "Parallel file system read bandwidth", "description": "Parallel file system read bandwidth",
@ -273,7 +330,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"pfs_write_bw": { "pfs_write_bw": {
"description": "Parallel file system write bandwidth", "description": "Parallel file system write bandwidth",
@ -281,7 +341,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"pfs_read_req": { "pfs_read_req": {
"description": "Parallel file system read requests", "description": "Parallel file system read requests",
@ -289,7 +352,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"pfs_write_req": { "pfs_write_req": {
"description": "Parallel file system write requests", "description": "Parallel file system write requests",
@ -297,7 +363,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"pfs_inodes": { "pfs_inodes": {
"description": "Parallel file system inodes used", "description": "Parallel file system inodes used",
@ -305,7 +374,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"pfs_accesses": { "pfs_accesses": {
"description": "Parallel file system open and close", "description": "Parallel file system open and close",
@ -313,7 +385,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"pfs_fsync": { "pfs_fsync": {
"description": "Parallel file system fsync", "description": "Parallel file system fsync",
@ -321,7 +396,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"pfs_create": { "pfs_create": {
"description": "Parallel file system create", "description": "Parallel file system create",
@ -329,7 +407,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"pfs_open": { "pfs_open": {
"description": "Parallel file system open", "description": "Parallel file system open",
@ -337,7 +418,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"pfs_close": { "pfs_close": {
"description": "Parallel file system close", "description": "Parallel file system close",
@ -345,7 +429,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"pfs_seek": { "pfs_seek": {
"description": "Parallel file system seek", "description": "Parallel file system seek",
@ -353,7 +440,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"fs_read_bw": { "fs_read_bw": {
"description": "Local file system read bandwidth", "description": "Local file system read bandwidth",
@ -361,7 +451,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"fs_write_bw": { "fs_write_bw": {
"description": "Local file system write bandwidth", "description": "Local file system write bandwidth",
@ -369,7 +462,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"fs_inodes": { "fs_inodes": {
"description": "Local file system inodes used", "description": "Local file system inodes used",
@ -377,7 +473,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"fs_accesses": { "fs_accesses": {
"description": "Local file system open and close", "description": "Local file system open and close",
@ -385,7 +484,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"ic_rcv_packets": { "ic_rcv_packets": {
"description": "Network interconnect read packets", "description": "Network interconnect read packets",
@ -393,7 +495,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"ic_send_packets": { "ic_send_packets": {
"description": "Network interconnect send packet", "description": "Network interconnect send packet",
@ -401,7 +506,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"ic_read_bw": { "ic_read_bw": {
"description": "Network interconnect read bandwidth", "description": "Network interconnect read bandwidth",
@ -409,7 +517,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
}, },
"ic_write_bw": { "ic_write_bw": {
"description": "Network interconnect write bandwidth", "description": "Network interconnect write bandwidth",
@ -417,7 +528,10 @@
"node": { "node": {
"#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json" "#ref": "https://github.com/ClusterCockpit/cc-specifications/blob/master/schema/json/job-metric-data.schema.json"
} }
} },
"required": [
"nodes"
]
} }
}, },
"required": [ "required": [

View File

@ -318,9 +318,12 @@
"user", "user",
"project", "project",
"cluster", "cluster",
"partition",
"numNodes", "numNodes",
"exclusive",
"startTime", "startTime",
"stopTime", "stopTime",
"jobState",
"duration", "duration",
"resources", "resources",
"tags", "tags",