ClusterCockpit/cc-specifications
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-specifications.git synced 2024-11-10 01:37:25 +01:00
Code Issues Packages Projects Releases Activity

Rework schema

Browse Source 
* Change cpu to hwthread and gpu to accelerator
* Change sampletime to timestep
* Add Metric Data repository to cluster
This commit is contained in:
Jan Eitzinger 2021-11-29 10:26:00 +01:00
parent 84897cee04
commit 344fc6fdef
5 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
schema/json/cluster.schema.json
View File

@ -36,6 +36,24 @@
"description": "Theoretical node peak memory bandwidth in GB/s", "description": "Theoretical node peak memory bandwidth in GB/s",
"type": "integer" "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": { "metric_config": {
"description": "Metric specifications", "description": "Metric specifications",
"type": "array", "type": "array",
@ -50,7 +68,7 @@
"description": "Metric unit", "description": "Metric unit",
"type": "string" "type": "string"
}, },
"sampletime": { "timestep": {
"description": "Frequency of timeseries points", "description": "Frequency of timeseries points",
"type": "integer" "type": "integer"
}, },
@ -67,7 +85,16 @@
"type": "number" "type": "number"
} }
} }
} },
"required":[
"name",
"unit",
"timestep",
"peak",
"normal",
"caution",
"alert"
]
} }
}, },
"required":[ "required":[
@ -78,6 +105,8 @@
"threads_per_core", "threads_per_core",
"flop_rate_scalar", "flop_rate_scalar",
"flop_rate_simd", "flop_rate_simd",
"memory_bandwidth" "memory_bandwidth",
"metric_data_repository",
"metric_config"
] ]
} }

1
schema/json/job-data.schema.json
View File

@ -126,6 +126,7 @@
} }
}, },
"required": [ "required": [
"cpu_used",
"mem_used", "mem_used",
"flops_any", "flops_any",
"mem_bw", "mem_bw",

14
schema/json/job-meta.schema.json
View File

@ -24,7 +24,7 @@
"description": "The queue to which the job was submitted", "description": "The queue to which the job was submitted",
"type": "string" "type": "string"
}, },
"array_id": { "array_job_id": {
"description": "The unique identifier of an array job", "description": "The unique identifier of an array job",
"type": "integer" "type": "integer"
}, },
@ -38,14 +38,14 @@
"type": "integer", "type": "integer",
"exclusiveMinimum": 0 "exclusiveMinimum": 0
}, },
"num_gpus": { "num_accelerators": {
"description": "Number of GPUs used", "description": "Number of accelerators used",
"type": "integer", "type": "integer",
"exclusiveMinimum": 0 "exclusiveMinimum": 0
}, },
"exclusive": { "exclusive": {
"description": "Job uses only exclusive nodes", "description": "Job uses only exclusive nodes",
"type": "boolean" "type": "integer"
}, },
"smt": { "smt": {
"description": "Job uses smt feature", "description": "Job uses smt feature",
@ -91,16 +91,16 @@
"hostname": { "hostname": {
"type": "string" "type": "string"
}, },
"cpus": { "hwthreads": {
"type": "array", "type": "array",
"description": "List of OS processor ids", "description": "List of OS processor ids",
"items": { "items": {
"type": "integer" "type": "integer"
} }
}, },
"gpus": { "accelerators": {
"type": "array", "type": "array",
"description": "List of of gpu device addresses", "description": "List of of accelerator device addresses",
"items": { "items": {
"type": "integer" "type": "integer"
} }

6
schema/json/job-metric-data.schema.json
View File

@ -11,9 +11,11 @@
"type": "string", "type": "string",
"enum": [ "enum": [
"node", "node",
"cpu", "hwthread",
"memory",
"die",
"socket", "socket",
"gpu" "accelerator"
] ]
}, },
"timestep": { "timestep": {

2
schema/json/unit.schema.json
View File

@ -14,7 +14,7 @@
"F/s", "F/s",
"CPI", "CPI",
"IPC", "IPC",
"Hz", "Hz"
] ]
}, },
"prefix": { "prefix": {