From be20fb0dbb7b68a8cf1debb36f89bce4dbfcdb09 Mon Sep 17 00:00:00 2001 From: Fredrik Burmester Date: Wed, 14 May 2025 16:08:18 +0200 Subject: [PATCH 1/6] fix: TypeError in hardware notifications for null disk values --- server/service/notificationService.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/server/service/notificationService.js b/server/service/notificationService.js index 624056694..4b1ff6160 100755 --- a/server/service/notificationService.js +++ b/server/service/notificationService.js @@ -257,9 +257,7 @@ class NotificationService { const alerts = { cpu: cpuThreshold !== -1 && cpuUsage > cpuThreshold ? true : false, memory: memoryThreshold !== -1 && memoryUsage > memoryThreshold ? true : false, - disk: disk.some((d) => diskThreshold !== -1 && d.usage_percent > diskThreshold) - ? true - : false, + disk: disk?.some(d => diskThreshold !== -1 && d.usage_percent > diskThreshold) ?? false, }; const notifications = await this.db.getNotificationsByMonitorId( From f6e460d97a67cf8a0b3828f29059dce3c46a6b15 Mon Sep 17 00:00:00 2001 From: Fredrik Burmester Date: Wed, 14 May 2025 19:37:47 +0200 Subject: [PATCH 2/6] fix: typeof number check and more safety --- server/service/notificationService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/service/notificationService.js b/server/service/notificationService.js index 4b1ff6160..e4f343c80 100755 --- a/server/service/notificationService.js +++ b/server/service/notificationService.js @@ -257,7 +257,7 @@ class NotificationService { const alerts = { cpu: cpuThreshold !== -1 && cpuUsage > cpuThreshold ? true : false, memory: memoryThreshold !== -1 && memoryUsage > memoryThreshold ? true : false, - disk: disk?.some(d => diskThreshold !== -1 && d.usage_percent > diskThreshold) ?? false, + disk: disk?.some(d => diskThreshold !== -1 && typeof d?.usage_percent === "number" && d?.usage_percent > diskThreshold) ?? false, }; const notifications = await this.db.getNotificationsByMonitorId( From a0f41b03baccffc5758c9db810ba684626e1ccd1 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 14 May 2025 12:00:54 -0700 Subject: [PATCH 3/6] add build platform target --- docker/dist/client.Dockerfile | 4 ++-- docker/dist/mongoDB.Dockerfile | 2 +- docker/dist/redis.Dockerfile | 2 +- docker/dist/server.Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/dist/client.Dockerfile b/docker/dist/client.Dockerfile index 6491f4bbb..80819434f 100755 --- a/docker/dist/client.Dockerfile +++ b/docker/dist/client.Dockerfile @@ -1,4 +1,4 @@ -FROM node:20-alpine AS build +FROM --platform=$BUILDPLATFORM node:20-alpine AS build ENV NODE_OPTIONS="--max-old-space-size=4096" @@ -21,7 +21,7 @@ COPY ./client . RUN npm run build -FROM nginx:1.27.1-alpine +FROM --platform=$BUILDPLATFORM nginx:1.27.1-alpine COPY ./docker/dist/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf COPY --from=build /app/dist /usr/share/nginx/html diff --git a/docker/dist/mongoDB.Dockerfile b/docker/dist/mongoDB.Dockerfile index 969a320c2..b44cfa837 100755 --- a/docker/dist/mongoDB.Dockerfile +++ b/docker/dist/mongoDB.Dockerfile @@ -1,3 +1,3 @@ -FROM mongo +FROM --platform=$BUILDPLATFORM mongo EXPOSE 27017 CMD ["mongod"] diff --git a/docker/dist/redis.Dockerfile b/docker/dist/redis.Dockerfile index af68ec61e..144efa66b 100755 --- a/docker/dist/redis.Dockerfile +++ b/docker/dist/redis.Dockerfile @@ -1,2 +1,2 @@ -FROM redis +FROM --platform=$BUILDPLATFORM redis EXPOSE 6379 \ No newline at end of file diff --git a/docker/dist/server.Dockerfile b/docker/dist/server.Dockerfile index d9d99a09d..c2c017477 100755 --- a/docker/dist/server.Dockerfile +++ b/docker/dist/server.Dockerfile @@ -1,4 +1,4 @@ -FROM node:20-alpine +FROM --platform=$BUILDPLATFORM node:20-alpine WORKDIR /app From 8a0725276bcbb1de88060d10dd1a300b70745be3 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 14 May 2025 12:10:16 -0700 Subject: [PATCH 4/6] remove buildx --- .github/workflows/distribution-deploy.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/distribution-deploy.yml b/.github/workflows/distribution-deploy.yml index 55d7c5e4c..69f3afd73 100644 --- a/.github/workflows/distribution-deploy.yml +++ b/.github/workflows/distribution-deploy.yml @@ -23,8 +23,7 @@ jobs: - name: Build Client Docker image run: | - docker buildx build \ - --platform linux/amd64,linux/arm64 \ + docker build \ -t ghcr.io/bluewave-labs/checkmate:frontend-dist \ -f ./docker/dist/client.Dockerfile \ --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \ @@ -52,8 +51,7 @@ jobs: - name: Build Server Docker image run: | - docker buildx build \ - --platform linux/amd64,linux/arm64 \ + docker build \ -t ghcr.io/bluewave-labs/checkmate:backend-dist \ -f ./docker/dist/server.Dockerfile \ --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \ @@ -64,8 +62,7 @@ jobs: - name: Build Mongo Docker image run: | - docker buildx build \ - --platform linux/amd64,linux/arm64 \ + docker build \ -t ghcr.io/bluewave-labs/checkmate:mongo-dist \ -f ./docker/dist/mongoDB.Dockerfile \ --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \ @@ -76,8 +73,7 @@ jobs: - name: Build Redis Docker image run: | - docker buildx build \ - --platform linux/amd64,linux/arm64 \ + docker build \ -t ghcr.io/bluewave-labs/checkmate:redis-dist \ -f ./docker/dist/redis.Dockerfile \ --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \ From 8585500e7c1155208b769983b9707e2c2ffc17f0 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 14 May 2025 12:16:09 -0700 Subject: [PATCH 5/6] remove build platform target --- docker/dist/client.Dockerfile | 4 ++-- docker/dist/mongoDB.Dockerfile | 2 +- docker/dist/redis.Dockerfile | 2 +- docker/dist/server.Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/dist/client.Dockerfile b/docker/dist/client.Dockerfile index 80819434f..6491f4bbb 100755 --- a/docker/dist/client.Dockerfile +++ b/docker/dist/client.Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM node:20-alpine AS build +FROM node:20-alpine AS build ENV NODE_OPTIONS="--max-old-space-size=4096" @@ -21,7 +21,7 @@ COPY ./client . RUN npm run build -FROM --platform=$BUILDPLATFORM nginx:1.27.1-alpine +FROM nginx:1.27.1-alpine COPY ./docker/dist/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf COPY --from=build /app/dist /usr/share/nginx/html diff --git a/docker/dist/mongoDB.Dockerfile b/docker/dist/mongoDB.Dockerfile index b44cfa837..969a320c2 100755 --- a/docker/dist/mongoDB.Dockerfile +++ b/docker/dist/mongoDB.Dockerfile @@ -1,3 +1,3 @@ -FROM --platform=$BUILDPLATFORM mongo +FROM mongo EXPOSE 27017 CMD ["mongod"] diff --git a/docker/dist/redis.Dockerfile b/docker/dist/redis.Dockerfile index 144efa66b..af68ec61e 100755 --- a/docker/dist/redis.Dockerfile +++ b/docker/dist/redis.Dockerfile @@ -1,2 +1,2 @@ -FROM --platform=$BUILDPLATFORM redis +FROM redis EXPOSE 6379 \ No newline at end of file diff --git a/docker/dist/server.Dockerfile b/docker/dist/server.Dockerfile index c2c017477..d9d99a09d 100755 --- a/docker/dist/server.Dockerfile +++ b/docker/dist/server.Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM node:20-alpine +FROM node:20-alpine WORKDIR /app From 3c48eacc9894a73cf80abcf692e5cd7a74de191a Mon Sep 17 00:00:00 2001 From: Br0wnHammer Date: Thu, 15 May 2025 02:38:26 +0530 Subject: [PATCH 6/6] Fix: Port Validation Uptime --- client/src/Validation/validation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js index be6cb19f7..096db1a1a 100644 --- a/client/src/Validation/validation.js +++ b/client/src/Validation/validation.js @@ -171,7 +171,7 @@ const monitorValidation = joi.object({ .max(65535) .when("type", { is: "port", - then: joi.required().messages({ + then: joi.number().messages({ "number.base": "Port must be a number.", "number.min": "Port must be at least 1.", "number.max": "Port must be at most 65535.",