ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-12-26 13:29:05 +01:00
Code Issues Packages Releases Activity

fix: fix plot labeling if specific host selected, hide loadall if only node returned

Browse Source
This commit is contained in:
Christoph Kluge 2024-08-23 13:53:15 +02:00
parent adc3502b6b
commit 9fe7cdca92
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/frontend/src/job/Metric.svelte
View File

@ -47,6 +47,7 @@
let pendingResolution = 600; let pendingResolution = 600;
let selectedScopeIndex = scopes.findIndex((s) => s == minScope(scopes)); let selectedScopeIndex = scopes.findIndex((s) => s == minScope(scopes));
let patternMatches = false; let patternMatches = false;
let nodeOnly = false; // If, after load-all, still only node scope returned
let statsSeries = rawData.map((data) => data?.statisticsSeries ? data.statisticsSeries : null); let statsSeries = rawData.map((data) => data?.statisticsSeries ? data.statisticsSeries : null);
const dispatch = createEventDispatcher(); const dispatch = createEventDispatcher();
@ -126,6 +127,7 @@
// Set selected scope to min of returned scopes // Set selected scope to min of returned scopes
if (selectedScope == "load-all") { if (selectedScope == "load-all") {
selectedScope = minScope(scopes) selectedScope = minScope(scopes)
nodeOnly = (selectedScope == "node") // "node" still only scope after load-all
} }
const statsTableData = $metricData.data.singleUpdate.filter((x) => x.scope !== "node") const statsTableData = $metricData.data.singleUpdate.filter((x) => x.scope !== "node")
@ -146,9 +148,14 @@
$: data = rawData[selectedScopeIndex]; $: data = rawData[selectedScopeIndex];
$: series = data?.series.filter( $: series = data?.series?.filter(
(series) => selectedHost == null || series.hostname == selectedHost, (series) => selectedHost == null || series.hostname == selectedHost,
); );
$: resources = job?.resources?.filter(
(resource) => selectedHost == null || resource.hostname == selectedHost,
);
</script> </script>
<InputGroup> <InputGroup>
@ -162,7 +169,7 @@
<option value={scope + '-stat'}>stats series ({scope})</option> <option value={scope + '-stat'}>stats series ({scope})</option>
{/if} {/if}
{/each} {/each}
{#if scopes.length == 1 && nativeScope != "node"} {#if scopes.length == 1 && nativeScope != "node" && !nodeOnly}
<option value={"load-all"}>Load all...</option> <option value={"load-all"}>Load all...</option>
{/if} {/if}
</select> </select>
@ -197,7 +204,7 @@
metric={metricName} metric={metricName}
{series} {series}
{isShared} {isShared}
resources={job.resources} {resources}
/> />
{:else if statsSeries[selectedScopeIndex] != null && patternMatches} {:else if statsSeries[selectedScopeIndex] != null && patternMatches}
<Timeseries <Timeseries
@ -211,7 +218,6 @@
metric={metricName} metric={metricName}
{series} {series}
{isShared} {isShared}
resources={job.resources}
statisticsSeries={statsSeries[selectedScopeIndex]} statisticsSeries={statsSeries[selectedScopeIndex]}
useStatsSeries={!!statsSeries[selectedScopeIndex]} useStatsSeries={!!statsSeries[selectedScopeIndex]}
/> />