Merge pull request ClusterCockpit#238 from ClusterCockpit/hotfix

Hotfix
pc2 · Feb 9, 2024 · f534ad6 · f534ad6
2 parents be6c63e + 2d8cf02
commit f534ad6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/web/frontend/src/HistogramSelection.svelte b/web/frontend/src/HistogramSelection.svelte
@@ -7,7 +7,7 @@
     export let metricsInHistograms
     export let isOpen
 
-    let availableMetrics = ['cpu_load', 'flops_any', 'mem_used', 'mem_bw', 'net_bw', 'file_bw']
+    let availableMetrics = ['cpu_load', 'flops_any', 'mem_used', 'mem_bw'] // 'net_bw', 'file_bw'
     let pendingMetrics = [...metricsInHistograms] // Copy
     const client = getContextClient()
 

diff --git a/web/frontend/src/JobFootprint.svelte b/web/frontend/src/JobFootprint.svelte
@@ -43,8 +43,10 @@
             } else if (jm?.metric?.series?.length > 1) {
                 const avgs = jm.metric.series.map(jms => jms.statistics.avg)
                 mv = round(mean(avgs), 2)
+            } else if (jm?.metric?.series) {
+                mv = round(jm.metric.series[0].statistics.avg, 2)
             } else {
-                mv = jm.metric.series[0].statistics.avg
+                mv = 0.0
             }
         }
         
@@ -111,12 +113,12 @@
                 else                       return (mean <= thresholds.peak && mean > thresholds.normal)
             case 'alert':
                 if (metric === 'mem_used') return (mean <= thresholds.alert && mean > thresholds.caution)
-                else                       return (mean <= thresholds.alert && mean > 0)
+                else                       return (mean <= thresholds.alert && mean >= 0)
             case 'caution':
                 if (metric === 'mem_used') return (mean <= thresholds.caution && mean > thresholds.normal)
                 else                       return (mean <= thresholds.caution && mean > thresholds.alert)
             case 'normal':
-                if (metric === 'mem_used') return (mean <= thresholds.normal && mean > 0)
+                if (metric === 'mem_used') return (mean <= thresholds.normal && mean >= 0)
                 else                       return (mean <= thresholds.normal && mean > thresholds.caution)
             default:
                 return false