diff --git a/web/frontend/src/Node.root.svelte b/web/frontend/src/Node.root.svelte index 2d58540..0553035 100644 --- a/web/frontend/src/Node.root.svelte +++ b/web/frontend/src/Node.root.svelte @@ -207,7 +207,6 @@ cluster={clusters.find((c) => c.name == cluster)} subCluster={$nodeMetricsData.data.nodeMetrics[0].subCluster} series={item.metric.series} - resources={[{ hostname: hostname }]} forNode={true} /> {:else if item.disabled === true && item.metric} diff --git a/web/frontend/src/Systems.root.svelte b/web/frontend/src/Systems.root.svelte index c483401..0d5e70e 100644 --- a/web/frontend/src/Systems.root.svelte +++ b/web/frontend/src/Systems.root.svelte @@ -206,7 +206,6 @@ metric={item.data.name} cluster={clusters.find((c) => c.name == cluster)} subCluster={item.subCluster} - resources={[{ hostname: item.host }]} forNode={true} /> {:else if item.disabled === true && item.data} diff --git a/web/frontend/src/generic/joblist/JobListRow.svelte b/web/frontend/src/generic/joblist/JobListRow.svelte index 1d8529e..274e4f0 100644 --- a/web/frontend/src/generic/joblist/JobListRow.svelte +++ b/web/frontend/src/generic/joblist/JobListRow.svelte @@ -169,7 +169,6 @@ {cluster} subCluster={job.subCluster} isShared={job.exclusive != 1} - resources={job.resources} numhwthreads={job.numHWThreads} numaccs={job.numAcc} /> diff --git a/web/frontend/src/generic/plots/MetricPlot.svelte b/web/frontend/src/generic/plots/MetricPlot.svelte index 8dd1dbf..d092413 100644 --- a/web/frontend/src/generic/plots/MetricPlot.svelte +++ b/web/frontend/src/generic/plots/MetricPlot.svelte @@ -6,7 +6,6 @@ Properties: - `metric String`: The metric name - `scope String?`: Scope of the displayed data [Default: node] - - `resources [GraphQL.Resource]`: List of resources used for parent job - `width Number`: The plot width - `height Number`: The plot height - `timestep Number`: The timestep used for X-axis rendering @@ -16,7 +15,7 @@ - `cluster GraphQL.Cluster`: Cluster Object of the parent job - `subCluster String`: Name of the subCluster of the parent job - `isShared Bool?`: If this job used shared resources; will adapt threshold indicators accordingly [Default: false] - - `forNode Bool?`: If this plot is used for node data display; will render x-axis as negative time with $now as maximum [Default: false] + - `forNode Bool?`: If this plot is used for node data display; will ren[data, err := metricdata.LoadNodeData(cluster, metrics, nodes, scopes, from, to, ctx)](https://github.com/ClusterCockpit/cc-backend/blob/9fe7cdca9215220a19930779a60c8afc910276a3/internal/graph/schema.resolvers.go#L391-L392)der x-axis as negative time with $now as maximum [Default: false] - `numhwthreads Number?`: Number of job HWThreads [Default: 0] - `numaccs Number?`: Number of job Accelerators [Default: 0] --> @@ -118,7 +117,6 @@ export let metric; export let scope = "node"; - export let resources = []; export let width; export let height; export let timestep; @@ -363,9 +361,8 @@ plotSeries.push({ label: scope === "node" - ? resources[i].hostname - : // scope === 'accelerator' ? resources[0].accelerators[i] : - scope + " #" + (i + 1), + ? series[i].hostname + : scope + " #" + (i + 1), scale: "y", width: lineWidth, stroke: lineColor(i, series.length), diff --git a/web/frontend/src/job/Metric.svelte b/web/frontend/src/job/Metric.svelte index 10a533a..71cf2e7 100644 --- a/web/frontend/src/job/Metric.svelte +++ b/web/frontend/src/job/Metric.svelte @@ -151,11 +151,6 @@ $: series = data?.series?.filter( (series) => selectedHost == null || series.hostname == selectedHost, ); - - $: resources = job?.resources?.filter( - (resource) => selectedHost == null || resource.hostname == selectedHost, - ); - @@ -204,7 +199,6 @@ metric={metricName} {series} {isShared} - {resources} /> {:else if statsSeries[selectedScopeIndex] != null && patternMatches}