fix: Use peak threshold for render limit maxy

ClusterCockpit · Dec 1, 2023 · 3067d7b · 3067d7b
1 parent c1b944b
commit 3067d7b
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/web/frontend/src/plots/MetricPlot.svelte b/web/frontend/src/plots/MetricPlot.svelte
@@ -161,8 +161,8 @@
             ? (statisticsSeries.max.reduce((max, x) => Math.max(max, x), thresholds.normal) || thresholds.normal)
             : (series.reduce((max, series) => Math.max(max, series.statistics?.max), thresholds.normal) || thresholds.normal)
 
-        if (maxY >= (10 * thresholds.normal)) { // Hard y-range render limit if outliers in series data
-            maxY = (10 * thresholds.normal)
+        if (maxY >= (10 * thresholds.peak)) { // Hard y-range render limit if outliers in series data
+            maxY = (10 * thresholds.peak)
         } 
     }
 
@@ -390,12 +390,12 @@
         if (scope == 'node' || metricConfig.aggregation == 'avg') {
             if (metricConfig.subClusters && metricConfig.subClusters.length === 0) {
                 // console.log('subClusterConfigs array empty, use metricConfig defaults')
-                return { normal: metricConfig.normal, caution: metricConfig.caution, alert: metricConfig.alert }
+                return { normal: metricConfig.normal, caution: metricConfig.caution, alert: metricConfig.alert, peak: metricConfig.peak }
             } else if (metricConfig.subClusters && metricConfig.subClusters.length > 0) {
                 // console.log('subClusterConfigs found, use subCluster Settings if matching jobs subcluster:')
                 let forSubCluster = metricConfig.subClusters.find(sc => sc.name == subCluster.name)
-                if (forSubCluster && forSubCluster.normal && forSubCluster.caution && forSubCluster.alert) return forSubCluster
-                else return { normal: metricConfig.normal, caution: metricConfig.caution, alert: metricConfig.alert }
+                if (forSubCluster && forSubCluster.normal && forSubCluster.caution && forSubCluster.alert && forSubCluster.peak) return forSubCluster
+                else return { normal: metricConfig.normal, caution: metricConfig.caution, alert: metricConfig.alert, peak: metricConfig.peak}
             } else {
                 console.warn('metricConfig.subClusters not found!')
                 return null
@@ -423,6 +423,7 @@
 
         let mc = metricConfig?.subClusters?.find(sc => sc.name == subCluster.name) || metricConfig
         return {
+            peak: mc.peak / divisor,
             normal: mc.normal / divisor,
             caution: mc.caution / divisor,
             alert: mc.alert / divisor