ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2026-01-31 08:11:45 +01:00
Code Issues Packages Releases Activity

various small dashboard fixes

Browse Source 
- piechart color, idle count cap, metricHistoMaximum increased
This commit is contained in:
Christoph Kluge
2026-01-29 17:46:01 +01:00
parent 318dbd65e0
commit e8c81ba7d4
6 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/repository/stats.go
View File

@@ -38,7 +38,7 @@
// - All queries use prepared statements via stmtCache
// - Complex aggregations use SQL for efficiency
// - Histogram pre-initialization ensures consistent bin ranges
// - Metric histogram queries limited to 500 jobs for running job analysis
// - Metric histogram queries limited to 5000 jobs for running job analysis
package repository
@@ -686,7 +686,7 @@ func (r *JobRepository) AddHistograms(
// - Pre-initialized with zeros for consistent visualization
//
// Limitations:
// - Running jobs: Limited to 500 jobs for performance
// - Running jobs: Limited to 5000 jobs for performance
// - Requires valid cluster configuration with metric peak values
// - Uses footprint statistic (avg/max/min) configured per metric
func (r *JobRepository) AddMetricHistograms(
@@ -995,12 +995,12 @@ func (r *JobRepository) jobsMetricStatisticsHistogram(
// Returns slice of MetricHistoPoints, one per metric.
//
// Limitations:
// - Maximum 500 jobs (returns nil if more jobs match)
// - Maximum 5000 jobs (returns nil if more jobs match)
// - Requires metric backend availability
// - Bins based on metric peak values from cluster configuration
//
// Algorithm:
// 1. Query first 501 jobs to check count limit
// 1. Query first 5001 jobs to check count limit
// 2. Load metric averages for all jobs via metricdispatch
// 3. For each metric, create bins based on peak value
// 4. Iterate averages and count jobs per bin
@@ -1011,13 +1011,13 @@ func (r *JobRepository) runningJobsMetricStatisticsHistogram(
bins *int,
) []*model.MetricHistoPoints {
// Get Jobs
jobs, err := r.QueryJobs(ctx, filters, &model.PageRequest{Page: 1, ItemsPerPage: 500 + 1}, nil)
jobs, err := r.QueryJobs(ctx, filters, &model.PageRequest{Page: 1, ItemsPerPage: 5000 + 1}, nil)
if err != nil {
cclog.Errorf("Error while querying jobs for footprint: %s", err)
return nil
}
if len(jobs) > 500 {
cclog.Errorf("too many jobs matched (max: %d)", 500)
if len(jobs) > 5000 {
cclog.Errorf("too many jobs matched (max: %d)", 5000)
return nil
}

6
web/frontend/src/DashPublic.root.svelte
View File

@@ -242,10 +242,14 @@
}
}
// Get Idle Infos after Sums
// Get Simple Idle Infos after Sums by Diff
if (!rawInfos['idleNodes']) rawInfos['idleNodes'] = rawInfos['totalNodes'] - rawInfos['allocatedNodes'];
if (!rawInfos['idleCores']) rawInfos['idleCores'] = rawInfos['totalCores'] - rawInfos['allocatedCores'];
if (!rawInfos['idleAccs']) rawInfos['idleAccs'] = rawInfos['totalAccs'] - rawInfos['allocatedAccs'];
// Cap at 0 (Negative hints towards Config <> Reality Mismatch!)
if (rawInfos['idleNodes'] < 0) rawInfos['idleNodes'] = 0;
if (rawInfos['idleCores'] < 0) rawInfos['idleCores'] = 0;
if (rawInfos['idleAccs'] < 0) rawInfos['idleAccs'] = 0;
// Keymetrics (Data on Cluster-Scope)
let rawFlops = $statusQuery?.data?.nodeMetrics?.reduce((sum, node) =>

18
web/frontend/src/generic/plots/DoubleMetricPlot.svelte
View File

@@ -25,7 +25,7 @@
metricData,
timestep,
numNodes,
cluster,
cluster = "",
forNode = true,
enableFlip = false,
publicMode = false,
@@ -316,12 +316,14 @@
<div bind:this={plotWrapper} bind:clientWidth={width}
class={forNode ? 'py-2 rounded' : 'rounded'}
></div>
{:else if cluster}
<Card body color="warning" class="mx-4"
>Cannot render plot: No series data returned for <code>{cluster}</code>.</Card
>
{:else}
<Card body color="warning" class="mx-4"
>Cannot render plot: No series data returned.</Card
>
<Card color="warning" class="mx-2 mt-2">
<CardHeader class="mb-0">
<b>Empty Metrics</b>
</CardHeader>
<CardBody>
<p>Cannot render plot for cluster <b>{cluster}</b>.</p>
<p class="mb-1">Metrics found but returned without timeseries data.</p>
</CardBody>
</Card>
{/if}

5
web/frontend/src/generic/plots/Pie.svelte
View File

@@ -67,6 +67,11 @@
reserved: "rgba(255, 0, 255, 0.75)",
mixed: "rgba(255, 215, 0, 0.75)",
unknown: "rgba(0, 0, 0, 0.75)"
},
healthStates: {
full: "rgba(0, 128, 0, 0.75)",
failed: "rgba(255, 0, 0, 0.75)",
partial: "rgba(255, 215, 0, 0.75)",
}
}
</script>

6
web/frontend/src/status/DashInternal.svelte
View File

@@ -271,10 +271,14 @@
}
}
// Get Idle Infos after Sums
// Get Simple Idle Infos after Sums by Diff
if (!rawInfos['idleNodes']) rawInfos['idleNodes'] = rawInfos['totalNodes'] - rawInfos['allocatedNodes'];
if (!rawInfos['idleCores']) rawInfos['idleCores'] = rawInfos['totalCores'] - rawInfos['allocatedCores'];
if (!rawInfos['idleAccs']) rawInfos['idleAccs'] = rawInfos['totalAccs'] - rawInfos['allocatedAccs'];
// Cap at 0 (Negative hints towards Config <> Reality Mismatch!)
if (rawInfos['idleNodes'] < 0) rawInfos['idleNodes'] = 0;
if (rawInfos['idleCores'] < 0) rawInfos['idleCores'] = 0;
if (rawInfos['idleAccs'] < 0) rawInfos['idleAccs'] = 0;
// Keymetrics (Data on Cluster-Scope)
let rawFlops = $statusQuery?.data?.nodeMetrics?.reduce((sum, node) =>

22
web/frontend/src/status/dashdetails/StatusDash.svelte
View File

@@ -418,7 +418,7 @@
{:else if $statesTimed.error}
<Row cols={1} class="text-center mt-3">
<Col>
<Card body color="danger">{$statesTimed.error.message}</Card>
<Card body color="danger">States Timed: {$statesTimed.error.message}</Card>
</Col>
</Row>
{:else if $statesTimed.data}
@@ -472,7 +472,7 @@
{:else if $statusQuery.error}
<Row cols={1} class="text-center mt-3">
<Col>
<Card body color="danger">{$statesTimed.error.message}</Card>
<Card body color="danger">Status Query (States): {$statesTimed.error.message}</Card>
</Col>
</Row>
{:else if $statusQuery?.data?.nodeStates}
@@ -484,7 +484,6 @@
Current {cluster.charAt(0).toUpperCase() + cluster.slice(1)} Node States
</h4>
<Pie
{useAltColors}
canvasId="hpcpie-slurm"
size={pieWidth * 0.55}
sliceLabel="Nodes"
@@ -494,6 +493,9 @@
entities={refinedStateData.map(
(sd) => sd.state,
)}
fixColors={refinedStateData.map(
(sd) => colors['nodeStates'][sd.state],
)}
/>
{/key}
</div>
@@ -508,7 +510,7 @@
</tr>
{#each refinedStateData as sd, i}
<tr>
<td><Icon name="circle-fill" style="color: {legendColors(i)};"/></td>
<td><Icon name="circle-fill" style="color: {colors['nodeStates'][sd.state]};"/></td>
<td>{sd.state}</td>
<td>{sd.count}</td>
</tr>
@@ -524,15 +526,17 @@
Current {cluster.charAt(0).toUpperCase() + cluster.slice(1)} Node Health
</h4>
<Pie
{useAltColors}
canvasId="hpcpie-health"
size={pieWidth * 0.55}
sliceLabel="Nodes"
quantities={refinedHealthData.map(
(sd) => sd.count,
(hd) => hd.count,
)}
entities={refinedHealthData.map(
(sd) => sd.state,
(hd) => hd.state,
)}
fixColors={refinedHealthData.map(
(hd) => colors['healthStates'][hd.state],
)}
/>
{/key}
@@ -548,7 +552,7 @@
</tr>
{#each refinedHealthData as hd, i}
<tr>
<td><Icon name="circle-fill" style="color: {legendColors(i)};" /></td>
<td><Icon name="circle-fill"style="color: {colors['healthStates'][hd.state]};" /></td>
<td>{hd.state}</td>
<td>{hd.count}</td>
</tr>
@@ -570,7 +574,7 @@
{:else if $statusQuery.error}
<Row cols={1} class="text-center mt-3">
<Col>
<Card body color="danger">{$statusQuery.error.message}</Card>
<Card body color="danger">Status Query (Details): {$statusQuery.error.message}</Card>
</Col>
</Row>
{:else if $statusQuery.data}