Skip to content

Commit

Permalink
Merge pull request #308 from ClusterCockpit/dev
Browse files Browse the repository at this point in the history
Move to open Release PR
  • Loading branch information
spacehamster87 authored Dec 3, 2024
2 parents 9de5879 + 4fecbe8 commit 1e43654
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
6 changes: 3 additions & 3 deletions pkg/schema/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
ShortRunningJobsDuration int `json:"short-running-jobs-duration"`

// Array of Clusters
Clusters []*ClusterConfig `json:"clusters"`

// Energy Mix CO2 Emission Constant [g/kWh]
// If entered, displays estimated CO2 emission for job based on jobs totalEnergy
EmissionConstant int `json:"emission-constant"`

// Frequency of cron job workers
CronFrequency *CronFrequency `json:"cron-frequency"`

// Array of Clusters
Clusters []*ClusterConfig `json:"clusters"`
}
5 changes: 4 additions & 1 deletion pkg/schema/schemas/config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
},
"apiAllowedIPs": {
"description": "Addresses from which secured API endpoints can be reached",
"type": "string"
"type": "array",
"items": {
"type": "string"
}
},
"user": {
"description": "Drop root permissions once .env was read and the port was taken. Only applicable if using privileged port.",
Expand Down

0 comments on commit 1e43654

Please sign in to comment.