mirror of
https://github.com/ClusterCockpit/cc-backend
synced 2025-07-22 20:41:40 +02:00
Change footprint variabel from bool to string
The footprint variable also indicates the type of statistic used now
This commit is contained in:
@@ -84,9 +84,9 @@ func initClusterConfig() error {
|
||||
newMetric.LowerIsBetter = cfg.LowerIsBetter
|
||||
sc.MetricConfig = append(sc.MetricConfig, *newMetric)
|
||||
|
||||
if newMetric.Footprint {
|
||||
if newMetric.Footprint != "" {
|
||||
sc.Footprint = append(sc.Footprint, newMetric.Name)
|
||||
ml.Footprint = true
|
||||
ml.Footprint = newMetric.Footprint
|
||||
}
|
||||
if newMetric.Energy {
|
||||
sc.EnergyFootprint = append(sc.EnergyFootprint, newMetric.Name)
|
||||
@@ -96,7 +96,7 @@ func initClusterConfig() error {
|
||||
availability.SubClusters = append(availability.SubClusters, sc.Name)
|
||||
sc.MetricConfig = append(sc.MetricConfig, *newMetric)
|
||||
|
||||
if newMetric.Footprint {
|
||||
if newMetric.Footprint != "" {
|
||||
sc.Footprint = append(sc.Footprint, newMetric.Name)
|
||||
}
|
||||
if newMetric.Energy {
|
||||
|
10
pkg/archive/testdata/archive/alex/cluster.json
vendored
10
pkg/archive/testdata/archive/alex/cluster.json
vendored
@@ -8,7 +8,7 @@
|
||||
},
|
||||
"scope": "node",
|
||||
"aggregation": "avg",
|
||||
"footprint": true,
|
||||
"footprint": "avg",
|
||||
"timestep": 60,
|
||||
"peak": 128,
|
||||
"normal": 128,
|
||||
@@ -36,7 +36,7 @@
|
||||
},
|
||||
"scope": "node",
|
||||
"aggregation": "sum",
|
||||
"footprint": true,
|
||||
"footprint": "max",
|
||||
"timestep": 60,
|
||||
"peak": 512,
|
||||
"normal": 128,
|
||||
@@ -51,7 +51,7 @@
|
||||
},
|
||||
"scope": "hwthread",
|
||||
"aggregation": "sum",
|
||||
"footprint": true,
|
||||
"footprint": "avg",
|
||||
"timestep": 60,
|
||||
"peak": 9216,
|
||||
"normal": 1000,
|
||||
@@ -66,7 +66,7 @@
|
||||
},
|
||||
"scope": "socket",
|
||||
"aggregation": "sum",
|
||||
"footprint": true,
|
||||
"footprint": "avg",
|
||||
"timestep": 60,
|
||||
"peak": 350,
|
||||
"normal": 100,
|
||||
@@ -108,7 +108,7 @@
|
||||
},
|
||||
"scope": "accelerator",
|
||||
"aggregation": "avg",
|
||||
"footprint": true,
|
||||
"footprint": "avg",
|
||||
"timestep": 60,
|
||||
"peak": 100,
|
||||
"normal": 80,
|
||||
|
18
pkg/archive/testdata/archive/fritz/cluster.json
vendored
18
pkg/archive/testdata/archive/fritz/cluster.json
vendored
@@ -8,7 +8,7 @@
|
||||
},
|
||||
"scope": "node",
|
||||
"aggregation": "avg",
|
||||
"footprint": true,
|
||||
"footprint": "avg",
|
||||
"timestep": 60,
|
||||
"peak": 72,
|
||||
"normal": 72,
|
||||
@@ -20,7 +20,7 @@
|
||||
"peak": 104,
|
||||
"normal": 104,
|
||||
"caution": 52,
|
||||
"footprint": true,
|
||||
"footprint": "avg",
|
||||
"alert": 20
|
||||
},
|
||||
{
|
||||
@@ -28,7 +28,7 @@
|
||||
"peak": 104,
|
||||
"normal": 104,
|
||||
"caution": 52,
|
||||
"footprint": true,
|
||||
"footprint": "avg",
|
||||
"alert": 20
|
||||
}
|
||||
]
|
||||
@@ -54,7 +54,7 @@
|
||||
},
|
||||
"scope": "node",
|
||||
"aggregation": "sum",
|
||||
"footprint": true,
|
||||
"footprint": "max",
|
||||
"timestep": 60,
|
||||
"peak": 256,
|
||||
"normal": 128,
|
||||
@@ -67,7 +67,7 @@
|
||||
"peak": 1024,
|
||||
"normal": 512,
|
||||
"caution": 900,
|
||||
"footprint": true,
|
||||
"footprint": "max",
|
||||
"lowerIsBetter": true,
|
||||
"alert": 1000
|
||||
},
|
||||
@@ -76,7 +76,7 @@
|
||||
"peak": 2048,
|
||||
"normal": 1024,
|
||||
"caution": 1800,
|
||||
"footprint": true,
|
||||
"footprint": "max",
|
||||
"lowerIsBetter": true,
|
||||
"alert": 2000
|
||||
}
|
||||
@@ -90,7 +90,7 @@
|
||||
},
|
||||
"scope": "hwthread",
|
||||
"aggregation": "sum",
|
||||
"footprint": true,
|
||||
"footprint": "avg",
|
||||
"timestep": 60,
|
||||
"peak": 5600,
|
||||
"normal": 1000,
|
||||
@@ -103,7 +103,7 @@
|
||||
"normal": 1500,
|
||||
"caution": 400,
|
||||
"alert": 50,
|
||||
"footprint": true
|
||||
"footprint": "avg"
|
||||
},
|
||||
{
|
||||
"name": "spr2tb",
|
||||
@@ -187,7 +187,7 @@
|
||||
},
|
||||
"scope": "socket",
|
||||
"aggregation": "sum",
|
||||
"footprint": true,
|
||||
"footprint": "avg",
|
||||
"timestep": 60,
|
||||
"peak": 350,
|
||||
"normal": 100,
|
||||
|
Reference in New Issue
Block a user