Skip to content

Commit 38ca815

Browse files
authored
Merge pull request #741 from kubero-dev/maintenance/v3.1.2
Maintenance/v3.1.2
2 parents 099b6a3 + 2afadb3 commit 38ca815

6 files changed

Lines changed: 2019 additions & 2084 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:22-alpine AS build
1+
FROM node:24-alpine AS build
22
ENV NODE_ENV=development
33

44
WORKDIR /build
@@ -17,7 +17,7 @@ RUN cd /build/client && \
1717
RUN cd /build/client && \
1818
yarn build
1919

20-
FROM node:22-alpine AS release
20+
FROM node:24-alpine AS release
2121
ARG VERSION=unknown
2222

2323
LABEL maintainer='www.kubero.dev'

client/src/components/apps/metrics.vue

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ import { defineComponent } from 'vue'
103103
import VueApexCharts from "vue3-apexcharts";
104104
import { useKuberoStore } from '../../stores/kubero'
105105
import { mapState } from 'pinia'
106+
import type { ApexOptions } from 'apexcharts'
106107
107108
import axios from "axios";
108109
import Alerts from './alerts.vue';
@@ -137,7 +138,7 @@ export default defineComponent({
137138
},
138139
legend: {
139140
show: false,
140-
position: 'top',
141+
position: 'top' as const,
141142
},
142143
colors: colors,
143144
chart: {
@@ -154,7 +155,7 @@ export default defineComponent({
154155
}
155156
},
156157
stroke: {
157-
curve: 'stepline',
158+
curve: 'stepline' as const,
158159
width: 1
159160
},
160161
dataLabels: {
@@ -192,14 +193,14 @@ export default defineComponent({
192193
text: 'MiB',
193194
},
194195
}
195-
},
196+
} as ApexOptions,
196197
LoadOptions: {
197198
fill: {
198199
opacity: 0.5,
199200
type: 'solid',
200201
},
201202
legend: {
202-
position: 'top',
203+
position: 'top' as const,
203204
},
204205
colors: colors,
205206
chart: {
@@ -216,7 +217,7 @@ export default defineComponent({
216217
}
217218
},
218219
stroke: {
219-
curve: 'stepline',
220+
curve: 'stepline' as const,
220221
width: 1
221222
},
222223
dataLabels: {
@@ -254,15 +255,15 @@ export default defineComponent({
254255
text: 'load',
255256
},
256257
}
257-
},
258+
} as ApexOptions,
258259
cpuOptions: {
259260
fill: {
260261
opacity: 0.5,
261262
type: 'solid',
262263
},
263264
legend: {
264265
show: false,
265-
position: 'top',
266+
position: 'top' as const,
266267
},
267268
colors: colors,
268269
chart: {
@@ -279,7 +280,7 @@ export default defineComponent({
279280
}
280281
},
281282
stroke: {
282-
curve: 'stepline',
283+
curve: 'stepline' as const,
283284
width: 1
284285
},
285286
dataLabels: {
@@ -317,14 +318,14 @@ export default defineComponent({
317318
text: 'millicores',
318319
},
319320
}
320-
},
321+
} as ApexOptions,
321322
ResponsetimeOptions: {
322323
fill: {
323324
opacity: 0.2,
324325
type: 'solid',
325326
},
326327
legend: {
327-
position: 'top',
328+
position: 'top' as const,
328329
},
329330
colors: colors,
330331
chart: {
@@ -342,7 +343,7 @@ export default defineComponent({
342343
}
343344
},
344345
stroke: {
345-
curve: 'stepline',
346+
curve: 'stepline' as const,
346347
width: 1
347348
},
348349
dataLabels: {
@@ -380,14 +381,14 @@ export default defineComponent({
380381
text: 'miliseconds',
381382
},
382383
}
383-
},
384+
} as ApexOptions,
384385
httpStusCodeOptions: {
385386
fill: {
386387
opacity: 0.5,
387388
type: 'solid',
388389
},
389390
legend: {
390-
position: 'top',
391+
position: 'top' as const,
391392
},
392393
colors: colors,
393394
chart: {
@@ -405,7 +406,7 @@ export default defineComponent({
405406
}
406407
},
407408
stroke: {
408-
curve: 'stepline',
409+
curve: 'stepline' as const,
409410
width: 1
410411
},
411412
dataLabels: {
@@ -443,14 +444,14 @@ export default defineComponent({
443444
text: 'Req/sec',
444445
},
445446
}
446-
},
447+
} as ApexOptions,
447448
httpStusCodeIncreaseOptions: {
448449
fill: {
449450
opacity: 0.5,
450451
type: 'solid',
451452
},
452453
legend: {
453-
position: 'top',
454+
position: 'top' as const,
454455
},
455456
colors: colors,
456457
chart: {
@@ -468,7 +469,7 @@ export default defineComponent({
468469
}
469470
},
470471
stroke: {
471-
curve: 'stepline',
472+
curve: 'stepline' as const,
472473
width: 1
473474
},
474475
dataLabels: {
@@ -506,14 +507,14 @@ export default defineComponent({
506507
text: 'Req',
507508
},
508509
}
509-
},
510+
} as ApexOptions,
510511
httpResponseTrafficOptions: {
511512
fill: {
512513
opacity: 0.5,
513514
type: 'solid',
514515
},
515516
legend: {
516-
position: 'top',
517+
position: 'top' as const,
517518
},
518519
colors: colors,
519520
chart: {
@@ -531,7 +532,7 @@ export default defineComponent({
531532
}
532533
},
533534
stroke: {
534-
curve: 'stepline',
535+
curve: 'stepline' as const,
535536
width: 1
536537
},
537538
dataLabels: {
@@ -569,7 +570,7 @@ export default defineComponent({
569570
text: 'KB',
570571
},
571572
}
572-
},
573+
} as ApexOptions,
573574
cpuData: [] as {
574575
name: string,
575576
data: number[][],

0 commit comments

Comments
 (0)