Reformat and cleanup

This commit is contained in:
Jan Eitzinger 2019-09-15 10:35:02 +02:00
parent 36e1558bec
commit b980f191f0
4 changed files with 65 additions and 18 deletions

View File

@ -1,6 +1,5 @@
{ {
"$schema": "http://json-schema.org/draft-07/schema#", "$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://github.com/RRZE-HPC/HPCJobDatabase/blob/master/json-schema/job-metric.schema.json",
"title": "Job metric data", "title": "Job metric data",
"description": "Meta data information of a HPC job", "description": "Meta data information of a HPC job",
"type": "object", "type": "object",
@ -126,7 +125,11 @@
"#ref": "https://github.com/RRZE-HPC/HPCJobDatabase/blob/master/json-schema/job-metric-data.schema.json" "#ref": "https://github.com/RRZE-HPC/HPCJobDatabase/blob/master/json-schema/job-metric-data.schema.json"
} }
}, },
"required": [ "mem_used", "flops_any", "mem_bw", "net_bw", "file_bw" ] "required": [
"mem_used",
} "flops_any",
"mem_bw",
"net_bw",
"file_bw"
]
} }

View File

@ -1,6 +1,5 @@
{ {
"$schema": "http://json-schema.org/draft-07/schema#", "$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://github.com/RRZE-HPC/HPCJobDatabase/blob/master/json-schema/job-meta.schema.json",
"title": "Job meta data", "title": "Job meta data",
"description": "Meta data information of a HPC job", "description": "Meta data information of a HPC job",
"type": "object", "type": "object",
@ -34,7 +33,12 @@
"job_state": { "job_state": {
"description": "Final state of job", "description": "Final state of job",
"type": "string", "type": "string",
"enum": [ "completed", "failed", "canceled", "timeout" ] "enum": [
"completed",
"failed",
"canceled",
"timeout"
]
}, },
"start_time": { "start_time": {
"description": "Start epoch time stamp in seconds", "description": "Start epoch time stamp in seconds",
@ -73,7 +77,10 @@
"type": "string" "type": "string"
} }
}, },
"required": [ "name", "type" ] "required": [
"name",
"type"
]
}, },
"uniqueItems": true "uniqueItems": true
}, },
@ -202,8 +209,26 @@
"#ref": "https://github.com/RRZE-HPC/HPCJobDatabase/blob/master/json-schema/job-statistic.schema.json" "#ref": "https://github.com/RRZE-HPC/HPCJobDatabase/blob/master/json-schema/job-statistic.schema.json"
} }
}, },
"required": [ "mem_used", "flops_any", "mem_bw", "net_bw", "file_bw" ] "required": [
"mem_used",
"flops_any",
"mem_bw",
"net_bw",
"file_bw"
]
} }
}, },
"required": [ "job_id", "user_id", "project_id", "cluster_id", "num_nodes", "start_time", "stop_time", "duration", "nodes", "tags", "statistics" ] "required": [
"job_id",
"user_id",
"project_id",
"cluster_id",
"num_nodes",
"start_time",
"stop_time",
"duration",
"nodes",
"tags",
"statistics"
]
} }

View File

@ -1,6 +1,5 @@
{ {
"$schema": "http://json-schema.org/draft-07/schema#", "$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://github.com/RRZE-HPC/HPCJobDatabase/blob/master/json-schema/job-metric.schema.json",
"title": "Job metric data", "title": "Job metric data",
"description": "Metric data of a HPC job", "description": "Metric data of a HPC job",
"type": "object", "type": "object",
@ -12,10 +11,14 @@
"scope": { "scope": {
"description": "", "description": "",
"type": "string", "type": "string",
"enum": [ "node", "cpu", "socket" ] "enum": [
"node",
"cpu",
"socket"
]
}, },
"timestep": { "timestep": {
"description": "", "description": "Measurement interval in seconds",
"type": "integer" "type": "integer"
}, },
"series": { "series": {
@ -30,7 +33,7 @@
"id": { "id": {
"type": "integer" "type": "integer"
}, },
"statistic": { "statistics": {
"type": "object", "type": "object",
"properties": { "properties": {
"avg": { "avg": {
@ -49,7 +52,11 @@
"minimum": 0 "minimum": 0
} }
}, },
"required": [ "avg", "min", "max" ] "required": [
"avg",
"min",
"max"
]
}, },
"data": { "data": {
"type": "array", "type": "array",
@ -60,9 +67,17 @@
"minItems": 1 "minItems": 1
} }
}, },
"required": [ "node_id", "data" ] "required": [
"node_id",
"data"
]
} }
} }
}, },
"required": [ "unit", "scope", "timestep", "series" ] "required": [
"unit",
"scope",
"timestep",
"series"
]
} }

View File

@ -1,6 +1,5 @@
{ {
"$schema": "http://json-schema.org/draft-07/schema#", "$schema": "http://json-schema.org/draft-07/schema#",
"$id": "http://example.com/job-statistic.schema.json",
"title": "Job statistics", "title": "Job statistics",
"description": "Format specification for job metric statistics", "description": "Format specification for job metric statistics",
"type": "object", "type": "object",
@ -25,5 +24,10 @@
"minimum": 0 "minimum": 0
} }
}, },
"required": [ "unit", "avg", "min", "max" ] "required": [
"unit",
"avg",
"min",
"max"
]
} }