ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2026-01-28 06:51:45 +01:00
Code Issues Packages Releases Activity

Merge branch 'dev' of https://github.com/ClusterCockpit/cc-backend into dev

Browse Source
This commit is contained in:
Christoph Kluge
2026-01-21 12:21:56 +01:00
parent f18ae35030 1d4c79c821
commit 55e0456aac
29 changed files with 200 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
web/configSchema.go
View File

@@ -8,57 +8,57 @@ package web
const configSchema = `{
"type": "object",
"properties": {
"jobList": {
"job-list": {
"description": "Job list defaults. Applies to user- and jobs views.",
"type": "object",
"properties": {
"usePaging": {
"use-paging": {
"description": "If classic paging is used instead of continuous scrolling by default.",
"type": "boolean"
},
"showFootprint": {
"show-footprint": {
"description": "If footprint bars are shown as first column by default.",
"type": "boolean"
}
}
},
"nodeList": {
"node-list": {
"description": "Node list defaults. Applies to node list view.",
"type": "object",
"properties": {
"usePaging": {
"use-paging": {
"description": "If classic paging is used instead of continuous scrolling by default.",
"type": "boolean"
}
}
},
"jobView": {
"job-view": {
"description": "Job view defaults.",
"type": "object",
"properties": {
"showPolarPlot": {
"show-polar-plot": {
"description": "If the job metric footprints polar plot is shown by default.",
"type": "boolean"
},
"showFootprint": {
"show-footprint": {
"description": "If the annotated job metric footprint bars are shown by default.",
"type": "boolean"
},
"showRoofline": {
"show-roofline": {
"description": "If the job roofline plot is shown by default.",
"type": "boolean"
},
"showStatTable": {
"show-stat-table": {
"description": "If the job metric statistics table is shown by default.",
"type": "boolean"
}
}
},
"metricConfig": {
"metric-config": {
"description": "Global initial metric selections for primary views of all clusters.",
"type": "object",
"properties": {
"jobListMetrics": {
"job-list-metrics": {
"description": "Initial metrics shown for new users in job lists (User and jobs view).",
"type": "array",
"items": {
@@ -66,7 +66,7 @@ const configSchema = `{
"minItems": 1
}
},
"jobViewPlotMetrics": {
"job-view-plot-metrics": {
"description": "Initial metrics shown for new users as job view metric plots.",
"type": "array",
"items": {
@@ -74,7 +74,7 @@ const configSchema = `{
"minItems": 1
}
},
"jobViewTableMetrics": {
"job-view-table-metrics": {
"description": "Initial metrics shown for new users in job view statistics table.",
"type": "array",
"items": {
@@ -91,7 +91,7 @@ const configSchema = `{
"name": {
"description": "The name of the cluster."
},
"jobListMetrics": {
"job-list-metrics": {
"description": "Initial metrics shown for new users in job lists (User and jobs view) for subcluster.",
"type": "array",
"items": {
@@ -99,7 +99,7 @@ const configSchema = `{
"minItems": 1
}
},
"jobViewPlotMetrics": {
"job-view-plot-metrics": {
"description": "Initial metrics shown for new users as job view timeplots for subcluster.",
"type": "array",
"items": {
@@ -107,7 +107,7 @@ const configSchema = `{
"minItems": 1
}
},
"jobViewTableMetrics": {
"job-view-table-metrics": {
"description": "Initial metrics shown for new users in job view statistics table for subcluster.",
"type": "array",
"items": {
@@ -115,7 +115,7 @@ const configSchema = `{
"minItems": 1
}
},
"subClusters": {
"sub-clusters": {
"description": "The array of overrides per subcluster.",
"type": "array",
"items": {
@@ -125,7 +125,7 @@ const configSchema = `{
"description": "The name of the subcluster.",
"type": "string"
},
"jobListMetrics": {
"job-list-metrics": {
"description": "Initial metrics shown for new users in job lists (User and jobs view) for subcluster.",
"type": "array",
"items": {
@@ -133,7 +133,7 @@ const configSchema = `{
"minItems": 1
}
},
"jobViewPlotMetrics": {
"job-view-plot-metrics": {
"description": "Initial metrics shown for new users as job view timeplots for subcluster.",
"type": "array",
"items": {
@@ -141,7 +141,7 @@ const configSchema = `{
"minItems": 1
}
},
"jobViewTableMetrics": {
"job-view-table-metrics": {
"description": "Initial metrics shown for new users in job view statistics table for subcluster.",
"type": "array",
"items": {
@@ -155,29 +155,29 @@ const configSchema = `{
}
}
},
"required": ["name", "subClusters"],
"required": ["name", "sub-clusters"],
"minItems": 1
}
}
}
},
"plotConfiguration": {
"plot-configuration": {
"description": "Initial settings for plot render options.",
"type": "object",
"properties": {
"colorBackground": {
"color-background": {
"description": "If the metric plot backgrounds are initially colored by threshold limits.",
"type": "boolean"
},
"plotsPerRow": {
"plots-per-row": {
"description": "How many plots are initially rendered in per row. Applies to job, single node, and analysis views.",
"type": "integer"
},
"lineWidth": {
"line-width": {
"description": "Initial thickness of rendered plotlines. Applies to metric plot, job compare plot and roofline.",
"type": "integer"
},
"colorScheme": {
"color-scheme": {
"description": "Initial colorScheme to be used for metric plots.",
"type": "array",
"items": {

52
web/web.go
View File

@@ -22,56 +22,56 @@ import (
)
type WebConfig struct {
JobList JobListConfig `json:"jobList"`
NodeList NodeListConfig `json:"nodeList"`
JobView JobViewConfig `json:"jobView"`
MetricConfig MetricConfig `json:"metricConfig"`
PlotConfiguration PlotConfiguration `json:"plotConfiguration"`
JobList JobListConfig `json:"job-list"`
NodeList NodeListConfig `json:"node-list"`
JobView JobViewConfig `json:"job-view"`
MetricConfig MetricConfig `json:"metric-config"`
PlotConfiguration PlotConfiguration `json:"plot-configuration"`
}
type JobListConfig struct {
UsePaging bool `json:"usePaging"`
ShowFootprint bool `json:"showFootprint"`
UsePaging bool `json:"use-paging"`
ShowFootprint bool `json:"show-footprint"`
}
type NodeListConfig struct {
UsePaging bool `json:"usePaging"`
UsePaging bool `json:"use-paging"`
}
type JobViewConfig struct {
ShowPolarPlot bool `json:"showPolarPlot"`
ShowFootprint bool `json:"showFootprint"`
ShowRoofline bool `json:"showRoofline"`
ShowStatTable bool `json:"showStatTable"`
ShowPolarPlot bool `json:"show-polar-plot"`
ShowFootprint bool `json:"show-footprint"`
ShowRoofline bool `json:"show-roofline"`
ShowStatTable bool `json:"show-stat-table"`
}
type MetricConfig struct {
JobListMetrics []string `json:"jobListMetrics"`
JobViewPlotMetrics []string `json:"jobViewPlotMetrics"`
JobViewTableMetrics []string `json:"jobViewTableMetrics"`
JobListMetrics []string `json:"job-list-metrics"`
JobViewPlotMetrics []string `json:"job-view-plot-metrics"`
JobViewTableMetrics []string `json:"job-view-table-metrics"`
Clusters []ClusterConfig `json:"clusters"`
}
type ClusterConfig struct {
Name string `json:"name"`
JobListMetrics []string `json:"jobListMetrics"`
JobViewPlotMetrics []string `json:"jobViewPlotMetrics"`
JobViewTableMetrics []string `json:"jobViewTableMetrics"`
SubClusters []SubClusterConfig `json:"subClusters"`
JobListMetrics []string `json:"job-list-metrics"`
JobViewPlotMetrics []string `json:"job-view-plot-metrics"`
JobViewTableMetrics []string `json:"job-view-table-metrics"`
SubClusters []SubClusterConfig `json:"sub-clusters"`
}
type SubClusterConfig struct {
Name string `json:"name"`
JobListMetrics []string `json:"jobListMetrics"`
JobViewPlotMetrics []string `json:"jobViewPlotMetrics"`
JobViewTableMetrics []string `json:"jobViewTableMetrics"`
JobListMetrics []string `json:"job-list-metrics"`
JobViewPlotMetrics []string `json:"job-view-plot-metrics"`
JobViewTableMetrics []string `json:"job-view-table-metrics"`
}
type PlotConfiguration struct {
ColorBackground bool `json:"colorBackground"`
PlotsPerRow int `json:"plotsPerRow"`
LineWidth int `json:"lineWidth"`
ColorScheme []string `json:"colorScheme"`
ColorBackground bool `json:"color-background"`
PlotsPerRow int `json:"plots-per-row"`
LineWidth int `json:"line-width"`
ColorScheme []string `json:"color-scheme"`
}
var UIDefaults = WebConfig{

20
web/webConfig_test.go
View File

@@ -20,38 +20,38 @@ func TestInit(t *testing.T) {
Init(cfg)
if UIDefaultsMap["nodelist_usePaging"] == false {
if UIDefaultsMap["nodeList_usePaging"] == false {
t.Errorf("wrong option\ngot: %v \nwant: true", UIDefaultsMap["NodeList_UsePaging"])
}
}
func TestSimpleDefaults(t *testing.T) {
const s = `{
"joblist": {
"showFootprint": false
"job-list": {
"show-footprint": false
}
}`
Init(json.RawMessage(s))
if UIDefaultsMap["joblist_usePaging"] == true {
if UIDefaultsMap["jobList_usePaging"] == true {
t.Errorf("wrong option\ngot: %v \nwant: false", UIDefaultsMap["NodeList_UsePaging"])
}
}
func TestOverwrite(t *testing.T) {
const s = `{
"metricConfig": {
"jobListMetrics": ["flops_sp", "flops_dp"],
"metric-config": {
"job-list-metrics": ["flops_sp", "flops_dp"],
"clusters": [
{
"name": "fritz",
"jobListMetrics": ["flops_any", "mem_bw", "load"],
"subClusters": [
"job-list-metrics": ["flops_any", "mem_bw", "load"],
"sub-clusters": [
{
"name": "icelake",
"jobListMetrics": ["flops_any", "mem_bw", "power", "load"],
"jobViewPlotMetrics": ["load"]
"job-list-metrics": ["flops_any", "mem_bw", "power", "load"],
"job-view-plot-metrics": ["load"]
}
]
}