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

review polar plot component, adds min dataset

Browse Source
This commit is contained in:
Christoph Kluge 2024-12-04 15:22:19 +01:00
parent a7395ed45b
commit 257250714d
1 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
web/frontend/src/generic/plots/Polar.svelte
View File

@ -45,7 +45,7 @@
if (footprintData) { if (footprintData) {
return footprintData.filter(fpd => { return footprintData.filter(fpd => {
if (!jobMetrics.find(m => m.name == fpd.name && m.scope == "node" || fpd.impact == 4)) { if (!jobMetrics.find(m => m.name == fpd.name && m.scope == "node" || fpd.impact == 4)) {
console.warn(`PolarPlot: No metric data (or config) for '${fpd.name}'`) console.warn(`PolarPlot: No metric data for '${fpd.name}'`)
return false return false
} }
return true return true
@ -72,6 +72,7 @@
const getMetricConfig = getContext("getMetricConfig"); const getMetricConfig = getContext("getMetricConfig");
const getValuesForStatGeneric = (getStat) => labels.map(name => { const getValuesForStatGeneric = (getStat) => labels.map(name => {
// TODO: Requires Scaling if Shared Job
const peak = getMetricConfig(cluster, subCluster, name).peak const peak = getMetricConfig(cluster, subCluster, name).peak
const metric = jobMetrics.find(m => m.name == name && m.scope == "node") const metric = jobMetrics.find(m => m.name == name && m.scope == "node")
const value = getStat(metric.metric) / peak const value = getStat(metric.metric) / peak
@ -79,6 +80,7 @@
}) })
const getValuesForStatFootprint = (getStat) => labels.map(name => { const getValuesForStatFootprint = (getStat) => labels.map(name => {
// FootprintData 'Peak' is pre-scaled for Shared Jobs in JobSummary Component
const peak = footprintData.find(fpd => fpd.name === name).peak const peak = footprintData.find(fpd => fpd.name === name).peak
const metric = jobMetrics.find(m => m.name == name && m.scope == "node") const metric = jobMetrics.find(m => m.name == name && m.scope == "node")
const value = getStat(metric.metric) / peak const value = getStat(metric.metric) / peak
@ -86,14 +88,21 @@
}) })
function getMax(metric) { function getMax(metric) {
let max = 0 let max = metric.series[0].statistics.max;
for (let series of metric.series) for (let series of metric.series)
max = Math.max(max, series.statistics.max) max = Math.max(max, series.statistics.max)
return max return max
} }
function getMin(metric) {
let min = metric.series[0].statistics.min;
for (let series of metric.series)
min = Math.min(min, series.statistics.min)
return min
}
function getAvg(metric) { function getAvg(metric) {
let avg = 0 let avg = 0;
for (let series of metric.series) for (let series of metric.series)
avg += series.statistics.avg avg += series.statistics.avg
return avg / metric.series.length return avg / metric.series.length
@ -104,6 +113,8 @@
return getValuesForStatGeneric(getAvg) return getValuesForStatGeneric(getAvg)
} else if (type === 'max') { } else if (type === 'max') {
return getValuesForStatGeneric(getMax) return getValuesForStatGeneric(getMax)
} else if (type === 'min') {
return getValuesForStatGeneric(getMin)
} }
console.log('Unknown Type For Polar Data') console.log('Unknown Type For Polar Data')
return [] return []
@ -114,6 +125,8 @@
return getValuesForStatFootprint(getAvg) return getValuesForStatFootprint(getAvg)
} else if (type === 'max') { } else if (type === 'max') {
return getValuesForStatFootprint(getMax) return getValuesForStatFootprint(getMax)
} else if (type === 'min') {
return getValuesForStatFootprint(getMin)
} }
console.log('Unknown Type For Polar Data') console.log('Unknown Type For Polar Data')
return [] return []
@ -124,25 +137,36 @@
datasets: [ datasets: [
{ {
label: 'Max', label: 'Max',
data: footprintData ? loadDataForFootprint('max') : loadDataGeneric('max'), // data: footprintData ? loadDataForFootprint('max') : loadDataGeneric('max'), // Node Scope Only
fill: 1, fill: 1,
backgroundColor: 'rgba(0, 102, 255, 0.25)', backgroundColor: 'rgba(0, 0, 255, 0.25)',
borderColor: 'rgb(0, 102, 255)', borderColor: 'rgb(0, 0, 255)',
pointBackgroundColor: 'rgb(0, 102, 255)', pointBackgroundColor: 'rgb(0, 0, 255)',
pointBorderColor: '#fff', pointBorderColor: '#fff',
pointHoverBackgroundColor: '#fff', pointHoverBackgroundColor: '#fff',
pointHoverBorderColor: 'rgb(0, 102, 255)' pointHoverBorderColor: 'rgb(0, 0, 255)'
}, },
{ {
label: 'Avg', label: 'Avg',
data: footprintData ? loadDataForFootprint('avg') : loadDataGeneric('avg'), // getValuesForStat(getAvg) data: footprintData ? loadDataForFootprint('avg') : loadDataGeneric('avg'), // Node Scope Only
fill: true, fill: 2,
backgroundColor: 'rgba(255, 153, 0, 0.25)', backgroundColor: 'rgba(255, 210, 0, 0.25)',
borderColor: 'rgb(255, 153, 0)', borderColor: 'rgb(255, 210, 0)',
pointBackgroundColor: 'rgb(255, 153, 0)', pointBackgroundColor: 'rgb(255, 210, 0)',
pointBorderColor: '#fff', pointBorderColor: '#fff',
pointHoverBackgroundColor: '#fff', pointHoverBackgroundColor: '#fff',
pointHoverBorderColor: 'rgb(255, 153, 0)' pointHoverBorderColor: 'rgb(255, 210, 0)'
},
{
label: 'Min',
data: footprintData ? loadDataForFootprint('min') : loadDataGeneric('min'), // Node Scope Only
fill: true,
backgroundColor: 'rgba(255, 0, 0, 0.25)',
borderColor: 'rgb(255, 0, 0)',
pointBackgroundColor: 'rgb(255, 0, 0)',
pointBorderColor: '#fff',
pointHoverBackgroundColor: '#fff',
pointHoverBorderColor: 'rgb(255, 0, 0)'
} }
] ]
} }