Skip to content

Commit bf01739

Browse files
committed
util chart tweaks
1 parent c80840c commit bf01739

File tree

1 file changed

+50
-38
lines changed
  • src/routes/team/[team]/[env]/app/[app]/utilization

1 file changed

+50
-38
lines changed

src/routes/team/[team]/[env]/app/[app]/utilization/+page.svelte

+50-38
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@
5252
const uniqueTimestamps = Array.from(new Set(safeData.map((d) => d.timestamp.getTime())));
5353
5454
const opts = {
55+
grid: {
56+
bottom: 20,
57+
top: 8,
58+
left: 40,
59+
right: 51
60+
},
5561
animation: false,
5662
tooltip: {
5763
trigger: 'axis',
@@ -100,7 +106,7 @@
100106
},
101107
series: [
102108
...Array.from(new Set(safeData.map((d) => d.instance))).map((instance, index) => ({
103-
name: `Usage - ${instance}`,
109+
name: instance,
104110
type: 'line',
105111
data: safeData
106112
.filter((d) => d.instance === instance)
@@ -233,31 +239,32 @@
233239
{/each}
234240
</ToggleGroup>
235241
</div>
236-
<EChart
237-
options={options(
238-
utilization.memory_series.map((d) => {
239-
return {
240-
timestamp: d.timestamp,
241-
value: d.value / 1024 / 1024 / 1024,
242-
instance: d.instance
243-
};
244-
}),
245-
utilization.requested_memory / 1024 / 1024 / 1024,
246-
utilization.limit_memory ? utilization.limit_memory / 1024 / 1024 / 1024 : undefined,
247-
(value) =>
248-
value == null
249-
? '-'
250-
: prettyBytes(value * 1024 ** 3, {
251-
locale: 'en',
252-
minimumFractionDigits: 2,
253-
maximumFractionDigits: 2,
254-
binary: true
255-
})
256-
)}
257-
style="height: 400px"
258-
/>
242+
<div class="chart-wrapper">
243+
<EChart
244+
options={options(
245+
utilization.memory_series.map((d) => {
246+
return {
247+
timestamp: d.timestamp,
248+
value: d.value / 1024 / 1024 / 1024,
249+
instance: d.instance
250+
};
251+
}),
252+
utilization.requested_memory / 1024 / 1024 / 1024,
253+
utilization.limit_memory ? utilization.limit_memory / 1024 / 1024 / 1024 : undefined,
254+
(value) =>
255+
value == null
256+
? '-'
257+
: prettyBytes(value * 1024 ** 3, {
258+
locale: 'en',
259+
minimumFractionDigits: 2,
260+
maximumFractionDigits: 2,
261+
binary: true
262+
})
263+
)}
264+
/>
265+
</div>
259266
{:else}
260-
<div style="height: 504px; display: flex; justify-content: center; align-items: center;">
267+
<div style="height: 436px; display: flex; justify-content: center; align-items: center;">
261268
<Loader size="3xlarge" />
262269
</div>
263270
{/if}
@@ -292,20 +299,21 @@
292299
{/each}
293300
</ToggleGroup>
294301
</div>
295-
<EChart
296-
options={options(
297-
utilization.cpu_series,
298-
utilization.requested_cpu,
299-
utilization.limit_cpu ? utilization.limit_cpu : undefined,
300-
(value: number) =>
301-
value == null
302-
? '-'
303-
: `${value.toLocaleString('en-GB', { maximumFractionDigits: 4 })} CPUs`
304-
)}
305-
style="height: 400px"
306-
/>
302+
<div class="chart-wrapper">
303+
<EChart
304+
options={options(
305+
utilization.cpu_series,
306+
utilization.requested_cpu,
307+
utilization.limit_cpu ? utilization.limit_cpu : undefined,
308+
(value: number) =>
309+
value == null
310+
? '-'
311+
: `${value.toLocaleString('en-GB', { maximumFractionDigits: 4 })} CPUs`
312+
)}
313+
/>
314+
</div>
307315
{:else}
308-
<div style="height: 504px; display: flex; justify-content: center; align-items: center;">
316+
<div style="height: 436px; display: flex; justify-content: center; align-items: center;">
309317
<Loader size="3xlarge" />
310318
</div>
311319
{/if}
@@ -321,4 +329,8 @@
321329
.section {
322330
display: grid;
323331
}
332+
333+
.chart-wrapper {
334+
padding-block: 1rem;
335+
}
324336
</style>

0 commit comments

Comments
 (0)