Add energy footprint

api/schema.graphqls

@@ -40,7 +40,6 @@ type JobLink {
 type Cluster {
   name:         String!
   partitions:   [String!]!        # Slurm partitions
-  metricConfig: [MetricConfig!]!
   subClusters:  [SubCluster!]!    # Hardware partitions/subclusters
 }
 
@@ -56,6 +55,8 @@ type SubCluster {
   flopRateSimd:    MetricValue!
   memoryBandwidth: MetricValue!
   topology:        Topology!
+  metricConfig:    [MetricConfig!]!
+  footprint:       [String!]!
 }
 
 type MetricValue {

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

@@ -252,7 +252,8 @@
       "peak": 500,
       "normal": 250,
       "caution": 100,
-      "alert": 50
+      "alert": 50,
+      "energy": true
     },
     {
       "name": "mem_power",
@@ -265,7 +266,8 @@
       "peak": 100,
       "normal": 50,
       "caution": 20,
-      "alert": 10
+      "alert": 10,
+      "energy": true
     },
     {
       "name": "ipc",

pkg/schema/job.go

@@ -23,11 +23,13 @@ type BaseJob struct {
 	User               string             `json:"user" db:"user" example:"abcd100h"`
 	State              JobState           `json:"jobState" db:"job_state" example:"completed" enums:"completed,failed,cancelled,stopped,timeout,out_of_memory"`
 	Tags               []*Tag             `json:"tags,omitempty"`
+	RawEnergyFootprint []byte             `json:"-" db:"energy_footprint"`
 	RawFootprint       []byte             `json:"-" db:"footprint"`
 	RawMetaData        []byte             `json:"-" db:"meta_data"`
 	RawResources       []byte             `json:"-" db:"resources"`
 	Resources          []*Resource        `json:"resources"`
-	Footprint        map[string]float64 `json:"footPrint"`
+	EnergyFootprint    map[string]float64 `json:"energyFootprint"`
+	Footprint          map[string]float64 `json:"footprint"`
 	MetaData           map[string]string  `json:"metaData"`
 	ConcurrentJobs     JobLinkResultList  `json:"concurrentJobs"`
 	Energy             float64            `json:"energy"`