From c5834e69d3f5c9d700178d40dda28a9d4e7443f9 Mon Sep 17 00:00:00 2001 From: Christoph Kluge Date: Mon, 19 Jun 2023 09:51:50 +0200 Subject: [PATCH 1/2] Fix Plottable removed metrics filter - excluded all plots where bool was not explicitly set --- web/frontend/src/PlotTable.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/frontend/src/PlotTable.svelte b/web/frontend/src/PlotTable.svelte index 573253e..d46eb19 100644 --- a/web/frontend/src/PlotTable.svelte +++ b/web/frontend/src/PlotTable.svelte @@ -30,7 +30,8 @@ return rows } - $: rows = tile(items.filter(item => item.disabled === false), itemsPerRow) + // Analysis Implements PlotTable: Disable flag can not be present, add to row if not defined explicitly (Helps with systems view also) + $: rows = tile(items.filter(item => (item.disabled !== null && item.disabled === false)), itemsPerRow) $: plotWidth = (tableWidth / itemsPerRow) - (padding * itemsPerRow) From 10ca86e58397cdff3b77fd3a5ac1c0c3f1423205 Mon Sep 17 00:00:00 2001 From: Christoph Kluge Date: Mon, 19 Jun 2023 10:25:34 +0200 Subject: [PATCH 2/2] Handle removed metrics in isMissing check --- web/frontend/src/Job.root.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/frontend/src/Job.root.svelte b/web/frontend/src/Job.root.svelte index cb537ec..9c74b78 100644 --- a/web/frontend/src/Job.root.svelte +++ b/web/frontend/src/Job.root.svelte @@ -87,7 +87,8 @@ metrics = $jobMetrics.data.jobMetrics, metricNames = clusters.find(c => c.name == job.cluster).metricConfig.map(mc => mc.name) - missingMetrics = metricNames.filter(metric => !metrics.some(jm => jm.name == metric)) + // Metric not found in JobMetrics && Metric not explicitly disabled: Was expected, but is Missing + missingMetrics = metricNames.filter(metric => (!metrics.some(jm => jm.name == metric) && !checkMetricDisabled(metric, $initq.data.job.cluster, $initq.data.job.subCluster))) missingHosts = job.resources.map(({ hostname }) => ({ hostname: hostname, metrics: metricNames.filter(metric => !metrics.some(jm => jm.scope == 'node' && jm.metric.series.some(series => series.hostname == hostname)))