ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-12-26 05:19:05 +01:00
Code Issues Packages Releases Activity

Merge pull request #308 from ClusterCockpit/dev

Browse Source 
Move to open Release PR
This commit is contained in:
Christoph Kluge 2024-12-03 17:19:09 +01:00 committed by GitHub
commit 1e43654607
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/schema/config.go
View File

@ -164,13 +164,13 @@ type ProgramConfig struct {
// Defines time X in seconds in which jobs are considered to be "short" and will be filtered in specific views. // Defines time X in seconds in which jobs are considered to be "short" and will be filtered in specific views.
ShortRunningJobsDuration int `json:"short-running-jobs-duration"` ShortRunningJobsDuration int `json:"short-running-jobs-duration"`
// Array of Clusters
Clusters []*ClusterConfig `json:"clusters"`
// Energy Mix CO2 Emission Constant [g/kWh] // Energy Mix CO2 Emission Constant [g/kWh]
// If entered, displays estimated CO2 emission for job based on jobs totalEnergy // If entered, displays estimated CO2 emission for job based on jobs totalEnergy
EmissionConstant int `json:"emission-constant"` EmissionConstant int `json:"emission-constant"`
// Frequency of cron job workers // Frequency of cron job workers
CronFrequency *CronFrequency `json:"cron-frequency"` CronFrequency *CronFrequency `json:"cron-frequency"`
// Array of Clusters
Clusters []*ClusterConfig `json:"clusters"`
} }

5
pkg/schema/schemas/config.schema.json
View File

@ -10,7 +10,10 @@
}, },
"apiAllowedIPs": { "apiAllowedIPs": {
"description": "Addresses from which secured API endpoints can be reached", "description": "Addresses from which secured API endpoints can be reached",
"type": "string" "type": "array",
"items": {
"type": "string"
}
}, },
"user": { "user": {
"description": "Drop root permissions once .env was read and the port was taken. Only applicable if using privileged port.", "description": "Drop root permissions once .env was read and the port was taken. Only applicable if using privileged port.",