Merge branch 'Refactor-job-footprint' of https://github.com/ClusterCockpit/cc-backend into Refactor-job-footprint

.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Build, Vet & Test

api/schema.graphqls

@@ -105,6 +105,7 @@ type MetricConfig {
   normal:  Float
   caution: Float!
   alert:   Float!
+  lowerIsBetter: Boolean
   subClusters: [SubClusterConfig!]!
 }
 

go.mod

@@ -3,56 +3,53 @@ module github.com/ClusterCockpit/cc-backend
 go 1.22
 
 require (
-	github.com/99designs/gqlgen v0.17.45
+	github.com/99designs/gqlgen v0.17.49
 	github.com/ClusterCockpit/cc-units v0.4.0
-	github.com/Masterminds/squirrel v1.5.3
+	github.com/Masterminds/squirrel v1.5.4
-	github.com/coreos/go-oidc/v3 v3.9.0
+	github.com/coreos/go-oidc/v3 v3.11.0
-	github.com/davecgh/go-spew v1.1.1
+	github.com/go-co-op/gocron v1.37.0
-	github.com/go-co-op/gocron v1.25.0
+	github.com/go-ldap/ldap/v3 v3.4.8
-	github.com/go-ldap/ldap/v3 v3.4.4
+	github.com/go-sql-driver/mysql v1.8.1
-	github.com/go-sql-driver/mysql v1.7.0
 	github.com/golang-jwt/jwt/v5 v5.2.1
-	github.com/golang-migrate/migrate/v4 v4.15.2
+	github.com/golang-migrate/migrate/v4 v4.17.1
-	github.com/google/gops v0.3.27
+	github.com/google/gops v0.3.28
-	github.com/gorilla/handlers v1.5.1
+	github.com/gorilla/handlers v1.5.2
-	github.com/gorilla/mux v1.8.0
+	github.com/gorilla/mux v1.8.1
-	github.com/gorilla/sessions v1.2.1
+	github.com/gorilla/sessions v1.3.0
-	github.com/influxdata/influxdb-client-go/v2 v2.12.2
+	github.com/influxdata/influxdb-client-go/v2 v2.13.0
-	github.com/jmoiron/sqlx v1.3.5
+	github.com/jmoiron/sqlx v1.4.0
-	github.com/mattn/go-sqlite3 v1.14.16
+	github.com/mattn/go-sqlite3 v1.14.22
-	github.com/prometheus/client_golang v1.14.0
+	github.com/prometheus/client_golang v1.19.1
-	github.com/prometheus/common v0.40.0
+	github.com/prometheus/common v0.55.0
 	github.com/qustavo/sqlhooks/v2 v2.1.0
-	github.com/santhosh-tekuri/jsonschema/v5 v5.2.0
+	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
-	github.com/swaggo/http-swagger v1.3.3
+	github.com/swaggo/http-swagger v1.3.4
 	github.com/swaggo/swag v1.16.3
-	github.com/vektah/gqlparser/v2 v2.5.11
+	github.com/vektah/gqlparser/v2 v2.5.16
-	golang.org/x/crypto v0.21.0
+	golang.org/x/crypto v0.25.0
-	golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea
+	golang.org/x/exp v0.0.0-20240707233637-46b078467d37
-	golang.org/x/oauth2 v0.13.0
+	golang.org/x/oauth2 v0.21.0
 )
 
 require (
+	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/agnivade/levenshtein v1.1.1 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/containerd/containerd v1.6.26 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
-	github.com/deepmap/oapi-codegen v1.12.4 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
+	github.com/go-jose/go-jose/v4 v4.0.3 // indirect
-	github.com/go-jose/go-jose/v3 v3.0.3 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/spec v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/securecookie v1.1.1 // indirect
+	github.com/gorilla/securecookie v1.1.2 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
@@ -63,30 +60,29 @@ require (
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
+	github.com/oapi-codegen/runtime v1.1.1 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
-	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sosodev/duration v1.2.0 // indirect
+	github.com/sosodev/duration v1.3.1 // indirect
-	github.com/swaggo/files v1.0.0 // indirect
+	github.com/swaggo/files v1.0.1 // indirect
-	github.com/urfave/cli/v2 v2.27.1 // indirect
+	github.com/urfave/cli/v2 v2.27.2 // indirect
 	github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
-	golang.org/x/mod v0.16.0 // indirect
+	golang.org/x/mod v0.19.0 // indirect
-	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/tools v0.19.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
+	golang.org/x/tools v0.23.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect

internal/graph/schema.resolvers.go

@@ -2,7 +2,7 @@ package graph
 
 // This file will be automatically regenerated based on the schema, any resolver implementations
 // will be copied through when generating and any unknown code will be moved to the end.
-// Code generated by github.com/99designs/gqlgen version v0.17.45
+// Code generated by github.com/99designs/gqlgen version v0.17.49
 
 import (
 	"context"
@@ -72,7 +72,7 @@ func (r *jobResolver) Footprint(ctx context.Context, obj *schema.Job) ([]*model.
 }
 
 // MetaData is the resolver for the metaData field.
-func (r *jobResolver) MetaData(ctx context.Context, obj *schema.Job) (interface{}, error) {
+func (r *jobResolver) MetaData(ctx context.Context, obj *schema.Job) (any, error) {
 	return r.Repo.FetchMetadata(obj)
 }
 

pkg/archive/clusterConfig.go

@@ -78,6 +78,8 @@ func initClusterConfig() error {
 						newMetric.Caution = cfg.Caution
 						newMetric.Alert = cfg.Alert
 						newMetric.Footprint = cfg.Footprint
+						newMetric.Energy = cfg.Energy
+						newMetric.LowerIsBetter = cfg.LowerIsBetter
 						sc.MetricConfig = append(sc.MetricConfig, *newMetric)
 
 						if newMetric.Footprint {

pkg/archive/clusterConfig_test.go

@@ -28,6 +28,12 @@ func TestClusterConfig(t *testing.T) {
 		t.Fail()
 	}
 
+	for _, metric := range sc.MetricConfig {
+		if metric.LowerIsBetter && metric.Name != "mem_used" {
+			t.Fail()
+		}
+	}
+
 	// spew.Dump(archive.GlobalMetricList)
 	// t.Fail()
 }

pkg/archive/testdata/archive/fritz/cluster.json

@@ -60,6 +60,7 @@
       "normal": 128,
       "caution": 200,
       "alert": 240,
+      "lowerIsBetter": true,
       "subClusters": [
         {
           "name": "spr1tb",
@@ -67,6 +68,7 @@
           "normal": 512,
           "caution": 900,
           "footprint": true,
+          "lowerIsBetter": true,
           "alert": 1000
         },
         {
@@ -75,6 +77,7 @@
           "normal": 1024,
           "caution": 1800,
           "footprint": true,
+          "lowerIsBetter": true,
           "alert": 2000
         }
       ]

pkg/schema/cluster.go

@@ -46,28 +46,31 @@ type SubCluster struct {
 }
 
 type SubClusterConfig struct {
-	Name      string  `json:"name"`
+	Name          string  `json:"name"`
-	Peak      float64 `json:"peak"`
+	Peak          float64 `json:"peak"`
-	Normal    float64 `json:"normal"`
+	Normal        float64 `json:"normal"`
-	Caution   float64 `json:"caution"`
+	Caution       float64 `json:"caution"`
-	Alert     float64 `json:"alert"`
+	Alert         float64 `json:"alert"`
-	Footprint bool    `json:"footprint"`
+	Footprint     bool    `json:"footprint"`
-	Remove    bool    `json:"remove"`
+	Remove        bool    `json:"remove"`
+	LowerIsBetter bool    `json:"lowerIsBetter"`
+	Energy        bool    `json:"energy"`
 }
 
 type MetricConfig struct {
-	Unit        Unit                `json:"unit"`
+	Unit          Unit                `json:"unit"`
-	Name        string              `json:"name"`
+	Name          string              `json:"name"`
-	Scope       MetricScope         `json:"scope"`
+	Scope         MetricScope         `json:"scope"`
-	Aggregation string              `json:"aggregation"`
+	Aggregation   string              `json:"aggregation"`
-	SubClusters []*SubClusterConfig `json:"subClusters,omitempty"`
+	SubClusters   []*SubClusterConfig `json:"subClusters,omitempty"`
-	Timestep    int                 `json:"timestep"`
+	Timestep      int                 `json:"timestep"`
-	Peak        float64             `json:"peak"`
+	Peak          float64             `json:"peak"`
-	Normal      float64             `json:"normal"`
+	Normal        float64             `json:"normal"`
-	Caution     float64             `json:"caution"`
+	Caution       float64             `json:"caution"`
-	Alert       float64             `json:"alert"`
+	Alert         float64             `json:"alert"`
-	Footprint   bool                `json:"footprint"`
+	LowerIsBetter bool                `json:"lowerIsBetter"`
-	Energy      bool                `json:"energy"`
+	Footprint     bool                `json:"footprint"`
+	Energy        bool                `json:"energy"`
 }
 
 type Cluster struct {