Unify JSON attribute naming ot use kebab style case. Cleanup configuration.

internal/config/config.go

@@ -20,9 +20,9 @@ type ProgramConfig struct {
 	Addr string `json:"addr"`
 
 	// Addresses from which secured admin API endpoints can be reached, can be wildcard "*"
-	APIAllowedIPs []string `json:"apiAllowedIPs"`
+	APIAllowedIPs []string `json:"api-allowed-ips"`
 
-	APISubjects *NATSConfig `json:"apiSubjects"`
+	APISubjects *NATSConfig `json:"api-subjects"`
 
 	// Drop root permissions once .env was read and the port was taken.
 	User  string `json:"user"`
@@ -37,9 +37,6 @@ type ProgramConfig struct {
 	EmbedStaticFiles bool   `json:"embed-static-files"`
 	StaticFiles      string `json:"static-files"`
 
-	// Database driver - only 'sqlite3' is supported
-	DBDriver string `json:"db-driver"`
-
 	// Path to SQLite database file
 	DB string `json:"db"`
 
@@ -78,7 +75,7 @@ type ProgramConfig struct {
 
 type ResampleConfig struct {
 	// Minimum number of points to trigger resampling of data
-	MinimumPoints int `json:"minimumPoints"`
+	MinimumPoints int `json:"minimum-points"`
 	// Array of resampling target resolutions, in seconds; Example: [600,300,60]
 	Resolutions []int `json:"resolutions"`
 	// Trigger next zoom level at less than this many visible datapoints
@@ -86,8 +83,8 @@ type ResampleConfig struct {
 }
 
 type NATSConfig struct {
-	SubjectJobEvent  string `json:"subjectJobEvent"`
-	SubjectNodeState string `json:"subjectNodeState"`
+	SubjectJobEvent  string `json:"subject-job-event"`
+	SubjectNodeState string `json:"subject-node-state"`
 }
 
 type IntRange struct {
@@ -103,17 +100,14 @@ type TimeRange struct {
 
 type FilterRanges struct {
 	Duration  *IntRange  `json:"duration"`
-	NumNodes  *IntRange  `json:"numNodes"`
-	StartTime *TimeRange `json:"startTime"`
+	NumNodes  *IntRange  `json:"num-nodes"`
+	StartTime *TimeRange `json:"start-time"`
 }
 
 var Keys ProgramConfig = ProgramConfig{
 	Addr:                      "localhost:8080",
-	DisableAuthentication:     false,
 	EmbedStaticFiles:          true,
-	DBDriver:                  "sqlite3",
 	DB:                        "./var/job.db",
-	Validate:                  false,
 	SessionMaxAge:             "168h",
 	StopJobsExceedingWalltime: 0,
 	ShortRunningJobsDuration:  5 * 60,

internal/config/default_metrics.go

@@ -15,7 +15,7 @@ import (
 
 type DefaultMetricsCluster struct {
 	Name           string `json:"name"`
-	DefaultMetrics string `json:"default_metrics"`
+	DefaultMetrics string `json:"default-metrics"`
 }
 
 type DefaultMetricsConfig struct {

internal/config/schema.go

@@ -13,7 +13,7 @@ var configSchema = `
       "description": "Address where the http (or https) server will listen on (for example: 'localhost:80').",
       "type": "string"
     },
-    "apiAllowedIPs": {
+    "api-allowed-ips": {
       "description": "Addresses from which secured API endpoints can be reached",
       "type": "array",
       "items": {
@@ -98,7 +98,7 @@ var configSchema = `
       "description": "Enable dynamic zoom in frontend metric plots.",
       "type": "object",
       "properties": {
-        "minimumPoints": {
+        "minimum-points": {
           "description": "Minimum points to trigger resampling of time-series data.",
           "type": "integer"
         },
@@ -116,20 +116,20 @@ var configSchema = `
       },
       "required": ["trigger", "resolutions"]
     },
-    "apiSubjects": {
+    "api-subjects": {
       "description": "NATS subjects configuration for subscribing to job and node events.",
       "type": "object",
       "properties": {
-        "subjectJobEvent": {
+        "subject-job-event": {
           "description": "NATS subject for job events (start_job, stop_job)",
           "type": "string"
         },
-        "subjectNodeState": {
+        "subject-node-state": {
           "description": "NATS subject for node state updates",
           "type": "string"
         }
       },
-      "required": ["subjectJobEvent", "subjectNodeState"]
+      "required": ["subject-job-event", "subject-node-state"]
     }
   }
 }`